[java-opensaml] 01/03: JPAR-85 - Checkstyle, check final parameters

Tom Zeller tzeller at dragonacea.biz
Wed Aug 9 22:31:01 EDT 2017


This is an automated email from the git hooks/post-receive script.

tzeller pushed a commit to branch master
in repository java-opensaml.

View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=9bb7f889837e8898f58cdfc3b5681a878faf208d

commit 9bb7f889837e8898f58cdfc3b5681a878faf208d
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Wed Aug 9 18:34:33 2017 -0500

    JPAR-85 - Checkstyle, check final parameters
---
 .../impl/ExpiringSAMLArtifactMapEntryFactory.java  |  2 +-
 .../StorageServiceSAMLArtifactMapEntryFactory.java |  6 ++---
 .../binding/impl/SAMLProtocolAndRoleHandler.java   |  2 +-
 .../BaseSAMLSimpleSignatureSecurityHandler.java    |  4 +--
 .../impl/EndpointURLSchemeSecurityHandler.java     |  2 +-
 .../impl/ReceivedEndpointSecurityHandler.java      |  6 ++---
 .../SAMLOutboundProtocolMessageSigningHandler.java |  2 +-
 .../profile/impl/AddInResponseToToResponse.java    |  2 +-
 .../impl/ChainingNameIdentifierGenerator.java      |  2 +-
 .../impl/PopulateSignatureSigningParameters.java   |  2 +-
 .../idpdisco/impl/DiscoveryResponseBuilder.java    |  2 +-
 .../ext/idpdisco/impl/DiscoveryResponseImpl.java   |  2 +-
 .../saml/ext/saml1md/impl/SourceIDBuilder.java     |  2 +-
 .../saml/ext/saml1md/impl/SourceIDImpl.java        |  2 +-
 .../ext/saml2alg/impl/DigestMethodBuilder.java     |  2 +-
 .../saml/ext/saml2alg/impl/DigestMethodImpl.java   |  8 +++---
 .../ext/saml2alg/impl/DigestMethodMarshaller.java  |  2 +-
 .../saml2alg/impl/DigestMethodUnmarshaller.java    |  4 +--
 .../ext/saml2alg/impl/SigningMethodBuilder.java    |  2 +-
 .../saml/ext/saml2alg/impl/SigningMethodImpl.java  | 12 ++++-----
 .../ext/saml2alg/impl/SigningMethodMarshaller.java |  2 +-
 .../saml2alg/impl/SigningMethodUnmarshaller.java   |  4 +--
 .../ext/saml2aslo/impl/AsynchronousBuilder.java    |  2 +-
 .../saml/ext/saml2aslo/impl/AsynchronousImpl.java  |  2 +-
 .../ext/saml2cb/impl/ChannelBindingsBuilder.java   |  2 +-
 .../saml/ext/saml2cb/impl/ChannelBindingsImpl.java | 10 ++++----
 .../saml2cb/impl/ChannelBindingsMarshaller.java    |  2 +-
 .../saml2cb/impl/ChannelBindingsUnmarshaller.java  |  2 +-
 .../ext/saml2delrestrict/impl/DelegateBuilder.java |  2 +-
 .../ext/saml2delrestrict/impl/DelegateImpl.java    | 12 ++++-----
 .../saml2delrestrict/impl/DelegateMarshaller.java  |  2 +-
 .../impl/DelegateUnmarshaller.java                 |  4 +--
 .../impl/DelegationRestrictionTypeBuilder.java     |  2 +-
 .../impl/DelegationRestrictionTypeImpl.java        |  2 +-
 .../DelegationRestrictionTypeUnmarshaller.java     |  2 +-
 .../saml2mdattr/impl/EntityAttributesBuilder.java  |  2 +-
 .../ext/saml2mdattr/impl/EntityAttributesImpl.java |  2 +-
 .../impl/EntityAttributesUnmarshaller.java         |  2 +-
 .../saml2mdquery/impl/ActionNamespaceBuilder.java  |  2 +-
 .../ext/saml2mdquery/impl/ActionNamespaceImpl.java |  4 +--
 .../impl/ActionNamespaceMarshaller.java            |  2 +-
 .../impl/ActionNamespaceUnmarshaller.java          |  2 +-
 .../impl/AttributeQueryDescriptorTypeBuilder.java  |  2 +-
 .../impl/AttributeQueryDescriptorTypeImpl.java     |  4 +--
 .../AttributeQueryDescriptorTypeUnmarshaller.java  |  2 +-
 .../impl/AuthnQueryDescriptorTypeBuilder.java      |  2 +-
 .../impl/AuthnQueryDescriptorTypeImpl.java         |  4 +--
 .../AuthzDecisionQueryDescriptorTypeBuilder.java   |  2 +-
 .../impl/AuthzDecisionQueryDescriptorTypeImpl.java |  6 ++---
 ...thzDecisionQueryDescriptorTypeUnmarshaller.java |  2 +-
 .../saml2mdquery/impl/QueryDescriptorTypeImpl.java |  6 ++---
 .../impl/QueryDescriptorTypeMarshaller.java        |  2 +-
 .../impl/QueryDescriptorTypeUnmarshaller.java      |  4 +--
 .../impl/RequestInitiatorBuilder.java              |  2 +-
 .../saml2mdreqinit/impl/RequestInitiatorImpl.java  |  2 +-
 .../ext/saml2mdrpi/impl/PublicationBuilder.java    |  2 +-
 .../saml/ext/saml2mdrpi/impl/PublicationImpl.java  |  8 +++---
 .../saml2mdrpi/impl/PublicationInfoBuilder.java    |  2 +-
 .../ext/saml2mdrpi/impl/PublicationInfoImpl.java   |  8 +++---
 .../saml2mdrpi/impl/PublicationInfoMarshaller.java |  2 +-
 .../impl/PublicationInfoUnmarshaller.java          |  4 +--
 .../ext/saml2mdrpi/impl/PublicationMarshaller.java |  2 +-
 .../saml2mdrpi/impl/PublicationPathBuilder.java    |  2 +-
 .../ext/saml2mdrpi/impl/PublicationPathImpl.java   |  2 +-
 .../impl/PublicationPathUnmarshaller.java          |  2 +-
 .../saml2mdrpi/impl/PublicationUnmarshaller.java   |  2 +-
 .../saml2mdrpi/impl/RegistrationInfoBuilder.java   |  2 +-
 .../ext/saml2mdrpi/impl/RegistrationInfoImpl.java  |  6 ++---
 .../impl/RegistrationInfoMarshaller.java           |  2 +-
 .../impl/RegistrationInfoUnmarshaller.java         |  4 +--
 .../saml2mdrpi/impl/RegistrationPolicyBuilder.java |  2 +-
 .../saml2mdrpi/impl/RegistrationPolicyImpl.java    |  2 +-
 .../ext/saml2mdrpi/impl/UsagePolicyBuilder.java    |  2 +-
 .../saml/ext/saml2mdrpi/impl/UsagePolicyImpl.java  |  2 +-
 .../ext/saml2mdui/impl/DescriptionBuilder.java     |  2 +-
 .../saml/ext/saml2mdui/impl/DescriptionImpl.java   |  2 +-
 .../saml/ext/saml2mdui/impl/DiscoHintsBuilder.java |  2 +-
 .../saml/ext/saml2mdui/impl/DiscoHintsImpl.java    |  4 +--
 .../ext/saml2mdui/impl/DiscoHintsUnmarshaller.java |  2 +-
 .../ext/saml2mdui/impl/DisplayNameBuilder.java     |  2 +-
 .../saml/ext/saml2mdui/impl/DisplayNameImpl.java   |  2 +-
 .../saml/ext/saml2mdui/impl/DomainHintBuilder.java |  2 +-
 .../saml/ext/saml2mdui/impl/DomainHintImpl.java    |  4 +--
 .../ext/saml2mdui/impl/DomainHintMarshaller.java   |  2 +-
 .../ext/saml2mdui/impl/DomainHintUnmarshaller.java |  2 +-
 .../ext/saml2mdui/impl/GeolocationHintBuilder.java |  2 +-
 .../ext/saml2mdui/impl/GeolocationHintImpl.java    |  4 +--
 .../saml2mdui/impl/GeolocationHintMarshaller.java  |  2 +-
 .../impl/GeolocationHintUnmarshaller.java          |  2 +-
 .../saml/ext/saml2mdui/impl/IPHintBuilder.java     |  2 +-
 .../saml/ext/saml2mdui/impl/IPHintImpl.java        |  4 +--
 .../saml/ext/saml2mdui/impl/IPHintMarshaller.java  |  2 +-
 .../ext/saml2mdui/impl/IPHintUnmarshaller.java     |  2 +-
 .../ext/saml2mdui/impl/InformationURLBuilder.java  |  2 +-
 .../ext/saml2mdui/impl/InformationURLImpl.java     |  2 +-
 .../saml/ext/saml2mdui/impl/KeywordsBuilder.java   |  2 +-
 .../saml/ext/saml2mdui/impl/KeywordsImpl.java      |  6 ++---
 .../ext/saml2mdui/impl/KeywordsMarshaller.java     |  4 +--
 .../ext/saml2mdui/impl/KeywordsUnmarshaller.java   |  4 +--
 .../saml/ext/saml2mdui/impl/LogoBuilder.java       |  2 +-
 .../opensaml/saml/ext/saml2mdui/impl/LogoImpl.java | 10 ++++----
 .../saml/ext/saml2mdui/impl/LogoMarshaller.java    |  4 +--
 .../saml/ext/saml2mdui/impl/LogoUnmarshaller.java  |  4 +--
 .../saml2mdui/impl/PrivacyStatementURLBuilder.java |  2 +-
 .../saml2mdui/impl/PrivacyStatementURLImpl.java    |  2 +-
 .../saml/ext/saml2mdui/impl/UIInfoBuilder.java     |  2 +-
 .../saml/ext/saml2mdui/impl/UIInfoImpl.java        |  4 +--
 .../ext/saml2mdui/impl/UIInfoUnmarshaller.java     |  2 +-
 .../saml/ext/samlec/impl/EncTypeBuilder.java       |  2 +-
 .../opensaml/saml/ext/samlec/impl/EncTypeImpl.java |  2 +-
 .../saml/ext/samlec/impl/GeneratedKeyBuilder.java  |  2 +-
 .../saml/ext/samlec/impl/GeneratedKeyImpl.java     |  8 +++---
 .../ext/samlec/impl/GeneratedKeyMarshaller.java    |  2 +-
 .../ext/samlec/impl/GeneratedKeyUnmarshaller.java  |  2 +-
 .../saml/ext/samlec/impl/SessionKeyBuilder.java    |  2 +-
 .../saml/ext/samlec/impl/SessionKeyImpl.java       | 12 ++++-----
 .../saml/ext/samlec/impl/SessionKeyMarshaller.java |  2 +-
 .../ext/samlec/impl/SessionKeyUnmarshaller.java    |  4 +--
 .../ext/samlpthrpty/impl/RespondToBuilder.java     |  2 +-
 .../saml/ext/samlpthrpty/impl/RespondToImpl.java   |  4 +--
 ...aluableEntityRoleEntityDescriptorCriterion.java |  8 +++---
 .../EvaluableEntityRoleDescriptorCriterion.java    |  4 +--
 .../EvaluableProtocolRoleDescriptorCriterion.java  |  4 +--
 .../impl/BasicDynamicTrustedNamesStrategy.java     |  2 +-
 .../impl/EntitiesDescriptorNameProcessor.java      |  2 +-
 .../filter/impl/NodeProcessingMetadataFilter.java  |  2 +-
 .../filter/impl/SignatureValidationFilter.java     |  2 +-
 .../impl/AbstractDynamicHTTPMetadataResolver.java  |  2 +-
 .../impl/AbstractDynamicMetadataResolver.java      |  6 ++---
 .../resolver/impl/IdentityEntityIDGenerator.java   |  2 +-
 .../resolver/index/impl/EndpointMetadataIndex.java | 10 ++++----
 .../resolver/index/impl/MetadataIndexManager.java  |  8 +++---
 .../resolver/index/impl/MetadataIndexStore.java    |  6 ++---
 .../resolver/index/impl/RoleMetadataIndex.java     |  6 ++---
 .../index/impl/SAMLArtifactMetadataIndex.java      | 16 ++++++------
 .../binding/decoding/impl/HTTPArtifactDecoder.java |  6 ++---
 .../binding/decoding/impl/HTTPPostDecoder.java     |  2 +-
 .../binding/decoding/impl/HTTPSOAP11Decoder.java   |  2 +-
 .../impl/HttpClientResponseSOAP11Decoder.java      |  2 +-
 .../binding/encoding/impl/HTTPArtifactEncoder.java |  4 +--
 .../binding/encoding/impl/HTTPPostEncoder.java     | 10 ++++----
 .../saml/saml1/core/impl/ActionBuilder.java        |  2 +-
 .../opensaml/saml/saml1/core/impl/ActionImpl.java  |  6 ++---
 .../saml/saml1/core/impl/ActionMarshaller.java     |  4 +--
 .../saml/saml1/core/impl/ActionUnmarshaller.java   |  4 +--
 .../saml/saml1/core/impl/AdviceBuilder.java        |  2 +-
 .../opensaml/saml/saml1/core/impl/AdviceImpl.java  |  4 +--
 .../saml/saml1/core/impl/AdviceUnmarshaller.java   |  2 +-
 .../saml1/core/impl/AssertionArtifactBuilder.java  |  2 +-
 .../saml1/core/impl/AssertionArtifactImpl.java     |  4 +--
 .../core/impl/AssertionArtifactMarshaller.java     |  2 +-
 .../core/impl/AssertionArtifactUnmarshaller.java   |  2 +-
 .../saml/saml1/core/impl/AssertionBuilder.java     |  2 +-
 .../core/impl/AssertionIDReferenceBuilder.java     |  2 +-
 .../saml1/core/impl/AssertionIDReferenceImpl.java  |  4 +--
 .../core/impl/AssertionIDReferenceMarshaller.java  |  2 +-
 .../impl/AssertionIDReferenceUnmarshaller.java     |  2 +-
 .../saml/saml1/core/impl/AssertionImpl.java        | 16 ++++++------
 .../saml/saml1/core/impl/AssertionMarshaller.java  |  2 +-
 .../saml1/core/impl/AssertionUnmarshaller.java     |  6 ++---
 .../saml/saml1/core/impl/AttributeBuilder.java     |  2 +-
 .../core/impl/AttributeDesignatorBuilder.java      |  2 +-
 .../saml1/core/impl/AttributeDesignatorImpl.java   |  6 ++---
 .../core/impl/AttributeDesignatorMarshaller.java   |  2 +-
 .../core/impl/AttributeDesignatorUnmarshaller.java |  2 +-
 .../saml/saml1/core/impl/AttributeImpl.java        |  2 +-
 .../saml1/core/impl/AttributeQueryBuilder.java     |  2 +-
 .../saml/saml1/core/impl/AttributeQueryImpl.java   |  4 +--
 .../saml1/core/impl/AttributeQueryMarshaller.java  |  2 +-
 .../core/impl/AttributeQueryUnmarshaller.java      |  4 +--
 .../saml1/core/impl/AttributeStatementBuilder.java |  2 +-
 .../saml1/core/impl/AttributeStatementImpl.java    |  2 +-
 .../core/impl/AttributeStatementUnmarshaller.java  |  2 +-
 .../saml1/core/impl/AttributeUnmarshaller.java     |  2 +-
 .../saml/saml1/core/impl/AudienceBuilder.java      |  2 +-
 .../saml/saml1/core/impl/AudienceImpl.java         |  4 +--
 .../saml/saml1/core/impl/AudienceMarshaller.java   |  2 +-
 .../impl/AudienceRestrictionConditionBuilder.java  |  2 +-
 .../impl/AudienceRestrictionConditionImpl.java     |  2 +-
 .../AudienceRestrictionConditionUnmarshaller.java  |  2 +-
 .../saml/saml1/core/impl/AudienceUnmarshaller.java |  2 +-
 .../core/impl/AuthenticationQueryBuilder.java      |  2 +-
 .../saml1/core/impl/AuthenticationQueryImpl.java   |  4 +--
 .../core/impl/AuthenticationQueryMarshaller.java   |  2 +-
 .../core/impl/AuthenticationQueryUnmarshaller.java |  2 +-
 .../core/impl/AuthenticationStatementBuilder.java  |  2 +-
 .../core/impl/AuthenticationStatementImpl.java     |  8 +++---
 .../impl/AuthenticationStatementMarshaller.java    |  2 +-
 .../impl/AuthenticationStatementUnmarshaller.java  |  4 +--
 .../saml1/core/impl/AuthorityBindingBuilder.java   |  2 +-
 .../saml/saml1/core/impl/AuthorityBindingImpl.java |  8 +++---
 .../core/impl/AuthorityBindingMarshaller.java      |  2 +-
 .../core/impl/AuthorityBindingUnmarshaller.java    |  2 +-
 .../impl/AuthorizationDecisionQueryBuilder.java    |  2 +-
 .../core/impl/AuthorizationDecisionQueryImpl.java  |  6 ++---
 .../impl/AuthorizationDecisionQueryMarshaller.java |  2 +-
 .../AuthorizationDecisionQueryUnmarshaller.java    |  4 +--
 .../AuthorizationDecisionStatementBuilder.java     |  2 +-
 .../impl/AuthorizationDecisionStatementImpl.java   |  8 +++---
 .../AuthorizationDecisionStatementMarshaller.java  |  2 +-
 ...AuthorizationDecisionStatementUnmarshaller.java |  4 +--
 .../saml/saml1/core/impl/ConditionsBuilder.java    |  2 +-
 .../saml/saml1/core/impl/ConditionsImpl.java       |  8 +++---
 .../saml/saml1/core/impl/ConditionsMarshaller.java |  2 +-
 .../saml1/core/impl/ConditionsUnmarshaller.java    |  4 +--
 .../saml1/core/impl/ConfirmationMethodBuilder.java |  2 +-
 .../saml1/core/impl/ConfirmationMethodImpl.java    |  4 +--
 .../core/impl/ConfirmationMethodMarshaller.java    |  2 +-
 .../core/impl/ConfirmationMethodUnmarshaller.java  |  2 +-
 .../core/impl/DoNotCacheConditionBuilder.java      |  2 +-
 .../saml1/core/impl/DoNotCacheConditionImpl.java   |  2 +-
 .../saml/saml1/core/impl/EvidenceBuilder.java      |  2 +-
 .../saml/saml1/core/impl/EvidenceImpl.java         |  2 +-
 .../saml/saml1/core/impl/EvidenceUnmarshaller.java |  2 +-
 .../saml1/core/impl/NameIdentifierBuilder.java     |  2 +-
 .../saml/saml1/core/impl/NameIdentifierImpl.java   | 10 ++++----
 .../saml1/core/impl/NameIdentifierMarshaller.java  |  4 +--
 .../core/impl/NameIdentifierUnmarshaller.java      |  4 +--
 .../saml1/core/impl/RequestAbstractTypeImpl.java   |  8 +++---
 .../core/impl/RequestAbstractTypeMarshaller.java   |  2 +-
 .../core/impl/RequestAbstractTypeUnmarshaller.java |  6 ++---
 .../saml/saml1/core/impl/RequestBuilder.java       |  2 +-
 .../opensaml/saml/saml1/core/impl/RequestImpl.java |  4 +--
 .../saml/saml1/core/impl/RequestUnmarshaller.java  |  4 +--
 .../saml/saml1/core/impl/RespondWithBuilder.java   |  2 +-
 .../saml/saml1/core/impl/RespondWithImpl.java      |  4 +--
 .../saml1/core/impl/ResponseAbstractTypeImpl.java  | 12 ++++-----
 .../core/impl/ResponseAbstractTypeMarshaller.java  |  2 +-
 .../impl/ResponseAbstractTypeUnmarshaller.java     |  6 ++---
 .../saml/saml1/core/impl/ResponseBuilder.java      |  2 +-
 .../saml/saml1/core/impl/ResponseImpl.java         |  4 +--
 .../saml/saml1/core/impl/ResponseUnmarshaller.java |  2 +-
 .../saml/saml1/core/impl/StatusBuilder.java        |  2 +-
 .../saml/saml1/core/impl/StatusCodeBuilder.java    |  2 +-
 .../saml/saml1/core/impl/StatusCodeImpl.java       |  6 ++---
 .../saml/saml1/core/impl/StatusCodeMarshaller.java |  2 +-
 .../saml1/core/impl/StatusCodeUnmarshaller.java    |  4 +--
 .../saml/saml1/core/impl/StatusDetailBuilder.java  |  2 +-
 .../saml/saml1/core/impl/StatusDetailImpl.java     |  4 +--
 .../saml1/core/impl/StatusDetailUnmarshaller.java  |  2 +-
 .../opensaml/saml/saml1/core/impl/StatusImpl.java  |  8 +++---
 .../saml/saml1/core/impl/StatusMessageBuilder.java |  2 +-
 .../saml/saml1/core/impl/StatusMessageImpl.java    |  4 +--
 .../saml1/core/impl/StatusMessageMarshaller.java   |  2 +-
 .../saml1/core/impl/StatusMessageUnmarshaller.java |  2 +-
 .../saml/saml1/core/impl/StatusUnmarshaller.java   |  2 +-
 .../saml/saml1/core/impl/SubjectBuilder.java       |  2 +-
 .../core/impl/SubjectConfirmationBuilder.java      |  2 +-
 .../saml1/core/impl/SubjectConfirmationImpl.java   |  6 ++---
 .../core/impl/SubjectConfirmationUnmarshaller.java |  2 +-
 .../opensaml/saml/saml1/core/impl/SubjectImpl.java |  6 ++---
 .../saml1/core/impl/SubjectLocalityBuilder.java    |  2 +-
 .../saml/saml1/core/impl/SubjectLocalityImpl.java  |  6 ++---
 .../saml1/core/impl/SubjectLocalityMarshaller.java |  2 +-
 .../core/impl/SubjectLocalityUnmarshaller.java     |  2 +-
 .../saml/saml1/core/impl/SubjectQueryImpl.java     |  4 +--
 .../saml1/core/impl/SubjectQueryUnmarshaller.java  |  2 +-
 .../saml/saml1/core/impl/SubjectStatementImpl.java |  4 +--
 .../core/impl/SubjectStatementUnmarshaller.java    |  2 +-
 .../saml/saml1/core/impl/SubjectUnmarshaller.java  |  2 +-
 .../saml/saml1/profile/impl/AddResponseShell.java  |  2 +-
 .../saml1/profile/impl/AddStatusToResponse.java    |  2 +-
 .../impl/AbstractSubjectConfirmationValidator.java |  6 ++---
 .../AudienceRestrictionConditionValidator.java     |  2 +-
 .../HolderOfKeySubjectConfirmationValidator.java   | 12 ++++-----
 .../impl/OneTimeUseConditionValidator.java         |  4 +--
 .../binding/decoding/impl/HTTPArtifactDecoder.java | 26 +++++++++----------
 .../binding/decoding/impl/HTTPPostDecoder.java     |  4 +--
 .../decoding/impl/HTTPPostSimpleSignDecoder.java   |  2 +-
 .../decoding/impl/HTTPRedirectDeflateDecoder.java  |  6 ++---
 .../binding/decoding/impl/HTTPSOAP11Decoder.java   |  2 +-
 .../impl/HttpClientResponseSOAP11Decoder.java      |  2 +-
 .../encoding/impl/BaseSAML2MessageEncoder.java     |  4 +--
 .../binding/encoding/impl/HTTPArtifactEncoder.java |  2 +-
 .../binding/encoding/impl/HTTPPostEncoder.java     | 14 +++++-----
 .../encoding/impl/HTTPPostSimpleSignEncoder.java   | 18 ++++++-------
 .../encoding/impl/HTTPRedirectDeflateEncoder.java  | 16 ++++++------
 ...TTPRedirectDeflateSignatureSecurityHandler.java |  2 +-
 .../saml/saml2/core/impl/AbstractNameIDType.java   | 12 ++++-----
 .../core/impl/AbstractNameIDTypeMarshaller.java    |  4 +--
 .../core/impl/AbstractNameIDTypeUnmarshaller.java  |  4 +--
 .../saml/saml2/core/impl/ActionBuilder.java        |  2 +-
 .../opensaml/saml/saml2/core/impl/ActionImpl.java  |  6 ++---
 .../saml/saml2/core/impl/ActionMarshaller.java     |  4 +--
 .../saml/saml2/core/impl/ActionUnmarshaller.java   |  4 +--
 .../saml/saml2/core/impl/AdviceBuilder.java        |  2 +-
 .../opensaml/saml/saml2/core/impl/AdviceImpl.java  |  4 +--
 .../saml/saml2/core/impl/AdviceUnmarshaller.java   |  2 +-
 .../saml/saml2/core/impl/ArtifactBuilder.java      |  2 +-
 .../saml/saml2/core/impl/ArtifactImpl.java         |  4 +--
 .../saml/saml2/core/impl/ArtifactMarshaller.java   |  2 +-
 .../saml2/core/impl/ArtifactResolveBuilder.java    |  2 +-
 .../saml/saml2/core/impl/ArtifactResolveImpl.java  |  4 +--
 .../core/impl/ArtifactResolveUnmarshaller.java     |  2 +-
 .../saml2/core/impl/ArtifactResponseBuilder.java   |  2 +-
 .../saml/saml2/core/impl/ArtifactResponseImpl.java |  4 +--
 .../core/impl/ArtifactResponseUnmarshaller.java    |  2 +-
 .../saml/saml2/core/impl/ArtifactUnmarshaller.java |  2 +-
 .../saml/saml2/core/impl/AssertionBuilder.java     |  2 +-
 .../saml2/core/impl/AssertionIDRefBuilder.java     |  2 +-
 .../saml/saml2/core/impl/AssertionIDRefImpl.java   |  4 +--
 .../saml2/core/impl/AssertionIDRefMarshaller.java  |  2 +-
 .../core/impl/AssertionIDRefUnmarshaller.java      |  2 +-
 .../saml2/core/impl/AssertionIDRequestBuilder.java |  2 +-
 .../saml2/core/impl/AssertionIDRequestImpl.java    |  2 +-
 .../core/impl/AssertionIDRequestUnmarshaller.java  |  2 +-
 .../saml/saml2/core/impl/AssertionImpl.java        | 18 ++++++-------
 .../saml/saml2/core/impl/AssertionMarshaller.java  |  2 +-
 .../saml2/core/impl/AssertionURIRefBuilder.java    |  2 +-
 .../saml/saml2/core/impl/AssertionURIRefImpl.java  |  4 +--
 .../saml2/core/impl/AssertionURIRefMarshaller.java |  2 +-
 .../core/impl/AssertionURIRefUnmarshaller.java     |  2 +-
 .../saml2/core/impl/AssertionUnmarshaller.java     |  4 +--
 .../saml/saml2/core/impl/AttributeBuilder.java     |  2 +-
 .../saml/saml2/core/impl/AttributeImpl.java        |  8 +++---
 .../saml/saml2/core/impl/AttributeMarshaller.java  |  2 +-
 .../saml2/core/impl/AttributeQueryBuilder.java     |  2 +-
 .../saml/saml2/core/impl/AttributeQueryImpl.java   |  2 +-
 .../core/impl/AttributeQueryUnmarshaller.java      |  2 +-
 .../saml2/core/impl/AttributeStatementBuilder.java |  2 +-
 .../saml2/core/impl/AttributeStatementImpl.java    |  2 +-
 .../core/impl/AttributeStatementUnmarshaller.java  |  2 +-
 .../saml2/core/impl/AttributeUnmarshaller.java     |  4 +--
 .../saml/saml2/core/impl/AudienceBuilder.java      |  2 +-
 .../saml/saml2/core/impl/AudienceImpl.java         |  4 +--
 .../saml/saml2/core/impl/AudienceMarshaller.java   |  2 +-
 .../core/impl/AudienceRestrictionBuilder.java      |  2 +-
 .../saml2/core/impl/AudienceRestrictionImpl.java   |  2 +-
 .../core/impl/AudienceRestrictionUnmarshaller.java |  2 +-
 .../saml/saml2/core/impl/AudienceUnmarshaller.java |  2 +-
 .../core/impl/AuthenticatingAuthorityBuilder.java  |  2 +-
 .../core/impl/AuthenticatingAuthorityImpl.java     |  4 +--
 .../impl/AuthenticatingAuthorityMarshaller.java    |  2 +-
 .../impl/AuthenticatingAuthorityUnmarshaller.java  |  2 +-
 .../saml/saml2/core/impl/AuthnContextBuilder.java  |  2 +-
 .../core/impl/AuthnContextClassRefBuilder.java     |  2 +-
 .../saml2/core/impl/AuthnContextClassRefImpl.java  |  4 +--
 .../core/impl/AuthnContextClassRefMarshaller.java  |  2 +-
 .../impl/AuthnContextClassRefUnmarshaller.java     |  2 +-
 .../saml2/core/impl/AuthnContextDeclBuilder.java   |  2 +-
 .../saml/saml2/core/impl/AuthnContextDeclImpl.java |  6 ++---
 .../core/impl/AuthnContextDeclMarshaller.java      |  4 +--
 .../core/impl/AuthnContextDeclRefBuilder.java      |  2 +-
 .../saml2/core/impl/AuthnContextDeclRefImpl.java   |  4 +--
 .../core/impl/AuthnContextDeclRefMarshaller.java   |  2 +-
 .../core/impl/AuthnContextDeclRefUnmarshaller.java |  2 +-
 .../core/impl/AuthnContextDeclUnmarshaller.java    |  6 ++---
 .../saml/saml2/core/impl/AuthnContextImpl.java     |  8 +++---
 .../saml2/core/impl/AuthnContextUnmarshaller.java  |  2 +-
 .../saml/saml2/core/impl/AuthnQueryBuilder.java    |  2 +-
 .../saml/saml2/core/impl/AuthnQueryImpl.java       |  6 ++---
 .../saml/saml2/core/impl/AuthnQueryMarshaller.java |  2 +-
 .../saml2/core/impl/AuthnQueryUnmarshaller.java    |  4 +--
 .../saml/saml2/core/impl/AuthnRequestBuilder.java  |  2 +-
 .../saml/saml2/core/impl/AuthnRequestImpl.java     | 30 +++++++++++-----------
 .../saml2/core/impl/AuthnRequestMarshaller.java    |  2 +-
 .../saml2/core/impl/AuthnRequestUnmarshaller.java  |  4 +--
 .../saml2/core/impl/AuthnStatementBuilder.java     |  2 +-
 .../saml/saml2/core/impl/AuthnStatementImpl.java   | 12 ++++-----
 .../saml2/core/impl/AuthnStatementMarshaller.java  |  2 +-
 .../core/impl/AuthnStatementUnmarshaller.java      |  4 +--
 .../saml2/core/impl/AuthzDecisionQueryBuilder.java |  2 +-
 .../saml2/core/impl/AuthzDecisionQueryImpl.java    |  6 ++---
 .../core/impl/AuthzDecisionQueryMarshaller.java    |  2 +-
 .../core/impl/AuthzDecisionQueryUnmarshaller.java  |  4 +--
 .../core/impl/AuthzDecisionStatementBuilder.java   |  2 +-
 .../core/impl/AuthzDecisionStatementImpl.java      |  8 +++---
 .../impl/AuthzDecisionStatementMarshaller.java     |  2 +-
 .../impl/AuthzDecisionStatementUnmarshaller.java   |  4 +--
 .../opensaml/saml/saml2/core/impl/BaseIDImpl.java  |  6 ++---
 .../saml/saml2/core/impl/BaseIDMarshaller.java     |  2 +-
 .../saml/saml2/core/impl/BaseIDUnmarshaller.java   |  2 +-
 .../saml/saml2/core/impl/ConditionsBuilder.java    |  2 +-
 .../saml/saml2/core/impl/ConditionsImpl.java       |  6 ++---
 .../saml/saml2/core/impl/ConditionsMarshaller.java |  2 +-
 .../saml2/core/impl/ConditionsUnmarshaller.java    |  4 +--
 .../saml2/core/impl/EncryptedAssertionBuilder.java |  2 +-
 .../saml2/core/impl/EncryptedAssertionImpl.java    |  2 +-
 .../saml2/core/impl/EncryptedAttributeBuilder.java |  2 +-
 .../saml2/core/impl/EncryptedAttributeImpl.java    |  2 +-
 .../saml2/core/impl/EncryptedElementTypeImpl.java  |  4 +--
 .../impl/EncryptedElementTypeUnmarshaller.java     |  2 +-
 .../saml/saml2/core/impl/EncryptedIDBuilder.java   |  2 +-
 .../saml/saml2/core/impl/EncryptedIDImpl.java      |  2 +-
 .../saml/saml2/core/impl/EvidenceBuilder.java      |  2 +-
 .../saml/saml2/core/impl/EvidenceImpl.java         |  2 +-
 .../saml/saml2/core/impl/EvidenceUnmarshaller.java |  2 +-
 .../saml/saml2/core/impl/ExtensionsBuilder.java    |  2 +-
 .../saml/saml2/core/impl/ExtensionsImpl.java       |  4 +--
 .../saml/saml2/core/impl/ExtensionsMarshaller.java |  4 +--
 .../saml2/core/impl/ExtensionsUnmarshaller.java    |  6 ++---
 .../saml/saml2/core/impl/GetCompleteBuilder.java   |  2 +-
 .../saml/saml2/core/impl/GetCompleteImpl.java      |  4 +--
 .../saml2/core/impl/GetCompleteMarshaller.java     |  2 +-
 .../saml2/core/impl/GetCompleteUnmarshaller.java   |  2 +-
 .../saml/saml2/core/impl/IDPEntryBuilder.java      |  2 +-
 .../saml/saml2/core/impl/IDPEntryImpl.java         |  8 +++---
 .../saml/saml2/core/impl/IDPEntryMarshaller.java   |  2 +-
 .../saml/saml2/core/impl/IDPEntryUnmarshaller.java |  2 +-
 .../saml/saml2/core/impl/IDPListBuilder.java       |  2 +-
 .../opensaml/saml/saml2/core/impl/IDPListImpl.java |  4 +--
 .../saml/saml2/core/impl/IDPListUnmarshaller.java  |  2 +-
 .../saml/saml2/core/impl/IssuerBuilder.java        |  2 +-
 .../opensaml/saml/saml2/core/impl/IssuerImpl.java  |  2 +-
 .../impl/KeyInfoConfirmationDataTypeBuilder.java   |  2 +-
 .../core/impl/KeyInfoConfirmationDataTypeImpl.java |  2 +-
 .../saml/saml2/core/impl/LogoutRequestBuilder.java |  2 +-
 .../saml/saml2/core/impl/LogoutRequestImpl.java    | 12 ++++-----
 .../saml2/core/impl/LogoutRequestMarshaller.java   |  2 +-
 .../saml2/core/impl/LogoutRequestUnmarshaller.java |  4 +--
 .../saml2/core/impl/LogoutResponseBuilder.java     |  2 +-
 .../saml/saml2/core/impl/LogoutResponseImpl.java   |  2 +-
 .../core/impl/ManageNameIDRequestBuilder.java      |  2 +-
 .../saml2/core/impl/ManageNameIDRequestImpl.java   | 12 ++++-----
 .../core/impl/ManageNameIDRequestUnmarshaller.java |  2 +-
 .../core/impl/ManageNameIDResponseBuilder.java     |  2 +-
 .../saml2/core/impl/ManageNameIDResponseImpl.java  |  2 +-
 .../saml/saml2/core/impl/NameIDBuilder.java        |  2 +-
 .../opensaml/saml/saml2/core/impl/NameIDImpl.java  |  2 +-
 .../core/impl/NameIDMappingRequestBuilder.java     |  2 +-
 .../saml2/core/impl/NameIDMappingRequestImpl.java  | 10 ++++----
 .../impl/NameIDMappingRequestUnmarshaller.java     |  2 +-
 .../core/impl/NameIDMappingResponseBuilder.java    |  2 +-
 .../saml2/core/impl/NameIDMappingResponseImpl.java |  6 ++---
 .../impl/NameIDMappingResponseUnmarshaller.java    |  2 +-
 .../saml/saml2/core/impl/NameIDPolicyBuilder.java  |  2 +-
 .../saml/saml2/core/impl/NameIDPolicyImpl.java     | 10 ++++----
 .../saml2/core/impl/NameIDPolicyMarshaller.java    |  2 +-
 .../saml2/core/impl/NameIDPolicyUnmarshaller.java  |  2 +-
 .../saml2/core/impl/NewEncryptedIDBuilder.java     |  2 +-
 .../saml/saml2/core/impl/NewEncryptedIDImpl.java   |  2 +-
 .../saml/saml2/core/impl/NewIDBuilder.java         |  2 +-
 .../opensaml/saml/saml2/core/impl/NewIDImpl.java   |  4 +--
 .../saml/saml2/core/impl/NewIDMarshaller.java      |  2 +-
 .../saml/saml2/core/impl/NewIDUnmarshaller.java    |  2 +-
 .../saml/saml2/core/impl/OneTimeUseBuilder.java    |  2 +-
 .../saml/saml2/core/impl/OneTimeUseImpl.java       |  2 +-
 .../saml2/core/impl/ProxyRestrictionBuilder.java   |  2 +-
 .../saml/saml2/core/impl/ProxyRestrictionImpl.java |  4 +--
 .../core/impl/ProxyRestrictionMarshaller.java      |  2 +-
 .../core/impl/ProxyRestrictionUnmarshaller.java    |  4 +--
 .../saml2/core/impl/RequestAbstractTypeImpl.java   | 16 ++++++------
 .../core/impl/RequestAbstractTypeMarshaller.java   |  2 +-
 .../core/impl/RequestAbstractTypeUnmarshaller.java |  4 +--
 .../core/impl/RequestedAuthnContextBuilder.java    |  2 +-
 .../saml2/core/impl/RequestedAuthnContextImpl.java |  4 +--
 .../core/impl/RequestedAuthnContextMarshaller.java |  2 +-
 .../impl/RequestedAuthnContextUnmarshaller.java    |  4 +--
 .../saml/saml2/core/impl/RequesterIDBuilder.java   |  2 +-
 .../saml/saml2/core/impl/RequesterIDImpl.java      |  4 +--
 .../saml2/core/impl/RequesterIDMarshaller.java     |  2 +-
 .../saml2/core/impl/RequesterIDUnmarshaller.java   |  2 +-
 .../saml/saml2/core/impl/ResponseBuilder.java      |  2 +-
 .../saml/saml2/core/impl/ResponseImpl.java         |  2 +-
 .../saml/saml2/core/impl/ResponseUnmarshaller.java |  2 +-
 .../saml/saml2/core/impl/ScopingBuilder.java       |  2 +-
 .../opensaml/saml/saml2/core/impl/ScopingImpl.java |  6 ++---
 .../saml/saml2/core/impl/ScopingMarshaller.java    |  2 +-
 .../saml/saml2/core/impl/ScopingUnmarshaller.java  |  4 +--
 .../saml/saml2/core/impl/SessionIndexBuilder.java  |  2 +-
 .../saml/saml2/core/impl/SessionIndexImpl.java     |  4 +--
 .../saml2/core/impl/SessionIndexMarshaller.java    |  2 +-
 .../saml2/core/impl/SessionIndexUnmarshaller.java  |  2 +-
 .../saml/saml2/core/impl/StatusBuilder.java        |  2 +-
 .../saml/saml2/core/impl/StatusCodeBuilder.java    |  2 +-
 .../saml/saml2/core/impl/StatusCodeImpl.java       |  6 ++---
 .../saml/saml2/core/impl/StatusCodeMarshaller.java |  2 +-
 .../saml2/core/impl/StatusCodeUnmarshaller.java    |  4 +--
 .../saml/saml2/core/impl/StatusDetailBuilder.java  |  2 +-
 .../saml/saml2/core/impl/StatusDetailImpl.java     |  4 +--
 .../saml2/core/impl/StatusDetailUnmarshaller.java  |  2 +-
 .../opensaml/saml/saml2/core/impl/StatusImpl.java  |  8 +++---
 .../saml/saml2/core/impl/StatusMessageBuilder.java |  2 +-
 .../saml/saml2/core/impl/StatusMessageImpl.java    |  4 +--
 .../saml2/core/impl/StatusMessageMarshaller.java   |  2 +-
 .../saml2/core/impl/StatusMessageUnmarshaller.java |  2 +-
 .../saml2/core/impl/StatusResponseTypeImpl.java    | 20 +++++++--------
 .../core/impl/StatusResponseTypeMarshaller.java    |  2 +-
 .../core/impl/StatusResponseTypeUnmarshaller.java  |  4 +--
 .../saml/saml2/core/impl/StatusUnmarshaller.java   |  2 +-
 .../saml/saml2/core/impl/SubjectBuilder.java       |  2 +-
 .../core/impl/SubjectConfirmationBuilder.java      |  2 +-
 .../core/impl/SubjectConfirmationDataBuilder.java  |  2 +-
 .../core/impl/SubjectConfirmationDataImpl.java     | 14 +++++-----
 .../impl/SubjectConfirmationDataMarshaller.java    |  2 +-
 .../impl/SubjectConfirmationDataUnmarshaller.java  |  4 +--
 .../saml2/core/impl/SubjectConfirmationImpl.java   | 12 ++++-----
 .../core/impl/SubjectConfirmationMarshaller.java   |  2 +-
 .../core/impl/SubjectConfirmationUnmarshaller.java |  4 +--
 .../opensaml/saml/saml2/core/impl/SubjectImpl.java |  8 +++---
 .../saml2/core/impl/SubjectLocalityBuilder.java    |  2 +-
 .../saml/saml2/core/impl/SubjectLocalityImpl.java  |  6 ++---
 .../saml2/core/impl/SubjectLocalityMarshaller.java |  2 +-
 .../core/impl/SubjectLocalityUnmarshaller.java     |  2 +-
 .../saml/saml2/core/impl/SubjectQueryImpl.java     |  4 +--
 .../saml2/core/impl/SubjectQueryUnmarshaller.java  |  2 +-
 .../saml/saml2/core/impl/SubjectUnmarshaller.java  |  2 +-
 .../saml/saml2/core/impl/TerminateBuilder.java     |  2 +-
 .../saml/saml2/core/impl/TerminateImpl.java        |  2 +-
 .../saml/saml2/ecp/impl/RelayStateBuilder.java     |  2 +-
 .../saml/saml2/ecp/impl/RelayStateImpl.java        |  8 +++---
 .../saml/saml2/ecp/impl/RelayStateMarshaller.java  |  2 +-
 .../saml2/ecp/impl/RelayStateUnmarshaller.java     |  2 +-
 .../ecp/impl/RequestAuthenticatedBuilder.java      |  2 +-
 .../saml2/ecp/impl/RequestAuthenticatedImpl.java   |  8 +++---
 .../ecp/impl/RequestAuthenticatedMarshaller.java   |  2 +-
 .../ecp/impl/RequestAuthenticatedUnmarshaller.java |  2 +-
 .../saml/saml2/ecp/impl/RequestBuilder.java        |  2 +-
 .../opensaml/saml/saml2/ecp/impl/RequestImpl.java  | 18 ++++++-------
 .../saml/saml2/ecp/impl/RequestMarshaller.java     |  2 +-
 .../saml/saml2/ecp/impl/RequestUnmarshaller.java   |  4 +--
 .../saml/saml2/ecp/impl/ResponseBuilder.java       |  2 +-
 .../opensaml/saml/saml2/ecp/impl/ResponseImpl.java | 10 ++++----
 .../saml/saml2/ecp/impl/ResponseMarshaller.java    |  2 +-
 .../saml/saml2/ecp/impl/ResponseUnmarshaller.java  |  2 +-
 .../saml2/ecp/impl/SubjectConfirmationBuilder.java |  2 +-
 .../saml2/ecp/impl/SubjectConfirmationImpl.java    | 12 ++++-----
 .../ecp/impl/SubjectConfirmationMarshaller.java    |  2 +-
 .../ecp/impl/SubjectConfirmationUnmarshaller.java  |  4 +--
 .../impl/AdditionalMetadataLocationBuilder.java    |  2 +-
 .../impl/AdditionalMetadataLocationImpl.java       |  6 ++---
 .../impl/AdditionalMetadataLocationMarshaller.java |  4 +--
 .../AdditionalMetadataLocationUnmarshaller.java    |  4 +--
 .../metadata/impl/AffiliateMemberBuilder.java      |  2 +-
 .../saml2/metadata/impl/AffiliateMemberImpl.java   |  4 +--
 .../metadata/impl/AffiliateMemberMarshaller.java   |  2 +-
 .../metadata/impl/AffiliateMemberUnmarshaller.java |  2 +-
 .../impl/AffiliationDescriptorBuilder.java         |  2 +-
 .../metadata/impl/AffiliationDescriptorImpl.java   | 12 ++++-----
 .../impl/AffiliationDescriptorMarshaller.java      |  2 +-
 .../impl/AffiliationDescriptorUnmarshaller.java    |  4 +--
 .../impl/ArtifactResolutionServiceBuilder.java     |  2 +-
 .../impl/ArtifactResolutionServiceImpl.java        |  2 +-
 .../impl/AssertionConsumerServiceBuilder.java      |  2 +-
 .../impl/AssertionConsumerServiceImpl.java         |  2 +-
 .../impl/AssertionIDRequestServiceBuilder.java     |  2 +-
 .../impl/AssertionIDRequestServiceImpl.java        |  2 +-
 .../impl/AttributeAuthorityDescriptorBuilder.java  |  2 +-
 .../impl/AttributeAuthorityDescriptorImpl.java     |  4 +--
 .../AttributeAuthorityDescriptorUnmarshaller.java  |  2 +-
 .../impl/AttributeConsumingServiceBuilder.java     |  2 +-
 .../impl/AttributeConsumingServiceImpl.java        |  8 +++---
 .../impl/AttributeConsumingServiceMarshaller.java  |  2 +-
 .../AttributeConsumingServiceUnmarshaller.java     |  4 +--
 .../metadata/impl/AttributeProfileBuilder.java     |  2 +-
 .../saml2/metadata/impl/AttributeProfileImpl.java  |  4 +--
 .../metadata/impl/AttributeProfileMarshaller.java  |  2 +-
 .../impl/AttributeProfileUnmarshaller.java         |  2 +-
 .../metadata/impl/AttributeServiceBuilder.java     |  2 +-
 .../saml2/metadata/impl/AttributeServiceImpl.java  |  2 +-
 .../impl/AuthnAuthorityDescriptorBuilder.java      |  2 +-
 .../impl/AuthnAuthorityDescriptorImpl.java         |  4 +--
 .../impl/AuthnAuthorityDescriptorUnmarshaller.java |  2 +-
 .../metadata/impl/AuthnQueryServiceBuilder.java    |  2 +-
 .../saml2/metadata/impl/AuthnQueryServiceImpl.java |  2 +-
 .../saml2/metadata/impl/AuthzServiceBuilder.java   |  2 +-
 .../saml/saml2/metadata/impl/AuthzServiceImpl.java |  2 +-
 .../saml/saml2/metadata/impl/CompanyBuilder.java   |  2 +-
 .../saml/saml2/metadata/impl/CompanyImpl.java      |  4 +--
 .../saml2/metadata/impl/CompanyMarshaller.java     |  2 +-
 .../saml2/metadata/impl/CompanyUnmarshaller.java   |  2 +-
 .../saml2/metadata/impl/ContactPersonBuilder.java  |  2 +-
 .../saml2/metadata/impl/ContactPersonImpl.java     | 12 ++++-----
 .../metadata/impl/ContactPersonMarshaller.java     |  2 +-
 .../metadata/impl/ContactPersonUnmarshaller.java   |  4 +--
 .../saml2/metadata/impl/EmailAddressBuilder.java   |  2 +-
 .../saml/saml2/metadata/impl/EmailAddressImpl.java |  4 +--
 .../metadata/impl/EmailAddressMarshaller.java      |  2 +-
 .../metadata/impl/EmailAddressUnmarshaller.java    |  2 +-
 .../metadata/impl/EncryptionMethodBuilder.java     |  2 +-
 .../saml2/metadata/impl/EncryptionMethodImpl.java  |  2 +-
 .../saml/saml2/metadata/impl/EndpointImpl.java     | 10 ++++----
 .../saml2/metadata/impl/EndpointMarshaller.java    |  2 +-
 .../saml2/metadata/impl/EndpointUnmarshaller.java  |  4 +--
 .../metadata/impl/EntitiesDescriptorBuilder.java   |  2 +-
 .../metadata/impl/EntitiesDescriptorImpl.java      | 12 ++++-----
 .../impl/EntitiesDescriptorMarshaller.java         |  2 +-
 .../impl/EntitiesDescriptorUnmarshaller.java       |  4 +--
 .../metadata/impl/EntityDescriptorBuilder.java     |  2 +-
 .../saml2/metadata/impl/EntityDescriptorImpl.java  | 30 +++++++++++-----------
 .../metadata/impl/EntityDescriptorMarshaller.java  |  2 +-
 .../impl/EntityDescriptorUnmarshaller.java         |  4 +--
 .../saml2/metadata/impl/ExtensionsBuilder.java     |  2 +-
 .../saml/saml2/metadata/impl/ExtensionsImpl.java   |  4 +--
 .../saml2/metadata/impl/ExtensionsMarshaller.java  |  4 +--
 .../metadata/impl/ExtensionsUnmarshaller.java      |  6 ++---
 .../saml/saml2/metadata/impl/GivenNameBuilder.java |  2 +-
 .../saml/saml2/metadata/impl/GivenNameImpl.java    |  4 +--
 .../saml2/metadata/impl/GivenNameMarshaller.java   |  2 +-
 .../saml2/metadata/impl/GivenNameUnmarshaller.java |  2 +-
 .../metadata/impl/IDPSSODescriptorBuilder.java     |  2 +-
 .../saml2/metadata/impl/IDPSSODescriptorImpl.java  |  8 +++---
 .../metadata/impl/IDPSSODescriptorMarshaller.java  |  2 +-
 .../impl/IDPSSODescriptorUnmarshaller.java         |  4 +--
 .../saml2/metadata/impl/IndexedEndpointImpl.java   |  8 +++---
 .../metadata/impl/IndexedEndpointMarshaller.java   |  2 +-
 .../metadata/impl/IndexedEndpointUnmarshaller.java |  2 +-
 .../saml2/metadata/impl/KeyDescriptorBuilder.java  |  2 +-
 .../saml2/metadata/impl/KeyDescriptorImpl.java     |  6 ++---
 .../metadata/impl/KeyDescriptorMarshaller.java     |  2 +-
 .../metadata/impl/KeyDescriptorUnmarshaller.java   |  4 +--
 .../saml2/metadata/impl/LocalizedNameImpl.java     |  4 +--
 .../metadata/impl/LocalizedNameMarshaller.java     |  4 +--
 .../metadata/impl/LocalizedNameUnmarshaller.java   |  4 +--
 .../saml/saml2/metadata/impl/LocalizedURIImpl.java |  4 +--
 .../metadata/impl/LocalizedURIMarshaller.java      |  4 +--
 .../metadata/impl/LocalizedURIUnmarshaller.java    |  4 +--
 .../metadata/impl/ManageNameIDServiceBuilder.java  |  2 +-
 .../metadata/impl/ManageNameIDServiceImpl.java     |  2 +-
 .../saml2/metadata/impl/NameIDFormatBuilder.java   |  2 +-
 .../saml/saml2/metadata/impl/NameIDFormatImpl.java |  4 +--
 .../metadata/impl/NameIDFormatMarshaller.java      |  2 +-
 .../metadata/impl/NameIDFormatUnmarshaller.java    |  2 +-
 .../metadata/impl/NameIDMappingServiceBuilder.java |  2 +-
 .../metadata/impl/NameIDMappingServiceImpl.java    |  2 +-
 .../saml2/metadata/impl/OrganizationBuilder.java   |  2 +-
 .../impl/OrganizationDisplayNameBuilder.java       |  2 +-
 .../metadata/impl/OrganizationDisplayNameImpl.java |  2 +-
 .../saml/saml2/metadata/impl/OrganizationImpl.java |  4 +--
 .../metadata/impl/OrganizationMarshaller.java      |  2 +-
 .../metadata/impl/OrganizationNameBuilder.java     |  2 +-
 .../saml2/metadata/impl/OrganizationNameImpl.java  |  2 +-
 .../metadata/impl/OrganizationURLBuilder.java      |  2 +-
 .../saml2/metadata/impl/OrganizationURLImpl.java   |  2 +-
 .../metadata/impl/OrganizationUnmarshaller.java    |  4 +--
 .../saml2/metadata/impl/PDPDescriptorBuilder.java  |  2 +-
 .../saml2/metadata/impl/PDPDescriptorImpl.java     |  4 +--
 .../metadata/impl/PDPDescriptorUnmarshaller.java   |  2 +-
 .../metadata/impl/RequestedAttributeBuilder.java   |  2 +-
 .../metadata/impl/RequestedAttributeImpl.java      |  6 ++---
 .../impl/RequestedAttributeMarshaller.java         |  2 +-
 .../impl/RequestedAttributeUnmarshaller.java       |  2 +-
 .../saml2/metadata/impl/RoleDescriptorImpl.java    | 18 ++++++-------
 .../metadata/impl/RoleDescriptorMarshaller.java    |  2 +-
 .../metadata/impl/RoleDescriptorUnmarshaller.java  |  4 +--
 .../metadata/impl/SPSSODescriptorBuilder.java      |  2 +-
 .../saml2/metadata/impl/SPSSODescriptorImpl.java   | 12 ++++-----
 .../metadata/impl/SPSSODescriptorMarshaller.java   |  2 +-
 .../metadata/impl/SPSSODescriptorUnmarshaller.java |  4 +--
 .../saml2/metadata/impl/SSODescriptorImpl.java     |  4 +--
 .../metadata/impl/SSODescriptorUnmarshaller.java   |  2 +-
 .../metadata/impl/ServiceDescriptionBuilder.java   |  2 +-
 .../metadata/impl/ServiceDescriptionImpl.java      |  2 +-
 .../saml2/metadata/impl/ServiceNameBuilder.java    |  2 +-
 .../saml/saml2/metadata/impl/ServiceNameImpl.java  |  2 +-
 .../metadata/impl/SingleLogoutServiceBuilder.java  |  2 +-
 .../metadata/impl/SingleLogoutServiceImpl.java     |  2 +-
 .../metadata/impl/SingleSignOnServiceBuilder.java  |  2 +-
 .../metadata/impl/SingleSignOnServiceImpl.java     |  2 +-
 .../saml/saml2/metadata/impl/SurNameBuilder.java   |  2 +-
 .../saml/saml2/metadata/impl/SurNameImpl.java      |  4 +--
 .../saml2/metadata/impl/SurNameMarshaller.java     |  2 +-
 .../saml2/metadata/impl/SurNameUnmarshaller.java   |  2 +-
 .../metadata/impl/TelephoneNumberBuilder.java      |  2 +-
 .../saml2/metadata/impl/TelephoneNumberImpl.java   |  4 +--
 .../metadata/impl/TelephoneNumberMarshaller.java   |  2 +-
 .../metadata/impl/TelephoneNumberUnmarshaller.java |  2 +-
 .../profile/impl/AbstractResponseShellAction.java  |  2 +-
 .../saml2/profile/impl/AddNameIDToSubjects.java    |  2 +-
 .../saml2/profile/impl/AddStatusResponseShell.java |  2 +-
 .../saml2/profile/impl/AddStatusToResponse.java    |  2 +-
 .../impl/AddSubjectConfirmationToSubjects.java     | 10 ++++----
 ...ultSAML20AssertionValidationContextBuilder.java |  6 ++---
 ...ecuritySAML20AssertionTokenSecurityHandler.java |  4 +--
 .../InlineSelfEncryptionParametersStrategy.java    |  6 ++---
 .../security/impl/SAMLMDCredentialContext.java     |  2 +-
 .../impl/SAMLSignatureProfileValidator.java        | 18 ++++++-------
 667 files changed, 1194 insertions(+), 1194 deletions(-)

diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/ExpiringSAMLArtifactMapEntryFactory.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/ExpiringSAMLArtifactMapEntryFactory.java
index bba9e0a..93a13ee 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/ExpiringSAMLArtifactMapEntryFactory.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/ExpiringSAMLArtifactMapEntryFactory.java
@@ -39,7 +39,7 @@ public class ExpiringSAMLArtifactMapEntryFactory implements SAMLArtifactMapEntry
     @Override
     @Nonnull public SAMLArtifactMapEntry newEntry(@Nonnull @NotEmpty final String artifact,
             @Nonnull @NotEmpty final String issuerId, @Nonnull @NotEmpty final String relyingPartyId,
-            @Nonnull SAMLObject samlMessage) {
+            @Nonnull final SAMLObject samlMessage) {
         
         try {
             return new ExpiringSAMLArtifactMapEntry(artifact, issuerId, relyingPartyId, samlMessage);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMapEntryFactory.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMapEntryFactory.java
index 4c1d25d..0ef3bc7 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMapEntryFactory.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMapEntryFactory.java
@@ -95,11 +95,11 @@ public class StorageServiceSAMLArtifactMapEntryFactory extends AbstractInitializ
     @Override
     @Nonnull public SAMLArtifactMapEntry newEntry(@Nonnull @NotEmpty final String artifact,
             @Nonnull @NotEmpty final String issuerId, @Nonnull @NotEmpty final String relyingPartyId,
-            @Nonnull SAMLObject samlMessage) {
+            @Nonnull final SAMLObject samlMessage) {
         
         try {
             return new BasicSAMLArtifactMapEntry(artifact, issuerId, relyingPartyId, samlMessage);
-        } catch (MarshallingException | UnmarshallingException e) {
+        } catch (final MarshallingException | UnmarshallingException e) {
             throw new XMLRuntimeException("Error creating BasicSAMLArtifactMapEntry", e);
         }
     }
@@ -112,7 +112,7 @@ public class StorageServiceSAMLArtifactMapEntryFactory extends AbstractInitializ
         final Element marshalledMessage;
         try {
             marshalledMessage = XMLObjectSupport.marshall(instance.getSamlMessage());
-        } catch (MarshallingException e) {
+        } catch (final MarshallingException e) {
             throw new IOException("Error marshalling SAML message", e);
         }
         
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLProtocolAndRoleHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLProtocolAndRoleHandler.java
index cf2ac43..cf730ae 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLProtocolAndRoleHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLProtocolAndRoleHandler.java
@@ -98,7 +98,7 @@ public class SAMLProtocolAndRoleHandler extends AbstractMessageHandler {
     
     /** {@inheritDoc} */
     @Override
-    protected void doInvoke(MessageContext messageContext) throws MessageHandlerException {
+    protected void doInvoke(final MessageContext messageContext) throws MessageHandlerException {
         messageContext.getSubcontext(SAMLProtocolContext.class, true).setProtocol(samlProtocol);
         messageContext.getSubcontext(entityContextClass, true).setRole(peerRole);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/BaseSAMLSimpleSignatureSecurityHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/BaseSAMLSimpleSignatureSecurityHandler.java
index 43a1f0a..c1f13b4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/BaseSAMLSimpleSignatureSecurityHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/BaseSAMLSimpleSignatureSecurityHandler.java
@@ -186,7 +186,7 @@ public abstract class BaseSAMLSimpleSignatureSecurityHandler extends AbstractMes
      * @throws MessageHandlerException thrown if there are errors during the signature validation process
      * 
      */
-    private void doEvaluate(@Nonnull @NotEmpty final byte[] signature, @Nonnull @NotEmpty byte[] signedContent,
+    private void doEvaluate(@Nonnull @NotEmpty final byte[] signature, @Nonnull @NotEmpty final byte[] signedContent,
             @Nonnull @NotEmpty final String algorithmURI, @Nonnull final MessageContext messageContext)
                     throws MessageHandlerException {
 
@@ -289,7 +289,7 @@ public abstract class BaseSAMLSimpleSignatureSecurityHandler extends AbstractMes
                 log.warn("{} Signature validation using request-derived credentials failed", getLogPrefix());
                 return false;
             }
-        } catch (SecurityException e) {
+        } catch (final SecurityException e) {
             log.warn("{} Error evaluating the request's simple signature using the trust engine", getLogPrefix(), e);
             throw new MessageHandlerException("Error during trust engine evaluation of the simple signature", e);
         }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/EndpointURLSchemeSecurityHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/EndpointURLSchemeSecurityHandler.java
index c4ec84e..75698f0 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/EndpointURLSchemeSecurityHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/EndpointURLSchemeSecurityHandler.java
@@ -45,7 +45,7 @@ public class EndpointURLSchemeSecurityHandler extends AbstractMessageHandler {
         URI endpointUrl;
         try {
             endpointUrl = SAMLBindingSupport.getEndpointURL(messageContext);
-        } catch (BindingException e) {
+        } catch (final BindingException e) {
             throw new MessageHandlerException("Could not obtain message endpoint URL", e);
         }
         
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandler.java
index eb48b23..055c497 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/ReceivedEndpointSecurityHandler.java
@@ -160,7 +160,7 @@ public class ReceivedEndpointSecurityHandler extends AbstractMessageHandler {
         try {
             messageDestination = StringSupport.trimOrNull(
                     SAMLBindingSupport.getIntendedDestinationEndpointURI(messageContext));
-        } catch (MessageException e) {
+        } catch (final MessageException e) {
             throw new MessageHandlerException("Error obtaining message intended destination endpoint URI", e);
         }
         
@@ -183,7 +183,7 @@ public class ReceivedEndpointSecurityHandler extends AbstractMessageHandler {
         try {
             receiverEndpoint = StringSupport.trimOrNull(
                     SAMLBindingSupport.getActualReceiverEndpointURI(messageContext, getHttpServletRequest()));
-        } catch (MessageException e) {
+        } catch (final MessageException e) {
             throw new MessageHandlerException("Error obtaining message received endpoint URI", e);
         }
         
@@ -193,7 +193,7 @@ public class ReceivedEndpointSecurityHandler extends AbstractMessageHandler {
         boolean matched;
         try {
             matched = compareEndpointURIs(messageDestination, receiverEndpoint, comparator);
-        } catch (URIException e) {
+        } catch (final URIException e) {
             throw new MessageHandlerException("Error comparing endpoint URI's", e);
         }
         if (!matched) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/SAMLOutboundProtocolMessageSigningHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/SAMLOutboundProtocolMessageSigningHandler.java
index 7e6446f..fbd987c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/SAMLOutboundProtocolMessageSigningHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/SAMLOutboundProtocolMessageSigningHandler.java
@@ -77,7 +77,7 @@ public class SAMLOutboundProtocolMessageSigningHandler extends AbstractMessageHa
             } else {
                 try {
                     SAMLMessageSecuritySupport.signMessage(messageContext);
-                } catch (SecurityException | MarshallingException | SignatureException e) {
+                } catch (final SecurityException | MarshallingException | SignatureException e) {
                     throw new MessageHandlerException("Error signing outbound protocol message", e);
                 }
             }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponse.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponse.java
index 4a5a815..ac08455 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponse.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponse.java
@@ -161,7 +161,7 @@ public class AddInResponseToToResponse extends AbstractConditionalProfileAction
          * 
          * @param bindings collection of bindings
          */
-        public void setSuppressForBindings(@Nonnull @NonnullElements Collection<String> bindings) {
+        public void setSuppressForBindings(@Nonnull @NonnullElements final Collection<String> bindings) {
             Constraint.isNotNull(bindings, "Bindings collection cannot be null");
             
             suppressForBindings = new HashSet<>();
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/ChainingNameIdentifierGenerator.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/ChainingNameIdentifierGenerator.java
index bfa9db0..d80d322 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/ChainingNameIdentifierGenerator.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/ChainingNameIdentifierGenerator.java
@@ -73,7 +73,7 @@ public class ChainingNameIdentifierGenerator<NameIdType extends SAMLObject>
      * @param generators generators to use
      */
     public void setGenerators(
-            @Nonnull @NullableElements List<NameIdentifierGenerator<NameIdType>> generators) {
+            @Nonnull @NullableElements final List<NameIdentifierGenerator<NameIdType>> generators) {
         Constraint.isNotNull(generators, "NameIdentifierGenerator list cannot be null");
         
         nameIdGeneratorMap.clear();
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/PopulateSignatureSigningParameters.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/PopulateSignatureSigningParameters.java
index 7ee5393..32a9b96 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/PopulateSignatureSigningParameters.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/PopulateSignatureSigningParameters.java
@@ -168,7 +168,7 @@ public class PopulateSignatureSigningParameters extends AbstractConditionalProfi
             throw new ComponentInitializationException("SignatureSigningParametersResolver cannot be null");
         } else if (configurationLookupStrategy == null) {
             configurationLookupStrategy = new Function<ProfileRequestContext,List<SignatureSigningConfiguration>>() {
-                public List<SignatureSigningConfiguration> apply(ProfileRequestContext input) {
+                public List<SignatureSigningConfiguration> apply(final ProfileRequestContext input) {
                     return Collections.singletonList(
                             SecurityConfigurationSupport.getGlobalSignatureSigningConfiguration());
                 }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/idpdisco/impl/DiscoveryResponseBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/idpdisco/impl/DiscoveryResponseBuilder.java
index 62fb442..66fa8d4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/idpdisco/impl/DiscoveryResponseBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/idpdisco/impl/DiscoveryResponseBuilder.java
@@ -38,7 +38,7 @@ public class DiscoveryResponseBuilder extends AbstractSAMLObjectBuilder<Discover
 
     /** {@inheritDoc} */
     @Override
-    public DiscoveryResponse buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public DiscoveryResponse buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new DiscoveryResponseImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/idpdisco/impl/DiscoveryResponseImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/idpdisco/impl/DiscoveryResponseImpl.java
index 370edbb..e922ff7 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/idpdisco/impl/DiscoveryResponseImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/idpdisco/impl/DiscoveryResponseImpl.java
@@ -37,7 +37,7 @@ public class DiscoveryResponseImpl extends IndexedEndpointImpl implements Discov
      * @param elementLocalName the local name
      * @param namespacePrefix the prefix
      */
-    protected DiscoveryResponseImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected DiscoveryResponseImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml1md/impl/SourceIDBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml1md/impl/SourceIDBuilder.java
index 3940403..c8b3e18 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml1md/impl/SourceIDBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml1md/impl/SourceIDBuilder.java
@@ -37,7 +37,7 @@ public class SourceIDBuilder extends AbstractSAMLObjectBuilder<SourceID> {
     }
 
     /** {@inheritDoc} */
-    public SourceID buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public SourceID buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new SourceIDImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml1md/impl/SourceIDImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml1md/impl/SourceIDImpl.java
index c8770b9..6fad849 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml1md/impl/SourceIDImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml1md/impl/SourceIDImpl.java
@@ -33,7 +33,7 @@ public class SourceIDImpl extends XSStringImpl implements SourceID {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SourceIDImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SourceIDImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/DigestMethodBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/DigestMethodBuilder.java
index 24ae7b4..8b1f12f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/DigestMethodBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/DigestMethodBuilder.java
@@ -40,7 +40,7 @@ public class DigestMethodBuilder extends AbstractSAMLObjectBuilder<DigestMethod>
     }
 
     /** {@inheritDoc} */
-    public DigestMethod buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public DigestMethod buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new DigestMethodImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/DigestMethodImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/DigestMethodImpl.java
index 6c139f8..e823e37 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/DigestMethodImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/DigestMethodImpl.java
@@ -47,8 +47,8 @@ public class DigestMethodImpl extends AbstractSAMLObject implements DigestMethod
      * @param elementLocalName the element local name
      * @param namespacePrefix the namespace prefix
      */
-    public DigestMethodImpl(@Nullable String namespaceURI, @Nonnull String elementLocalName,
-            @Nullable String namespacePrefix) {
+    public DigestMethodImpl(@Nullable final String namespaceURI, @Nonnull final String elementLocalName,
+            @Nullable final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         unknownChildren = new IndexedXMLObjectChildrenList<>(this);
     }
@@ -59,7 +59,7 @@ public class DigestMethodImpl extends AbstractSAMLObject implements DigestMethod
     }
 
     /** {@inheritDoc} */
-    public void setAlgorithm(@Nullable String newValue) {
+    public void setAlgorithm(@Nullable final String newValue) {
         algorithm = prepareForAssignment(algorithm, newValue);
     }
     
@@ -71,7 +71,7 @@ public class DigestMethodImpl extends AbstractSAMLObject implements DigestMethod
     }
     
     /** {@inheritDoc} */
-    public List<XMLObject> getUnknownXMLObjects(QName typeOrName) {
+    public List<XMLObject> getUnknownXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) unknownChildren.subList(typeOrName);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/DigestMethodMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/DigestMethodMarshaller.java
index 6f72a54..425e5d8 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/DigestMethodMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/DigestMethodMarshaller.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Element;
 public class DigestMethodMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         DigestMethod digestMethod = (DigestMethod) xmlObject;
         
         if (digestMethod.getAlgorithm() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/DigestMethodUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/DigestMethodUnmarshaller.java
index 5ac2bc5..2d4e08a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/DigestMethodUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/DigestMethodUnmarshaller.java
@@ -31,14 +31,14 @@ import org.w3c.dom.Attr;
 public class DigestMethodUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(@Nonnull XMLObject parentXMLObject, @Nonnull XMLObject childXMLObject)
+    protected void processChildElement(@Nonnull final XMLObject parentXMLObject, @Nonnull final XMLObject childXMLObject)
             throws UnmarshallingException {
         final DigestMethod digestMethod = (DigestMethod) parentXMLObject;
         digestMethod.getUnknownXMLObjects().add(childXMLObject);
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(@Nonnull XMLObject xmlObject, @Nonnull Attr attribute) 
+    protected void processAttribute(@Nonnull final XMLObject xmlObject, @Nonnull final Attr attribute) 
             throws UnmarshallingException {
         final DigestMethod digestMethod = (DigestMethod) xmlObject;
         
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/SigningMethodBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/SigningMethodBuilder.java
index a464ee4..3659f7b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/SigningMethodBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/SigningMethodBuilder.java
@@ -40,7 +40,7 @@ public class SigningMethodBuilder extends AbstractSAMLObjectBuilder<SigningMetho
     }
 
     /** {@inheritDoc} */
-    public SigningMethod buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public SigningMethod buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new SigningMethodImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/SigningMethodImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/SigningMethodImpl.java
index 9968f37..26bf5c6 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/SigningMethodImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/SigningMethodImpl.java
@@ -53,8 +53,8 @@ public class SigningMethodImpl extends AbstractSAMLObject implements SigningMeth
      * @param elementLocalName the element local name
      * @param namespacePrefix the namespace prefix
      */
-    public SigningMethodImpl(@Nullable String namespaceURI, @Nonnull String elementLocalName,
-            @Nullable String namespacePrefix) {
+    public SigningMethodImpl(@Nullable final String namespaceURI, @Nonnull final String elementLocalName,
+            @Nullable final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         unknownChildren = new IndexedXMLObjectChildrenList<>(this);
     }
@@ -65,7 +65,7 @@ public class SigningMethodImpl extends AbstractSAMLObject implements SigningMeth
     }
 
     /** {@inheritDoc} */
-    public void setAlgorithm(@Nullable String newValue) {
+    public void setAlgorithm(@Nullable final String newValue) {
         algorithm = prepareForAssignment(algorithm, newValue);
     }
     
@@ -75,7 +75,7 @@ public class SigningMethodImpl extends AbstractSAMLObject implements SigningMeth
     }
 
     /** {@inheritDoc} */
-    public void setMinKeySize(@Nullable Integer newValue) {
+    public void setMinKeySize(@Nullable final Integer newValue) {
         minKeySize = prepareForAssignment(minKeySize, newValue);
     }
 
@@ -85,7 +85,7 @@ public class SigningMethodImpl extends AbstractSAMLObject implements SigningMeth
     }
 
     /** {@inheritDoc} */
-    public void setMaxKeySize(@Nullable Integer newValue) {
+    public void setMaxKeySize(@Nullable final Integer newValue) {
         maxKeySize = prepareForAssignment(maxKeySize, newValue);
     }
     
@@ -97,7 +97,7 @@ public class SigningMethodImpl extends AbstractSAMLObject implements SigningMeth
     }
     
     /** {@inheritDoc} */
-    public List<XMLObject> getUnknownXMLObjects(QName typeOrName) {
+    public List<XMLObject> getUnknownXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) unknownChildren.subList(typeOrName);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/SigningMethodMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/SigningMethodMarshaller.java
index 29a4183..b14a0c0 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/SigningMethodMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/SigningMethodMarshaller.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Element;
 public class SigningMethodMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         SigningMethod signingMethod = (SigningMethod) xmlObject;
         
         if (signingMethod.getAlgorithm() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/SigningMethodUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/SigningMethodUnmarshaller.java
index 6e63019..db754b5 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/SigningMethodUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2alg/impl/SigningMethodUnmarshaller.java
@@ -31,14 +31,14 @@ import org.w3c.dom.Attr;
 public class SigningMethodUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(@Nonnull XMLObject parentXMLObject, @Nonnull XMLObject childXMLObject)
+    protected void processChildElement(@Nonnull final XMLObject parentXMLObject, @Nonnull final XMLObject childXMLObject)
             throws UnmarshallingException {
         final SigningMethod signingMethod = (SigningMethod) parentXMLObject;
         signingMethod.getUnknownXMLObjects().add(childXMLObject);
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(@Nonnull XMLObject xmlObject, @Nonnull Attr attribute) 
+    protected void processAttribute(@Nonnull final XMLObject xmlObject, @Nonnull final Attr attribute) 
             throws UnmarshallingException {
         final SigningMethod signingMethod = (SigningMethod) xmlObject;
         
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2aslo/impl/AsynchronousBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2aslo/impl/AsynchronousBuilder.java
index 97517eb..3564c68 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2aslo/impl/AsynchronousBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2aslo/impl/AsynchronousBuilder.java
@@ -45,7 +45,7 @@ public class AsynchronousBuilder extends AbstractSAMLObjectBuilder<Asynchronous>
     }
 
     /** {@inheritDoc} */
-    public Asynchronous buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Asynchronous buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AsynchronousImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2aslo/impl/AsynchronousImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2aslo/impl/AsynchronousImpl.java
index 83ac45e..ea9f07d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2aslo/impl/AsynchronousImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2aslo/impl/AsynchronousImpl.java
@@ -39,7 +39,7 @@ public class AsynchronousImpl extends AbstractSAMLObject implements Asynchronous
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AsynchronousImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AsynchronousImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2cb/impl/ChannelBindingsBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2cb/impl/ChannelBindingsBuilder.java
index f298786..d3200d4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2cb/impl/ChannelBindingsBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2cb/impl/ChannelBindingsBuilder.java
@@ -44,7 +44,7 @@ public class ChannelBindingsBuilder extends AbstractSAMLObjectBuilder<ChannelBin
     }
 
     /** {@inheritDoc} */
-    public ChannelBindings buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ChannelBindings buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ChannelBindingsImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2cb/impl/ChannelBindingsImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2cb/impl/ChannelBindingsImpl.java
index 10b719e..21c9717 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2cb/impl/ChannelBindingsImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2cb/impl/ChannelBindingsImpl.java
@@ -45,7 +45,7 @@ public class ChannelBindingsImpl extends XSBase64BinaryImpl implements ChannelBi
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ChannelBindingsImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ChannelBindingsImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -55,7 +55,7 @@ public class ChannelBindingsImpl extends XSBase64BinaryImpl implements ChannelBi
     }
 
     /** {@inheritDoc} */
-    public void setType(String newType) {
+    public void setType(final String newType) {
         type = prepareForAssignment(type, newType);
     }
 
@@ -73,7 +73,7 @@ public class ChannelBindingsImpl extends XSBase64BinaryImpl implements ChannelBi
     }
 
     /** {@inheritDoc} */
-    public void setSOAP11MustUnderstand(Boolean newMustUnderstand) {
+    public void setSOAP11MustUnderstand(final Boolean newMustUnderstand) {
         if (newMustUnderstand != null) {
             soap11MustUnderstand = prepareForAssignment(soap11MustUnderstand, 
                     new XSBooleanValue(newMustUnderstand, true));
@@ -85,7 +85,7 @@ public class ChannelBindingsImpl extends XSBase64BinaryImpl implements ChannelBi
     }
 
     /** {@inheritDoc} */
-    public void setSOAP11MustUnderstand(XSBooleanValue newMustUnderstand) {
+    public void setSOAP11MustUnderstand(final XSBooleanValue newMustUnderstand) {
             soap11MustUnderstand = prepareForAssignment(soap11MustUnderstand, newMustUnderstand);
             manageQualifiedAttributeNamespace(MustUnderstandBearing.SOAP11_MUST_UNDERSTAND_ATTR_NAME, 
                     soap11MustUnderstand != null);
@@ -97,7 +97,7 @@ public class ChannelBindingsImpl extends XSBase64BinaryImpl implements ChannelBi
     }
 
     /** {@inheritDoc} */
-    public void setSOAP11Actor(String newActor) {
+    public void setSOAP11Actor(final String newActor) {
         soap11Actor = prepareForAssignment(soap11Actor, newActor);
         manageQualifiedAttributeNamespace(ActorBearing.SOAP11_ACTOR_ATTR_NAME, soap11Actor != null);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2cb/impl/ChannelBindingsMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2cb/impl/ChannelBindingsMarshaller.java
index 0297b5e..c60b3ad 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2cb/impl/ChannelBindingsMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2cb/impl/ChannelBindingsMarshaller.java
@@ -30,7 +30,7 @@ import org.w3c.dom.Element;
 public class ChannelBindingsMarshaller extends XSBase64BinaryMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         ChannelBindings cb = (ChannelBindings) xmlObject;
 
         if (cb.getType() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2cb/impl/ChannelBindingsUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2cb/impl/ChannelBindingsUnmarshaller.java
index 8ef3faf..a6afa92 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2cb/impl/ChannelBindingsUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2cb/impl/ChannelBindingsUnmarshaller.java
@@ -34,7 +34,7 @@ import org.w3c.dom.Attr;
 public class ChannelBindingsUnmarshaller extends XSBase64BinaryUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         final ChannelBindings cb = (ChannelBindings) xmlObject;
         
         final QName attrName = QNameSupport.getNodeQName(attribute);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateBuilder.java
index 215c827..b46956c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateBuilder.java
@@ -42,7 +42,7 @@ public class DelegateBuilder extends AbstractSAMLObjectBuilder<Delegate> {
     }
 
     /** {@inheritDoc} */
-    public Delegate buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Delegate buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new DelegateImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateImpl.java
index 6735f3e..3a8dc81 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateImpl.java
@@ -56,7 +56,7 @@ public class DelegateImpl extends AbstractSAMLObject implements Delegate {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected DelegateImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected DelegateImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -86,27 +86,27 @@ public class DelegateImpl extends AbstractSAMLObject implements Delegate {
     }
 
     /** {@inheritDoc} */
-    public void setBaseID(BaseID newBaseID) {
+    public void setBaseID(final BaseID newBaseID) {
         baseID = prepareForAssignment(baseID, newBaseID);
     }
     
     /** {@inheritDoc} */
-    public void setConfirmationMethod(String newMethod) {
+    public void setConfirmationMethod(final String newMethod) {
         confirmationMethod = prepareForAssignment(confirmationMethod, newMethod);
     }
 
     /** {@inheritDoc} */
-    public void setDelegationInstant(DateTime newInstant) {
+    public void setDelegationInstant(final DateTime newInstant) {
         delegationInstant = prepareForAssignment(delegationInstant, newInstant);
     }
 
     /** {@inheritDoc} */
-    public void setEncryptedID(EncryptedID newEncryptedID) {
+    public void setEncryptedID(final EncryptedID newEncryptedID) {
         encryptedID = prepareForAssignment(encryptedID, newEncryptedID);
     }
 
     /** {@inheritDoc} */
-    public void setNameID(NameID newNameID) {
+    public void setNameID(final NameID newNameID) {
         nameID = prepareForAssignment(nameID, newNameID);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateMarshaller.java
index 688e439..d6cb600 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateMarshaller.java
@@ -32,7 +32,7 @@ import com.google.common.base.Strings;
 public class DelegateMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         Delegate delegate = (Delegate) xmlObject;
         
         if (delegate.getDelegationInstant() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateUnmarshaller.java
index de99629..a32bb60 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegateUnmarshaller.java
@@ -34,7 +34,7 @@ import org.w3c.dom.Attr;
 public class DelegateUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final Delegate delegate = (Delegate) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
@@ -52,7 +52,7 @@ public class DelegateUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         Delegate delegate = (Delegate) parentSAMLObject;
         
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegationRestrictionTypeBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegationRestrictionTypeBuilder.java
index e7eace2..a9e1559 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegationRestrictionTypeBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegationRestrictionTypeBuilder.java
@@ -42,7 +42,7 @@ public class DelegationRestrictionTypeBuilder extends AbstractSAMLObjectBuilder<
     }
 
     /** {@inheritDoc} */
-    public DelegationRestrictionType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public DelegationRestrictionType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new DelegationRestrictionTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegationRestrictionTypeImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegationRestrictionTypeImpl.java
index 2b3fb62..edf222d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegationRestrictionTypeImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegationRestrictionTypeImpl.java
@@ -42,7 +42,7 @@ public class DelegationRestrictionTypeImpl extends AbstractSAMLObject implements
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected DelegationRestrictionTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected DelegationRestrictionTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         delegates = new XMLObjectChildrenList<>(this);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegationRestrictionTypeUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegationRestrictionTypeUnmarshaller.java
index 5ba48bd..0ec9cf8 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegationRestrictionTypeUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2delrestrict/impl/DelegationRestrictionTypeUnmarshaller.java
@@ -29,7 +29,7 @@ import org.opensaml.saml.ext.saml2delrestrict.DelegationRestrictionType;
 public class DelegationRestrictionTypeUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         final DelegationRestrictionType drt = (DelegationRestrictionType) parentSAMLObject;
         
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdattr/impl/EntityAttributesBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdattr/impl/EntityAttributesBuilder.java
index 28ca19d..03c973d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdattr/impl/EntityAttributesBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdattr/impl/EntityAttributesBuilder.java
@@ -34,7 +34,7 @@ public class EntityAttributesBuilder extends AbstractSAMLObjectBuilder<EntityAtt
     }
 
     /** {@inheritDoc} */
-    public EntityAttributes buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public EntityAttributes buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new EntityAttributesImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdattr/impl/EntityAttributesImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdattr/impl/EntityAttributesImpl.java
index f8dd630..829830c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdattr/impl/EntityAttributesImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdattr/impl/EntityAttributesImpl.java
@@ -42,7 +42,7 @@ public class EntityAttributesImpl extends AbstractSAMLObject implements EntityAt
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected EntityAttributesImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected EntityAttributesImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         attributeInfo = new IndexedXMLObjectChildrenList<>(this);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdattr/impl/EntityAttributesUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdattr/impl/EntityAttributesUnmarshaller.java
index 3b66731..ef7ba1b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdattr/impl/EntityAttributesUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdattr/impl/EntityAttributesUnmarshaller.java
@@ -28,7 +28,7 @@ import org.opensaml.saml.saml2.core.Attribute;
 public class EntityAttributesUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
         EntityAttributes entityAttrs = (EntityAttributes) parentObject;
 
         if (childObject instanceof Attribute) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceBuilder.java
index 9e39168..47b2f76 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceBuilder.java
@@ -40,7 +40,7 @@ public class ActionNamespaceBuilder extends AbstractSAMLObjectBuilder<ActionName
 
     /** {@inheritDoc} */
     @Override
-    public ActionNamespace buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ActionNamespace buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ActionNamespaceImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceImpl.java
index 4b155ca..9851b28 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceImpl.java
@@ -38,7 +38,7 @@ public class ActionNamespaceImpl extends AbstractSAMLObject implements ActionNam
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ActionNamespaceImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ActionNamespaceImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
     
@@ -50,7 +50,7 @@ public class ActionNamespaceImpl extends AbstractSAMLObject implements ActionNam
 
     /** {@inheritDoc} */
     @Override
-    public void setValue(String newValue) {
+    public void setValue(final String newValue) {
         value = prepareForAssignment(value, newValue);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceMarshaller.java
index 823183d..34c6e7f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceMarshaller.java
@@ -33,7 +33,7 @@ import com.google.common.base.Strings;
 public class ActionNamespaceMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         ActionNamespace actionNamespace = (ActionNamespace) xmlObject;
 
         if (!Strings.isNullOrEmpty(actionNamespace.getValue())) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceUnmarshaller.java
index 18108de..de4966b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceUnmarshaller.java
@@ -27,7 +27,7 @@ import org.opensaml.saml.ext.saml2mdquery.ActionNamespace;
 public class ActionNamespaceUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         ActionNamespace actionNamespace = (ActionNamespace) samlObject;
 
         actionNamespace.setValue(elementContent);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AttributeQueryDescriptorTypeBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AttributeQueryDescriptorTypeBuilder.java
index 0321942..e37220e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AttributeQueryDescriptorTypeBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AttributeQueryDescriptorTypeBuilder.java
@@ -33,7 +33,7 @@ public class AttributeQueryDescriptorTypeBuilder extends AbstractSAMLObjectBuild
     }
 
     /** {@inheritDoc} */
-    public AttributeQueryDescriptorType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AttributeQueryDescriptorType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AttributeQueryDescriptorTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AttributeQueryDescriptorTypeImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AttributeQueryDescriptorTypeImpl.java
index a179c19..b30ea10 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AttributeQueryDescriptorTypeImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AttributeQueryDescriptorTypeImpl.java
@@ -44,7 +44,7 @@ public class AttributeQueryDescriptorTypeImpl extends QueryDescriptorTypeImpl im
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AttributeQueryDescriptorTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AttributeQueryDescriptorTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
 
         attributeConsumingServices = new XMLObjectChildrenList<>(this);
@@ -61,7 +61,7 @@ public class AttributeQueryDescriptorTypeImpl extends QueryDescriptorTypeImpl im
     }
     
     /** {@inheritDoc} */
-    public List<Endpoint> getEndpoints(QName type) {
+    public List<Endpoint> getEndpoints(final QName type) {
         return null;
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AttributeQueryDescriptorTypeUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AttributeQueryDescriptorTypeUnmarshaller.java
index 93c1225..4433e4c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AttributeQueryDescriptorTypeUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AttributeQueryDescriptorTypeUnmarshaller.java
@@ -28,7 +28,7 @@ import org.opensaml.saml.saml2.metadata.AttributeConsumingService;
 public class AttributeQueryDescriptorTypeUnmarshaller extends QueryDescriptorTypeUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         AttributeQueryDescriptorType descriptor = (AttributeQueryDescriptorType) parentSAMLObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AuthnQueryDescriptorTypeBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AuthnQueryDescriptorTypeBuilder.java
index e1900c7..cde0252 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AuthnQueryDescriptorTypeBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AuthnQueryDescriptorTypeBuilder.java
@@ -33,7 +33,7 @@ public class AuthnQueryDescriptorTypeBuilder extends AbstractSAMLObjectBuilder<A
     }
 
     /** {@inheritDoc} */
-    public AuthnQueryDescriptorType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AuthnQueryDescriptorType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AuthnQueryDescriptorTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AuthnQueryDescriptorTypeImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AuthnQueryDescriptorTypeImpl.java
index a6eca92..f2abb74 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AuthnQueryDescriptorTypeImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AuthnQueryDescriptorTypeImpl.java
@@ -37,7 +37,7 @@ public class AuthnQueryDescriptorTypeImpl extends QueryDescriptorTypeImpl implem
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AuthnQueryDescriptorTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AuthnQueryDescriptorTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
     
@@ -47,7 +47,7 @@ public class AuthnQueryDescriptorTypeImpl extends QueryDescriptorTypeImpl implem
     }
     
     /** {@inheritDoc} */
-    public List<Endpoint> getEndpoints(QName type) {
+    public List<Endpoint> getEndpoints(final QName type) {
         return null;
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AuthzDecisionQueryDescriptorTypeBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AuthzDecisionQueryDescriptorTypeBuilder.java
index 975ebc1..0841be9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AuthzDecisionQueryDescriptorTypeBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AuthzDecisionQueryDescriptorTypeBuilder.java
@@ -36,7 +36,7 @@ public class AuthzDecisionQueryDescriptorTypeBuilder
 
     /** {@inheritDoc} */
     @Override
-    public AuthzDecisionQueryDescriptorType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AuthzDecisionQueryDescriptorType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AuthzDecisionQueryDescriptorTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AuthzDecisionQueryDescriptorTypeImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AuthzDecisionQueryDescriptorTypeImpl.java
index 8a84432..097c327 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AuthzDecisionQueryDescriptorTypeImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AuthzDecisionQueryDescriptorTypeImpl.java
@@ -45,8 +45,8 @@ public class AuthzDecisionQueryDescriptorTypeImpl extends QueryDescriptorTypeImp
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AuthzDecisionQueryDescriptorTypeImpl(String namespaceURI, String elementLocalName,
-            String namespacePrefix) {
+    protected AuthzDecisionQueryDescriptorTypeImpl(final String namespaceURI, final String elementLocalName,
+            final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
 
         actionNamespaces = new XMLObjectChildrenList<>(this);
@@ -66,7 +66,7 @@ public class AuthzDecisionQueryDescriptorTypeImpl extends QueryDescriptorTypeImp
     
     /** {@inheritDoc} */
     @Override
-    public List<Endpoint> getEndpoints(QName type) {
+    public List<Endpoint> getEndpoints(final QName type) {
         return null;
     }
     
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AuthzDecisionQueryDescriptorTypeUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AuthzDecisionQueryDescriptorTypeUnmarshaller.java
index b486a1d..e15e194 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AuthzDecisionQueryDescriptorTypeUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/AuthzDecisionQueryDescriptorTypeUnmarshaller.java
@@ -26,7 +26,7 @@ import org.opensaml.saml.ext.saml2mdquery.AuthzDecisionQueryDescriptorType;
 public class AuthzDecisionQueryDescriptorTypeUnmarshaller extends QueryDescriptorTypeUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         AuthzDecisionQueryDescriptorType descriptor = (AuthzDecisionQueryDescriptorType) parentSAMLObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/QueryDescriptorTypeImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/QueryDescriptorTypeImpl.java
index cb358fd..cf991fb 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/QueryDescriptorTypeImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/QueryDescriptorTypeImpl.java
@@ -46,7 +46,7 @@ public abstract class QueryDescriptorTypeImpl extends RoleDescriptorImpl impleme
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected QueryDescriptorTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected QueryDescriptorTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         
         nameIDFormats = new XMLObjectChildrenList<>(this);
@@ -63,7 +63,7 @@ public abstract class QueryDescriptorTypeImpl extends RoleDescriptorImpl impleme
 
     /** {@inheritDoc} */
     @Override
-    public void setWantAssertionsSigned(Boolean newWantAssertionsSigned) {
+    public void setWantAssertionsSigned(final Boolean newWantAssertionsSigned) {
         if (newWantAssertionsSigned != null) {
             wantAssertionsSigned = prepareForAssignment(wantAssertionsSigned, 
                     new XSBooleanValue(newWantAssertionsSigned, false));
@@ -80,7 +80,7 @@ public abstract class QueryDescriptorTypeImpl extends RoleDescriptorImpl impleme
     
     /** {@inheritDoc} */
     @Override
-    public void setWantAssertionsSigned(XSBooleanValue wantAssertionSigned){
+    public void setWantAssertionsSigned(final XSBooleanValue wantAssertionSigned){
         this.wantAssertionsSigned = prepareForAssignment(this.wantAssertionsSigned, wantAssertionSigned);
     }
     
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/QueryDescriptorTypeMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/QueryDescriptorTypeMarshaller.java
index 070d9a3..9be85d0 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/QueryDescriptorTypeMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/QueryDescriptorTypeMarshaller.java
@@ -30,7 +30,7 @@ public abstract class QueryDescriptorTypeMarshaller extends RoleDescriptorMarsha
 
     /** {@inheritDoc} */
     @Override
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         QueryDescriptorType descriptor = (QueryDescriptorType) xmlObject;
 
         if (descriptor.getWantAssertionsSignedXSBoolean() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/QueryDescriptorTypeUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/QueryDescriptorTypeUnmarshaller.java
index 6ad548d..2a00c51 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/QueryDescriptorTypeUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/QueryDescriptorTypeUnmarshaller.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Attr;
 public class QueryDescriptorTypeUnmarshaller extends RoleDescriptorUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         final QueryDescriptorType descriptor = (QueryDescriptorType) parentSAMLObject;
 
@@ -41,7 +41,7 @@ public class QueryDescriptorTypeUnmarshaller extends RoleDescriptorUnmarshaller
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final QueryDescriptorType descriptor = (QueryDescriptorType) samlObject;
 
         if (attribute.getLocalName().equals(QueryDescriptorType.WANT_ASSERTIONS_SIGNED_ATTRIB_NAME)
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdreqinit/impl/RequestInitiatorBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdreqinit/impl/RequestInitiatorBuilder.java
index a678d2c..4b7e900 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdreqinit/impl/RequestInitiatorBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdreqinit/impl/RequestInitiatorBuilder.java
@@ -44,7 +44,7 @@ public class RequestInitiatorBuilder extends AbstractSAMLObjectBuilder<RequestIn
     }
 
     /** {@inheritDoc} */
-    public RequestInitiator buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public RequestInitiator buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new RequestInitiatorImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdreqinit/impl/RequestInitiatorImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdreqinit/impl/RequestInitiatorImpl.java
index 7a29e66..534a38a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdreqinit/impl/RequestInitiatorImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdreqinit/impl/RequestInitiatorImpl.java
@@ -37,7 +37,7 @@ public class RequestInitiatorImpl extends EndpointImpl implements RequestInitiat
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected RequestInitiatorImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected RequestInitiatorImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationBuilder.java
index e34defa..8132306 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationBuilder.java
@@ -35,7 +35,7 @@ public class PublicationBuilder extends AbstractSAMLObjectBuilder<Publication> {
     }
 
     /** {@inheritDoc} */
-    public Publication buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Publication buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new PublicationImpl(namespaceURI, localName, namespacePrefix);
     }
 }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationImpl.java
index 5d5a387..a0bb2ed 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationImpl.java
@@ -46,7 +46,7 @@ public class PublicationImpl extends AbstractSAMLObject implements Publication {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected PublicationImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected PublicationImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -57,7 +57,7 @@ public class PublicationImpl extends AbstractSAMLObject implements Publication {
     }
 
     /** {@inheritDoc} */
-    public void setPublisher(String thePublisher) {
+    public void setPublisher(final String thePublisher) {
         publisher = prepareForAssignment(publisher, thePublisher);
     }
 
@@ -67,7 +67,7 @@ public class PublicationImpl extends AbstractSAMLObject implements Publication {
     }
 
     /** {@inheritDoc} */
-    public void setCreationInstant(DateTime dateTime) {
+    public void setCreationInstant(final DateTime dateTime) {
         creationInstant = prepareForAssignment(creationInstant, dateTime);
     }
 
@@ -77,7 +77,7 @@ public class PublicationImpl extends AbstractSAMLObject implements Publication {
     }
 
     /** {@inheritDoc} */
-    public void setPublicationId(String id) {
+    public void setPublicationId(final String id) {
         publicationId = prepareForAssignment(publicationId, id);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoBuilder.java
index 8d66780..6564ec9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoBuilder.java
@@ -34,7 +34,7 @@ public class PublicationInfoBuilder extends AbstractSAMLObjectBuilder<Publicatio
     }
 
     /** {@inheritDoc} */
-    public PublicationInfo buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public PublicationInfo buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new PublicationInfoImpl(namespaceURI, localName, namespacePrefix);
     }
 }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoImpl.java
index fcbfec5..0df1d84 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoImpl.java
@@ -52,7 +52,7 @@ public class PublicationInfoImpl extends AbstractSAMLObject implements Publicati
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected PublicationInfoImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected PublicationInfoImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         usagePolicies = new IndexedXMLObjectChildrenList<>(this);
     }
@@ -65,7 +65,7 @@ public class PublicationInfoImpl extends AbstractSAMLObject implements Publicati
 
     /** {@inheritDoc} */
     @Override
-    public void setPublisher(String thePublisher) {
+    public void setPublisher(final String thePublisher) {
         publisher = prepareForAssignment(publisher, thePublisher);
     }
 
@@ -77,7 +77,7 @@ public class PublicationInfoImpl extends AbstractSAMLObject implements Publicati
 
     /** {@inheritDoc} */
     @Override
-    public void setCreationInstant(DateTime dateTime) {
+    public void setCreationInstant(final DateTime dateTime) {
         creationInstant = prepareForAssignment(creationInstant, dateTime);
     }
 
@@ -89,7 +89,7 @@ public class PublicationInfoImpl extends AbstractSAMLObject implements Publicati
 
     /** {@inheritDoc} */
     @Override
-    public void setPublicationId(String id) {
+    public void setPublicationId(final String id) {
         publicationId = prepareForAssignment(publicationId, id);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoMarshaller.java
index 2447f16..a9a9fb7 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoMarshaller.java
@@ -30,7 +30,7 @@ import org.w3c.dom.Element;
  */
 public class PublicationInfoMarshaller extends AbstractSAMLObjectMarshaller {
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         PublicationInfo info = (PublicationInfo) samlObject;
 
         if (info.getPublisher() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoUnmarshaller.java
index fb70821..ece8dc8 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationInfoUnmarshaller.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Attr;
 public class PublicationInfoUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
         final PublicationInfo info = (PublicationInfo) parentObject;
 
         if (childObject instanceof UsagePolicy) {
@@ -43,7 +43,7 @@ public class PublicationInfoUnmarshaller extends AbstractSAMLObjectUnmarshaller
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final PublicationInfo info = (PublicationInfo) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationMarshaller.java
index aec3e33..b8ef618 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationMarshaller.java
@@ -30,7 +30,7 @@ import org.w3c.dom.Element;
  */
 public class PublicationMarshaller extends AbstractSAMLObjectMarshaller {
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         Publication info = (Publication) samlObject;
 
         if (info.getPublisher() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationPathBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationPathBuilder.java
index d30b5d8..caf4532 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationPathBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationPathBuilder.java
@@ -34,7 +34,7 @@ public class PublicationPathBuilder extends AbstractSAMLObjectBuilder<Publicatio
     }
 
     /** {@inheritDoc} */
-    public PublicationPath buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public PublicationPath buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new PublicationPathImpl(namespaceURI, localName, namespacePrefix);
     }
 }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationPathImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationPathImpl.java
index 0186b84..7c1448c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationPathImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationPathImpl.java
@@ -43,7 +43,7 @@ public class PublicationPathImpl extends AbstractSAMLObject implements Publicati
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected PublicationPathImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected PublicationPathImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         publications = new IndexedXMLObjectChildrenList<>(this);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationPathUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationPathUnmarshaller.java
index 9357d02..4177bbe 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationPathUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationPathUnmarshaller.java
@@ -30,7 +30,7 @@ import org.opensaml.saml.ext.saml2mdrpi.PublicationPath;
 public class PublicationPathUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
         PublicationPath pPath = (PublicationPath) parentObject;
 
         if (childObject instanceof Publication) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationUnmarshaller.java
index 6c5ca45..f31a956 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/PublicationUnmarshaller.java
@@ -31,7 +31,7 @@ import org.w3c.dom.Attr;
 public class PublicationUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final Publication info = (Publication) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoBuilder.java
index 6148965..6cdff40 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoBuilder.java
@@ -34,7 +34,7 @@ public class RegistrationInfoBuilder extends AbstractSAMLObjectBuilder<Registrat
     }
 
     /** {@inheritDoc} */
-    public RegistrationInfo buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public RegistrationInfo buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new RegistrationInfoImpl(namespaceURI, localName, namespacePrefix);
     }
 }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoImpl.java
index fa3db5b..7565e71 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoImpl.java
@@ -49,7 +49,7 @@ public class RegistrationInfoImpl extends AbstractSAMLObject implements Registra
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected RegistrationInfoImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected RegistrationInfoImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         registrationPolicies = new IndexedXMLObjectChildrenList<>(this);
     }
@@ -62,7 +62,7 @@ public class RegistrationInfoImpl extends AbstractSAMLObject implements Registra
 
     /** {@inheritDoc} */
     @Override
-    public void setRegistrationAuthority(String authority) {
+    public void setRegistrationAuthority(final String authority) {
         registrationAuthority = prepareForAssignment(registrationAuthority, authority);
     }
 
@@ -74,7 +74,7 @@ public class RegistrationInfoImpl extends AbstractSAMLObject implements Registra
 
     /** {@inheritDoc} */
     @Override
-    public void setRegistrationInstant(DateTime dateTime) {
+    public void setRegistrationInstant(final DateTime dateTime) {
         registrationInstant = prepareForAssignment(registrationInstant, dateTime);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoMarshaller.java
index 22561f2..71db87c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoMarshaller.java
@@ -30,7 +30,7 @@ import org.w3c.dom.Element;
  */
 public class RegistrationInfoMarshaller extends AbstractSAMLObjectMarshaller {
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         RegistrationInfo info = (RegistrationInfo) samlObject;
 
         if (info.getRegistrationAuthority() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoUnmarshaller.java
index 89b1d1a..8275159 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationInfoUnmarshaller.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Attr;
 public class RegistrationInfoUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
         final RegistrationInfo info = (RegistrationInfo) parentObject;
         
         if (childObject instanceof RegistrationPolicy) {
@@ -43,7 +43,7 @@ public class RegistrationInfoUnmarshaller extends AbstractSAMLObjectUnmarshaller
     }
     
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final RegistrationInfo info = (RegistrationInfo) samlObject;
         
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationPolicyBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationPolicyBuilder.java
index ed7e85c..0f64760 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationPolicyBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationPolicyBuilder.java
@@ -35,7 +35,7 @@ public class RegistrationPolicyBuilder extends AbstractSAMLObjectBuilder<Registr
     }
 
     /** {@inheritDoc} */
-    public RegistrationPolicy buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public RegistrationPolicy buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new RegistrationPolicyImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationPolicyImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationPolicyImpl.java
index 146da4f..e126701 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationPolicyImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/RegistrationPolicyImpl.java
@@ -32,7 +32,7 @@ public class RegistrationPolicyImpl extends LocalizedURIImpl implements Registra
      * @param elementLocalName elementLocalName
      * @param namespacePrefix namespacePrefix
      */
-    protected RegistrationPolicyImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected RegistrationPolicyImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/UsagePolicyBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/UsagePolicyBuilder.java
index b32d2b0..f131aed 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/UsagePolicyBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/UsagePolicyBuilder.java
@@ -34,7 +34,7 @@ public class UsagePolicyBuilder extends AbstractSAMLObjectBuilder<UsagePolicy> {
     }
 
     /** {@inheritDoc} */
-    public UsagePolicy buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public UsagePolicy buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new UsagePolicyImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/UsagePolicyImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/UsagePolicyImpl.java
index ce9ad1b..419eb12 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/UsagePolicyImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdrpi/impl/UsagePolicyImpl.java
@@ -32,7 +32,7 @@ public class UsagePolicyImpl extends LocalizedURIImpl implements UsagePolicy {
      * @param elementLocalName local name
      * @param namespacePrefix prefix
      */
-    protected UsagePolicyImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected UsagePolicyImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DescriptionBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DescriptionBuilder.java
index 376b681..56646f4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DescriptionBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DescriptionBuilder.java
@@ -39,7 +39,7 @@ public class DescriptionBuilder extends AbstractSAMLObjectBuilder<Description> {
     }
 
     /** {@inheritDoc} */
-    public Description buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Description buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new DescriptionImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DescriptionImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DescriptionImpl.java
index fd6f53a..089e34a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DescriptionImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DescriptionImpl.java
@@ -32,7 +32,7 @@ public class DescriptionImpl extends LocalizedNameImpl implements Description {
      * @param elementLocalName the elementLocalName
      * @param namespacePrefix the namespacePrefix
      */
-    protected DescriptionImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected DescriptionImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DiscoHintsBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DiscoHintsBuilder.java
index 75c2676..c5f71e4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DiscoHintsBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DiscoHintsBuilder.java
@@ -40,7 +40,7 @@ public class DiscoHintsBuilder extends AbstractSAMLObjectBuilder<DiscoHints> {
     }
 
     /** {@inheritDoc} */
-    public DiscoHints buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public DiscoHints buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new DiscoHintsImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DiscoHintsImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DiscoHintsImpl.java
index ac28de8..5f265f9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DiscoHintsImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DiscoHintsImpl.java
@@ -43,7 +43,7 @@ public class DiscoHintsImpl extends AbstractSAMLObject implements DiscoHints {
      * @param elementLocalName elementLocalName
      * @param namespacePrefix namespacePrefix
      */
-    protected DiscoHintsImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected DiscoHintsImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         discoHintsChildren = new IndexedXMLObjectChildrenList<>(this);
     }
@@ -56,7 +56,7 @@ public class DiscoHintsImpl extends AbstractSAMLObject implements DiscoHints {
 
     /** {@inheritDoc} */
     @Override
-    public List<XMLObject> getXMLObjects(QName typeOrName) {
+    public List<XMLObject> getXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) discoHintsChildren.subList(typeOrName);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DiscoHintsUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DiscoHintsUnmarshaller.java
index 39450c1..c57dd46 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DiscoHintsUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DiscoHintsUnmarshaller.java
@@ -28,7 +28,7 @@ import org.opensaml.saml.ext.saml2mdui.DiscoHints;
 public class DiscoHintsUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         DiscoHints info = (DiscoHints) parentSAMLObject;
         info.getXMLObjects().add(childSAMLObject);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DisplayNameBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DisplayNameBuilder.java
index 0a190a9..e7b331f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DisplayNameBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DisplayNameBuilder.java
@@ -40,7 +40,7 @@ public class DisplayNameBuilder extends AbstractSAMLObjectBuilder<DisplayName> {
     }
 
     /** {@inheritDoc} */
-    public DisplayName buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public DisplayName buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new DisplayNameImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DisplayNameImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DisplayNameImpl.java
index af2edce..63edab9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DisplayNameImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DisplayNameImpl.java
@@ -33,7 +33,7 @@ public class DisplayNameImpl extends LocalizedNameImpl implements DisplayName {
      * @param elementLocalName the elementLocalName
      * @param namespacePrefix the namespacePrefix
      */
-    protected DisplayNameImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected DisplayNameImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintBuilder.java
index d6de9de..5cf8807 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintBuilder.java
@@ -40,7 +40,7 @@ public class DomainHintBuilder extends AbstractSAMLObjectBuilder<DomainHint> {
     }
 
     /** {@inheritDoc} */
-    public DomainHint buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public DomainHint buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new DomainHintImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintImpl.java
index 06dec4d..51174a0 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintImpl.java
@@ -40,7 +40,7 @@ public class DomainHintImpl extends AbstractSAMLObject implements DomainHint{
      * @param elementLocalName the elementLocalName
      * @param namespacePrefix the namespacePrefix
      */
-    protected DomainHintImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected DomainHintImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -50,7 +50,7 @@ public class DomainHintImpl extends AbstractSAMLObject implements DomainHint{
     }
 
     /** {@inheritDoc} */
-    public void setHint(String newHint) {
+    public void setHint(final String newHint) {
         hint = prepareForAssignment(hint, newHint);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintMarshaller.java
index b1584fa..edbd0ee 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintMarshaller.java
@@ -31,7 +31,7 @@ import org.w3c.dom.Element;
 public class DomainHintMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         DomainHint name = (DomainHint) samlObject;
 
         if (name.getHint() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintUnmarshaller.java
index 2b108e5..a020d62 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/DomainHintUnmarshaller.java
@@ -27,7 +27,7 @@ import org.opensaml.saml.ext.saml2mdui.DomainHint;
 public class DomainHintUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         DomainHint hint = (DomainHint) samlObject;
 
         hint.setHint(elementContent);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintBuilder.java
index 5e89371..9117b3c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintBuilder.java
@@ -40,7 +40,7 @@ public class GeolocationHintBuilder extends AbstractSAMLObjectBuilder<Geolocatio
     }
 
     /** {@inheritDoc} */
-    public GeolocationHint buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public GeolocationHint buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new GeolocationHintImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintImpl.java
index b77fc91..b932b12 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintImpl.java
@@ -40,7 +40,7 @@ public class GeolocationHintImpl extends AbstractSAMLObject implements Geolocati
      * @param elementLocalName the elementLocalName
      * @param namespacePrefix the namespacePrefix
      */
-    protected GeolocationHintImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected GeolocationHintImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -50,7 +50,7 @@ public class GeolocationHintImpl extends AbstractSAMLObject implements Geolocati
     }
 
     /** {@inheritDoc} */
-    public void setHint(String newHint) {
+    public void setHint(final String newHint) {
         hint = prepareForAssignment(hint, newHint);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintMarshaller.java
index 94e9689..0e14413 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintMarshaller.java
@@ -31,7 +31,7 @@ import org.w3c.dom.Element;
 public class GeolocationHintMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         GeolocationHint name = (GeolocationHint) samlObject;
 
         if (name.getHint() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintUnmarshaller.java
index 0132a0b..95fe024 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/GeolocationHintUnmarshaller.java
@@ -27,7 +27,7 @@ import org.opensaml.saml.ext.saml2mdui.GeolocationHint;
 public class GeolocationHintUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         GeolocationHint hint = (GeolocationHint) samlObject;
 
         hint.setHint(elementContent);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintBuilder.java
index a74f279..7965d72 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintBuilder.java
@@ -40,7 +40,7 @@ public class IPHintBuilder extends AbstractSAMLObjectBuilder<IPHint> {
     }
 
     /** {@inheritDoc} */
-    public IPHint buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public IPHint buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new IPHintImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintImpl.java
index 7de691a..72abace 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintImpl.java
@@ -40,7 +40,7 @@ public class IPHintImpl extends AbstractSAMLObject implements IPHint {
      * @param elementLocalName the elementLocalName
      * @param namespacePrefix the namespacePrefix
      */
-    protected IPHintImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected IPHintImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -50,7 +50,7 @@ public class IPHintImpl extends AbstractSAMLObject implements IPHint {
     }
 
     /** {@inheritDoc} */
-    public void setHint(String newHint) {
+    public void setHint(final String newHint) {
         hint = prepareForAssignment(hint, newHint);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintMarshaller.java
index 013891d..18c96b7 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintMarshaller.java
@@ -31,7 +31,7 @@ import org.w3c.dom.Element;
 public class IPHintMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         IPHint name = (IPHint) samlObject;
 
         if (name.getHint() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintUnmarshaller.java
index 5288b95..7d72dff 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/IPHintUnmarshaller.java
@@ -27,7 +27,7 @@ import org.opensaml.saml.ext.saml2mdui.IPHint;
 public class IPHintUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         IPHint hint = (IPHint) samlObject;
 
         hint.setHint(elementContent);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/InformationURLBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/InformationURLBuilder.java
index 668c3a2..cd42188 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/InformationURLBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/InformationURLBuilder.java
@@ -39,7 +39,7 @@ public class InformationURLBuilder extends AbstractSAMLObjectBuilder<Information
     }
 
     /** {@inheritDoc} */
-    public InformationURL buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public InformationURL buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new InformationURLImpl(namespaceURI, localName, namespacePrefix);
     }
 }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/InformationURLImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/InformationURLImpl.java
index 08c27d8..64fdf7e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/InformationURLImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/InformationURLImpl.java
@@ -34,7 +34,7 @@ public class InformationURLImpl extends LocalizedURIImpl implements InformationU
      * @param elementLocalName the elementLocalName
      * @param namespacePrefix the namespacePrefix
      */
-    protected InformationURLImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected InformationURLImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/KeywordsBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/KeywordsBuilder.java
index d24d3e1..e003c0d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/KeywordsBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/KeywordsBuilder.java
@@ -39,7 +39,7 @@ public class KeywordsBuilder extends AbstractSAMLObjectBuilder<Keywords> {
     }
 
     /** {@inheritDoc} */
-    public Keywords buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Keywords buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new KeywordsImpl(namespaceURI, localName, namespacePrefix);
     }
 }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/KeywordsImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/KeywordsImpl.java
index ef133ce..883b0ac 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/KeywordsImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/KeywordsImpl.java
@@ -42,7 +42,7 @@ public class KeywordsImpl extends AbstractSAMLObject implements Keywords {
      * @param elementLocalName the local name
      * @param namespacePrefix the prefix
      */
-    protected KeywordsImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected KeywordsImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -58,7 +58,7 @@ public class KeywordsImpl extends AbstractSAMLObject implements Keywords {
     }
 
     /** {@inheritDoc} */
-    public void setXMLLang(String newLang) {
+    public void setXMLLang(final String newLang) {
         boolean hasValue = newLang != null && !Strings.isNullOrEmpty(newLang);
         lang = prepareForAssignment(lang, newLang);
         manageQualifiedAttributeNamespace(LangBearing.XML_LANG_ATTR_NAME, hasValue);
@@ -70,7 +70,7 @@ public class KeywordsImpl extends AbstractSAMLObject implements Keywords {
     }
 
     /** {@inheritDoc} */
-    public void setKeywords(List<String> val) {
+    public void setKeywords(final List<String> val) {
         data = prepareForAssignment(data, val);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/KeywordsMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/KeywordsMarshaller.java
index 8c972a1..b795d75 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/KeywordsMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/KeywordsMarshaller.java
@@ -37,7 +37,7 @@ public class KeywordsMarshaller extends AbstractSAMLObjectMarshaller {
     /**
      * {@inheritDoc}
      */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         Keywords words = (Keywords) samlObject;
 
         if (words.getXMLLang() != null) {
@@ -49,7 +49,7 @@ public class KeywordsMarshaller extends AbstractSAMLObjectMarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         Keywords words = (Keywords) samlObject;
 
         if (words.getKeywords() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/KeywordsUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/KeywordsUnmarshaller.java
index 0add48d..dee3f53 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/KeywordsUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/KeywordsUnmarshaller.java
@@ -37,7 +37,7 @@ public class KeywordsUnmarshaller extends AbstractSAMLObjectUnmarshaller {
      * {@inheritDoc}
      */
     @Override
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         if (attribute.getLocalName().equals(LangBearing.XML_LANG_ATTR_LOCAL_NAME)
                 && XMLConstants.XML_NS.equals(attribute.getNamespaceURI())) {
             Keywords keywords = (Keywords) samlObject;
@@ -48,7 +48,7 @@ public class KeywordsUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     @Override
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         Keywords keywords = (Keywords) samlObject;
         String[] words = elementContent.split("\\s+");
         ArrayList<String> wordlist = new ArrayList<>(words.length);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoBuilder.java
index 6836ecc..c11cd6e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoBuilder.java
@@ -40,7 +40,7 @@ public class LogoBuilder extends AbstractSAMLObjectBuilder<Logo> {
     }
 
     /** {@inheritDoc} */
-    public Logo buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Logo buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new LogoImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoImpl.java
index 7f856a3..4ac6f81 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoImpl.java
@@ -51,7 +51,7 @@ public class LogoImpl extends AbstractSAMLObject implements Logo {
      * @param elementLocalName elementLocalName
      * @param namespacePrefix namespacePrefix
      */
-    protected LogoImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected LogoImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -62,7 +62,7 @@ public class LogoImpl extends AbstractSAMLObject implements Logo {
     }
 
     /** {@inheritDoc} */
-    public void setHeight(Integer newHeight) {
+    public void setHeight(final Integer newHeight) {
          height = prepareForAssignment(height, newHeight);
     }
 
@@ -72,7 +72,7 @@ public class LogoImpl extends AbstractSAMLObject implements Logo {
     }
 
     /** {@inheritDoc} */
-    public void setWidth(Integer newWidth) {
+    public void setWidth(final Integer newWidth) {
         width = prepareForAssignment(width, newWidth);
     }
 
@@ -82,7 +82,7 @@ public class LogoImpl extends AbstractSAMLObject implements Logo {
     }
 
     /** {@inheritDoc} */
-    public void setURL(String newURL) {
+    public void setURL(final String newURL) {
        url = prepareForAssignment(url, newURL);
     }
 
@@ -92,7 +92,7 @@ public class LogoImpl extends AbstractSAMLObject implements Logo {
     }
 
     /** {@inheritDoc} */
-    public void setXMLLang(String newLang) {
+    public void setXMLLang(final String newLang) {
         boolean hasValue = newLang != null && !Strings.isNullOrEmpty(newLang);
         lang = prepareForAssignment(lang, newLang);
         manageQualifiedAttributeNamespace(LangBearing.XML_LANG_ATTR_NAME, hasValue);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoMarshaller.java
index 1538c5b..12eed7b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoMarshaller.java
@@ -37,7 +37,7 @@ public class LogoMarshaller extends AbstractSAMLObjectMarshaller {
     /**
      * {@inheritDoc}
      */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         Logo logo = (Logo) samlObject;
 
         if (logo.getXMLLang() != null) {
@@ -55,7 +55,7 @@ public class LogoMarshaller extends AbstractSAMLObjectMarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         Logo logo = (Logo) samlObject;
 
         if (logo.getURL() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoUnmarshaller.java
index e008dc6..f6fe454 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/LogoUnmarshaller.java
@@ -32,14 +32,14 @@ import org.w3c.dom.Attr;
 public class LogoUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         final Logo logo = (Logo) samlObject;
 
         logo.setURL(elementContent);
     }
     
     /**  {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final Logo logo = (Logo) samlObject;
 
         if (attribute.getLocalName().equals(LangBearing.XML_LANG_ATTR_LOCAL_NAME)
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/PrivacyStatementURLBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/PrivacyStatementURLBuilder.java
index 58c5f48..88d79e6 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/PrivacyStatementURLBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/PrivacyStatementURLBuilder.java
@@ -40,7 +40,7 @@ public class PrivacyStatementURLBuilder extends AbstractSAMLObjectBuilder<Privac
     }
 
     /** {@inheritDoc} */
-    public PrivacyStatementURL buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public PrivacyStatementURL buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new PrivacyStatementURLImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/PrivacyStatementURLImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/PrivacyStatementURLImpl.java
index a090e3b..6bd22e3 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/PrivacyStatementURLImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/PrivacyStatementURLImpl.java
@@ -35,7 +35,7 @@ public class PrivacyStatementURLImpl extends LocalizedURIImpl implements Privacy
      * @param elementLocalName the elementLocalName
      * @param namespacePrefix the namespacePrefix
      */
-    protected PrivacyStatementURLImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected PrivacyStatementURLImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/UIInfoBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/UIInfoBuilder.java
index a6d983d..23ca6dd 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/UIInfoBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/UIInfoBuilder.java
@@ -40,7 +40,7 @@ public class UIInfoBuilder extends AbstractSAMLObjectBuilder<UIInfo> {
     }
 
     /** {@inheritDoc} */
-    public UIInfo buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public UIInfo buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new UIInfoImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/UIInfoImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/UIInfoImpl.java
index d532d19..7e45f5b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/UIInfoImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/UIInfoImpl.java
@@ -48,7 +48,7 @@ public class UIInfoImpl extends AbstractSAMLObject implements UIInfo {
      * @param elementLocalName elementLocalName
      * @param namespacePrefix namespacePrefix
      */
-    protected UIInfoImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected UIInfoImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         
         uiInfoChildren = new IndexedXMLObjectChildrenList<>(this);
@@ -62,7 +62,7 @@ public class UIInfoImpl extends AbstractSAMLObject implements UIInfo {
 
     /** {@inheritDoc} */
     @Override
-    public List<XMLObject> getXMLObjects(QName typeOrName) {
+    public List<XMLObject> getXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) uiInfoChildren.subList(typeOrName);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/UIInfoUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/UIInfoUnmarshaller.java
index 5236db5..556524f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/UIInfoUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdui/impl/UIInfoUnmarshaller.java
@@ -28,7 +28,7 @@ import org.opensaml.saml.ext.saml2mdui.UIInfo;
 public class UIInfoUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         UIInfo info = (UIInfo) parentSAMLObject;
         info.getXMLObjects().add(childSAMLObject);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/EncTypeBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/EncTypeBuilder.java
index 34fbf32..379c1d9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/EncTypeBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/EncTypeBuilder.java
@@ -44,7 +44,7 @@ public class EncTypeBuilder extends AbstractSAMLObjectBuilder<EncType> {
     }
 
     /** {@inheritDoc} */
-    public EncType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public EncType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new EncTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/EncTypeImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/EncTypeImpl.java
index 22f5fc4..427da95 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/EncTypeImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/EncTypeImpl.java
@@ -32,7 +32,7 @@ public class EncTypeImpl extends XSStringImpl implements EncType {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected EncTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected EncTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/GeneratedKeyBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/GeneratedKeyBuilder.java
index 742a33b..a1edd73 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/GeneratedKeyBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/GeneratedKeyBuilder.java
@@ -45,7 +45,7 @@ public class GeneratedKeyBuilder extends AbstractSAMLObjectBuilder<GeneratedKey>
     }
 
     /** {@inheritDoc} */
-    public GeneratedKey buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public GeneratedKey buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new GeneratedKeyImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/GeneratedKeyImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/GeneratedKeyImpl.java
index 4a2ae16..66e70f0 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/GeneratedKeyImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/GeneratedKeyImpl.java
@@ -41,7 +41,7 @@ public class GeneratedKeyImpl extends XSBase64BinaryImpl implements GeneratedKey
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected GeneratedKeyImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected GeneratedKeyImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -59,7 +59,7 @@ public class GeneratedKeyImpl extends XSBase64BinaryImpl implements GeneratedKey
     }
 
     /** {@inheritDoc} */
-    public void setSOAP11MustUnderstand(Boolean newMustUnderstand) {
+    public void setSOAP11MustUnderstand(final Boolean newMustUnderstand) {
         if (newMustUnderstand != null) {
             soap11MustUnderstand = prepareForAssignment(soap11MustUnderstand, 
                     new XSBooleanValue(newMustUnderstand, true));
@@ -71,7 +71,7 @@ public class GeneratedKeyImpl extends XSBase64BinaryImpl implements GeneratedKey
     }
 
     /** {@inheritDoc} */
-    public void setSOAP11MustUnderstand(XSBooleanValue newMustUnderstand) {
+    public void setSOAP11MustUnderstand(final XSBooleanValue newMustUnderstand) {
             soap11MustUnderstand = prepareForAssignment(soap11MustUnderstand, newMustUnderstand);
             manageQualifiedAttributeNamespace(MustUnderstandBearing.SOAP11_MUST_UNDERSTAND_ATTR_NAME, 
                     soap11MustUnderstand != null);
@@ -83,7 +83,7 @@ public class GeneratedKeyImpl extends XSBase64BinaryImpl implements GeneratedKey
     }
 
     /** {@inheritDoc} */
-    public void setSOAP11Actor(String newActor) {
+    public void setSOAP11Actor(final String newActor) {
         soap11Actor = prepareForAssignment(soap11Actor, newActor);
         manageQualifiedAttributeNamespace(ActorBearing.SOAP11_ACTOR_ATTR_NAME, soap11Actor != null);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/GeneratedKeyMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/GeneratedKeyMarshaller.java
index 8ff36d3..a1b0465 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/GeneratedKeyMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/GeneratedKeyMarshaller.java
@@ -34,7 +34,7 @@ import org.w3c.dom.Element;
 public class GeneratedKeyMarshaller extends XSBase64BinaryMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         GeneratedKey key = (GeneratedKey) samlObject;
 
         if (key.isSOAP11MustUnderstandXSBoolean() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/GeneratedKeyUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/GeneratedKeyUnmarshaller.java
index 8116996..af1463b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/GeneratedKeyUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/GeneratedKeyUnmarshaller.java
@@ -34,7 +34,7 @@ import org.w3c.dom.Attr;
 public class GeneratedKeyUnmarshaller extends XSBase64BinaryUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         GeneratedKey key = (GeneratedKey) samlObject;
 
         QName attrName = QNameSupport.getNodeQName(attribute);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/SessionKeyBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/SessionKeyBuilder.java
index 465e8b0..b38d4ae 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/SessionKeyBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/SessionKeyBuilder.java
@@ -44,7 +44,7 @@ public class SessionKeyBuilder extends AbstractSAMLObjectBuilder<SessionKey> {
     }
 
     /** {@inheritDoc} */
-    public SessionKey buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public SessionKey buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new SessionKeyImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/SessionKeyImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/SessionKeyImpl.java
index 51899d8..71e6bbb 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/SessionKeyImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/SessionKeyImpl.java
@@ -59,7 +59,7 @@ public class SessionKeyImpl extends AbstractSAMLObject implements SessionKey {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SessionKeyImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SessionKeyImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         
         encTypes = new XMLObjectChildrenList<>(this);
@@ -82,7 +82,7 @@ public class SessionKeyImpl extends AbstractSAMLObject implements SessionKey {
 
     /** {@inheritDoc} */
     @Override
-    public void setSOAP11MustUnderstand(Boolean newMustUnderstand) {
+    public void setSOAP11MustUnderstand(final Boolean newMustUnderstand) {
         if (newMustUnderstand != null) {
             soap11MustUnderstand = prepareForAssignment(soap11MustUnderstand, 
                     new XSBooleanValue(newMustUnderstand, true));
@@ -95,7 +95,7 @@ public class SessionKeyImpl extends AbstractSAMLObject implements SessionKey {
 
     /** {@inheritDoc} */
     @Override
-    public void setSOAP11MustUnderstand(XSBooleanValue newMustUnderstand) {
+    public void setSOAP11MustUnderstand(final XSBooleanValue newMustUnderstand) {
             soap11MustUnderstand = prepareForAssignment(soap11MustUnderstand, newMustUnderstand);
             manageQualifiedAttributeNamespace(MustUnderstandBearing.SOAP11_MUST_UNDERSTAND_ATTR_NAME, 
                     soap11MustUnderstand != null);
@@ -109,7 +109,7 @@ public class SessionKeyImpl extends AbstractSAMLObject implements SessionKey {
 
     /** {@inheritDoc} */
     @Override
-    public void setSOAP11Actor(String newActor) {
+    public void setSOAP11Actor(final String newActor) {
         soap11Actor = prepareForAssignment(soap11Actor, newActor);
         manageQualifiedAttributeNamespace(ActorBearing.SOAP11_ACTOR_ATTR_NAME, soap11Actor != null);
     }
@@ -122,7 +122,7 @@ public class SessionKeyImpl extends AbstractSAMLObject implements SessionKey {
 
     /** {@inheritDoc} */
     @Override
-    public void setAlgorithm(String newAlgorithm) {
+    public void setAlgorithm(final String newAlgorithm) {
         algorithm = prepareForAssignment(algorithm, newAlgorithm);
     }
 
@@ -140,7 +140,7 @@ public class SessionKeyImpl extends AbstractSAMLObject implements SessionKey {
 
     /** {@inheritDoc} */
     @Override
-    public void setKeyInfo(KeyInfo newKeyInfo) {
+    public void setKeyInfo(final KeyInfo newKeyInfo) {
         keyInfo = prepareForAssignment(keyInfo, newKeyInfo);
     }
     
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/SessionKeyMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/SessionKeyMarshaller.java
index b2502f0..2cd4842 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/SessionKeyMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/SessionKeyMarshaller.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
 public class SessionKeyMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         SessionKey key = (SessionKey) samlObject;
 
         if (key.isSOAP11MustUnderstandXSBoolean() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/SessionKeyUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/SessionKeyUnmarshaller.java
index 9c36f3c..376d820 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/SessionKeyUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlec/impl/SessionKeyUnmarshaller.java
@@ -36,7 +36,7 @@ import org.w3c.dom.Attr;
 public class SessionKeyUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
         SessionKey key = (SessionKey) parentObject;
 
         if (childObject instanceof EncType) {
@@ -49,7 +49,7 @@ public class SessionKeyUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final SessionKey key = (SessionKey) samlObject;
 
         final QName attrName = QNameSupport.getNodeQName(attribute);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlpthrpty/impl/RespondToBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlpthrpty/impl/RespondToBuilder.java
index e034ca7..0a6e479 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlpthrpty/impl/RespondToBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlpthrpty/impl/RespondToBuilder.java
@@ -33,7 +33,7 @@ public class RespondToBuilder extends AbstractSAMLObjectBuilder<RespondTo> {
     }
 
     /** {@inheritDoc} */
-    public RespondTo buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public RespondTo buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new RespondToImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlpthrpty/impl/RespondToImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlpthrpty/impl/RespondToImpl.java
index c46f255..858ba1a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlpthrpty/impl/RespondToImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/samlpthrpty/impl/RespondToImpl.java
@@ -21,7 +21,7 @@ import org.opensaml.saml.ext.samlpthrpty.RespondTo;
 import org.opensaml.saml.saml2.core.impl.AbstractNameIDType;
 
 /**
- * Concerte implementation of {@link RespondTo}.
+ * Concrete implementation of {@link RespondTo}.
  */
 public class RespondToImpl extends AbstractNameIDType implements RespondTo {
 
@@ -32,7 +32,7 @@ public class RespondToImpl extends AbstractNameIDType implements RespondTo {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected RespondToImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected RespondToImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/criteria/entity/impl/EvaluableEntityRoleEntityDescriptorCriterion.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/criteria/entity/impl/EvaluableEntityRoleEntityDescriptorCriterion.java
index b850200..48076cc 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/criteria/entity/impl/EvaluableEntityRoleEntityDescriptorCriterion.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/criteria/entity/impl/EvaluableEntityRoleEntityDescriptorCriterion.java
@@ -44,7 +44,7 @@ public class EvaluableEntityRoleEntityDescriptorCriterion implements EvaluableEn
      *
      * @param criterion the entity role criterion
      */
-    public EvaluableEntityRoleEntityDescriptorCriterion(EntityRoleCriterion criterion) {
+    public EvaluableEntityRoleEntityDescriptorCriterion(final EntityRoleCriterion criterion) {
         Constraint.isNotNull(criterion, "EntityRoleCriterion was null");
         role = Constraint.isNotNull(criterion.getRole(), "Criterion role QName was null");
     }
@@ -54,12 +54,12 @@ public class EvaluableEntityRoleEntityDescriptorCriterion implements EvaluableEn
      *
      * @param entityRole the entity
      */
-    public EvaluableEntityRoleEntityDescriptorCriterion(QName entityRole) {
+    public EvaluableEntityRoleEntityDescriptorCriterion(final QName entityRole) {
         role = Constraint.isNotNull(entityRole, "Entity Role QName was null");
     }
 
     /** {@inheritDoc} */
-    public boolean apply(EntityDescriptor entityDescriptor) {
+    public boolean apply(final EntityDescriptor entityDescriptor) {
         if (entityDescriptor == null) {
             return false;
         }
@@ -73,7 +73,7 @@ public class EvaluableEntityRoleEntityDescriptorCriterion implements EvaluableEn
     }
 
     /** {@inheritDoc} */
-    public boolean equals(Object other) {
+    public boolean equals(final Object other) {
         if (this == other) {
             return true;
         }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/criteria/role/impl/EvaluableEntityRoleDescriptorCriterion.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/criteria/role/impl/EvaluableEntityRoleDescriptorCriterion.java
index f671056..dd3e348 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/criteria/role/impl/EvaluableEntityRoleDescriptorCriterion.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/criteria/role/impl/EvaluableEntityRoleDescriptorCriterion.java
@@ -60,7 +60,7 @@ public class EvaluableEntityRoleDescriptorCriterion implements EvaluableRoleDesc
     }
     
     /** {@inheritDoc} */
-    public boolean apply(RoleDescriptor input) {
+    public boolean apply(final RoleDescriptor input) {
         if (input == null) {
             return false;
         }
@@ -79,7 +79,7 @@ public class EvaluableEntityRoleDescriptorCriterion implements EvaluableRoleDesc
     }
 
     /** {@inheritDoc} */
-    public boolean equals(Object other) {
+    public boolean equals(final Object other) {
         if (this == other) {
             return true;
         }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/criteria/role/impl/EvaluableProtocolRoleDescriptorCriterion.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/criteria/role/impl/EvaluableProtocolRoleDescriptorCriterion.java
index dde149d..0cf9c79 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/criteria/role/impl/EvaluableProtocolRoleDescriptorCriterion.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/criteria/role/impl/EvaluableProtocolRoleDescriptorCriterion.java
@@ -61,7 +61,7 @@ public class EvaluableProtocolRoleDescriptorCriterion implements EvaluableRoleDe
     }
     
     /** {@inheritDoc} */
-    public boolean apply(RoleDescriptor input) {
+    public boolean apply(final RoleDescriptor input) {
         if (input == null) {
             return false;
         }
@@ -75,7 +75,7 @@ public class EvaluableProtocolRoleDescriptorCriterion implements EvaluableRoleDe
     }
 
     /** {@inheritDoc} */
-    public boolean equals(Object other) {
+    public boolean equals(final Object other) {
         if (this == other) {
             return true;
         }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/BasicDynamicTrustedNamesStrategy.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/BasicDynamicTrustedNamesStrategy.java
index 1f00a4e..047f9f8 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/BasicDynamicTrustedNamesStrategy.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/BasicDynamicTrustedNamesStrategy.java
@@ -54,7 +54,7 @@ public class BasicDynamicTrustedNamesStrategy implements Function<XMLObject, Set
 
     /** {@inheritDoc} */
     @Override
-    @Nonnull @NonnullElements public Set<String> apply(@Nullable XMLObject input) {
+    @Nonnull @NonnullElements public Set<String> apply(@Nullable final XMLObject input) {
         if (input == null) {
             return Collections.emptySet();
         }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntitiesDescriptorNameProcessor.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntitiesDescriptorNameProcessor.java
index 1b36ffe..55403f8 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntitiesDescriptorNameProcessor.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntitiesDescriptorNameProcessor.java
@@ -42,7 +42,7 @@ public class EntitiesDescriptorNameProcessor implements MetadataNodeProcessor {
 
     /** {@inheritDoc} */
     @Override
-    public void process(XMLObject metadataNode) throws FilterException {
+    public void process(final XMLObject metadataNode) throws FilterException {
         if (metadataNode instanceof EntityDescriptor) {
             XMLObject currentParent = metadataNode.getParent();
             while (currentParent != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/NodeProcessingMetadataFilter.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/NodeProcessingMetadataFilter.java
index 356ee3b..8354e13 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/NodeProcessingMetadataFilter.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/NodeProcessingMetadataFilter.java
@@ -101,7 +101,7 @@ public class NodeProcessingMetadataFilter extends AbstractInitializableComponent
      * 
      * @throws FilterException if a fatal error is encountered while processing a node
      */
-    protected void processNode(XMLObject node) throws FilterException {
+    protected void processNode(final XMLObject node) throws FilterException {
         
         for (final MetadataNodeProcessor processor : getNodeProcessors()) {
             processor.process(node);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilter.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilter.java
index acee40c..f248ccd 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilter.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilter.java
@@ -247,7 +247,7 @@ public class SignatureValidationFilter implements MetadataFilter {
                 log.error("Internal error, metadata object was of an unsupported type: {}", 
                         metadata.getClass().getName());
             }
-        } catch (Throwable t) {
+        } catch (final Throwable t) {
             log.warn("Saw fatal error validating metadata signature(s), metadata will be filtered out", t);
             return null;
         }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java
index 7af1fa2..0713051 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java
@@ -518,7 +518,7 @@ public abstract class AbstractDynamicHTTPMetadataResolver extends AbstractDynami
                     xmlObject.getObjectMetadata().put(new XMLObjectSource(source));
                     return xmlObject;
                 }
-            } catch (IOException | UnmarshallingException e) {
+            } catch (final IOException | UnmarshallingException e) {
                 log.error("{} Error unmarshalling HTTP response stream", getLogPrefix(), e);
                 return null;
             }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java
index 4086aae..a20a7c4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java
@@ -224,7 +224,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
      * 
      * @param flag true if should init from the cache in the background, false otherwise
      */
-    public void setInitializeFromPersistentCacheInBackground(boolean flag) {
+    public void setInitializeFromPersistentCacheInBackground(final boolean flag) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
         initializeFromPersistentCacheInBackground = flag;
@@ -640,7 +640,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
             throws FilterException {
         try {
             processNewMetadata(root, expectedEntityID, false);
-        } catch (ResolverException e) {
+        } catch (final ResolverException e) {
             //TODO this is kludgy, but necessary until we can change the API to add an exception to the method signature
             throw new FilterException(e);
         }
@@ -742,7 +742,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
             //   2) the object can't be successfully round-tripped (e.g signatures).
             try {
                 return XMLObjectSupport.cloneXMLObject(input, CloneOutputOption.RootDOMInNewDocument);
-            } catch (MarshallingException | UnmarshallingException e) {
+            } catch (final MarshallingException | UnmarshallingException e) {
                 log.warn("{} Error cloning XMLObject, will use input root object as filter target", getLogPrefix(), e);
                 return input;
             }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/IdentityEntityIDGenerator.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/IdentityEntityIDGenerator.java
index 479f34a..0534ef6 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/IdentityEntityIDGenerator.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/IdentityEntityIDGenerator.java
@@ -29,7 +29,7 @@ import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 public class IdentityEntityIDGenerator implements Function<CriteriaSet, String> {
     
     /** {@inheritDoc} */
-    public String apply(CriteriaSet input) {
+    public String apply(final CriteriaSet input) {
         if (input == null) {
             return null;
         }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/EndpointMetadataIndex.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/EndpointMetadataIndex.java
index 7317357..13b308f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/EndpointMetadataIndex.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/EndpointMetadataIndex.java
@@ -182,7 +182,7 @@ public class EndpointMetadataIndex implements MetadataIndex {
      * @param location the location to process
      * @return the variants of the location to be indexed 
      */
-    @Nonnull private Set<String> processLocation(@Nonnull CriteriaSet criteriaSet, @Nonnull final String location) {
+    @Nonnull private Set<String> processLocation(@Nonnull final CriteriaSet criteriaSet, @Nonnull final String location) {
         boolean generateStartsWithVariants = false;
         StartsWithLocationCriterion startsWithCrit = criteriaSet.get(StartsWithLocationCriterion.class);
         if (startsWithCrit != null) {
@@ -208,7 +208,7 @@ public class EndpointMetadataIndex implements MetadataIndex {
                 currentURL = urlBuilder.buildURL();
                 result.add(currentURL);
                 log.trace("Produced value '{}'", currentURL);
-            } catch (MalformedURLException e) {
+            } catch (final MalformedURLException e) {
                 log.warn("Could not parse URL '{}', will not generate path segment variants", location, e);
             }
             return result;
@@ -312,7 +312,7 @@ public class EndpointMetadataIndex implements MetadataIndex {
         public EndpointMetadataIndexKey(@Nonnull final QName roleType, 
                 @Nonnull final QName endpointType, 
                 @Nonnull @NotEmpty final String endpointLocation,
-                boolean isResponse) {
+                final boolean isResponse) {
             role = Constraint.isNotNull(roleType, "SAML role cannot be null");
             endpoint = Constraint.isNotNull(endpointType, "SAML endpoint type cannot be null");
             location = Constraint.isNotNull(StringSupport.trimOrNull(endpointLocation),
@@ -321,7 +321,7 @@ public class EndpointMetadataIndex implements MetadataIndex {
             
             try {
                 canonicalizedLocation = MetadataIndexSupport.canonicalizeLocationURI(location);
-            } catch (MalformedURLException e) {
+            } catch (final MalformedURLException e) {
                 // This is unlikely to happen on realistic real world inputs. If it does, don't be fatal, 
                 // just switch to alternate strategy.
                 log.warn("Input location '{}' was a malformed URL, switching to lower case strategy", 
@@ -398,7 +398,7 @@ public class EndpointMetadataIndex implements MetadataIndex {
 
         /** {@inheritDoc} */
         @Override
-        public boolean equals(Object obj) {
+        public boolean equals(final Object obj) {
             if (this == obj) {
                 return true;
             }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManager.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManager.java
index dc20fe5..7a3029e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManager.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexManager.java
@@ -69,7 +69,7 @@ public class MetadataIndexManager<T> {
      * @param extractionFunction function to extract the indexed data item from an EntityDescriptor
      */
     public MetadataIndexManager(
-            @Nullable @NonnullElements @Unmodifiable @NotLive Set<MetadataIndex> initIndexes,
+            @Nullable @NonnullElements @Unmodifiable @NotLive final Set<MetadataIndex> initIndexes,
             @Nonnull final Function<EntityDescriptor, T> extractionFunction
             ) {
         
@@ -102,7 +102,7 @@ public class MetadataIndexManager<T> {
      * @return the index store for the index, may be null if index was not initialized 
      *         for this manager instance
      */
-    @Nullable protected MetadataIndexStore<T> getStore(@Nonnull MetadataIndex index) {
+    @Nullable protected MetadataIndexStore<T> getStore(@Nonnull final MetadataIndex index) {
         Constraint.isNotNull(index, "MetadataIndex was null");
         return indexes.get(index);
     }
@@ -186,7 +186,7 @@ public class MetadataIndexManager<T> {
     public static class IdentityExtractionFunction implements Function<EntityDescriptor, EntityDescriptor> {
 
         /** {@inheritDoc} */
-        public EntityDescriptor apply(EntityDescriptor input) {
+        public EntityDescriptor apply(final EntityDescriptor input) {
             return input;
         }
         
@@ -196,7 +196,7 @@ public class MetadataIndexManager<T> {
     public static class EntityIDExtractionFunction implements Function<EntityDescriptor, String> {
 
         /** {@inheritDoc} */
-        public String apply(EntityDescriptor input) {
+        public String apply(final EntityDescriptor input) {
             if (input == null) {
                 return null;
             }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexStore.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexStore.java
index dff500b..1873bf9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexStore.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexStore.java
@@ -86,7 +86,7 @@ public class MetadataIndexStore<T> {
      * @param key the index key
      * @param item the data item to index
      */
-    public void add(MetadataIndexKey key, T item) {
+    public void add(final MetadataIndexKey key, final T item) {
         Constraint.isNotNull(key, "IndexKey was null");
         Constraint.isNotNull(item, "The indexed data element was null");
         Set<T> items = index.get(key);
@@ -103,7 +103,7 @@ public class MetadataIndexStore<T> {
      * @param key the index key
      * @param item the data item to index
      */
-    public void remove(MetadataIndexKey key, T item) {
+    public void remove(final MetadataIndexKey key, final T item) {
         Constraint.isNotNull(key, "IndexKey was null");
         Constraint.isNotNull(item, "The indexed data element was null");
         Set<T> items = index.get(key);
@@ -118,7 +118,7 @@ public class MetadataIndexStore<T> {
      * 
      * @param key the index key
      */
-    public void clear(MetadataIndexKey key) {
+    public void clear(final MetadataIndexKey key) {
         Constraint.isNotNull(key, "IndexKey was null");
         index.remove(key);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/RoleMetadataIndex.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/RoleMetadataIndex.java
index 0ed2e09..6b878b9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/RoleMetadataIndex.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/RoleMetadataIndex.java
@@ -45,7 +45,7 @@ public class RoleMetadataIndex implements MetadataIndex {
 
     /** {@inheritDoc} */
     @Nullable @NonnullElements @Unmodifiable @NotLive 
-    public Set<MetadataIndexKey> generateKeys(@Nonnull CriteriaSet criteriaSet) {
+    public Set<MetadataIndexKey> generateKeys(@Nonnull final CriteriaSet criteriaSet) {
         Constraint.isNotNull(criteriaSet, "CriteriaSet was null");
         EntityRoleCriterion roleCrit = criteriaSet.get(EntityRoleCriterion.class);
         if (roleCrit != null) {
@@ -59,7 +59,7 @@ public class RoleMetadataIndex implements MetadataIndex {
 
     /** {@inheritDoc} */
     @Nullable @NonnullElements @Unmodifiable @NotLive 
-    public Set<MetadataIndexKey> generateKeys(@Nonnull EntityDescriptor descriptor) {
+    public Set<MetadataIndexKey> generateKeys(@Nonnull final EntityDescriptor descriptor) {
         Constraint.isNotNull(descriptor, "EntityDescriptor was null");
         HashSet<MetadataIndexKey> result = new HashSet<>();
         for (RoleDescriptor role : descriptor.getRoleDescriptors()) {
@@ -112,7 +112,7 @@ public class RoleMetadataIndex implements MetadataIndex {
 
         /** {@inheritDoc} */
         @Override
-        public boolean equals(Object obj) {
+        public boolean equals(final Object obj) {
             if (this == obj) {
                 return true;
             }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/SAMLArtifactMetadataIndex.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/SAMLArtifactMetadataIndex.java
index 9902097..fbb859b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/SAMLArtifactMetadataIndex.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/SAMLArtifactMetadataIndex.java
@@ -106,7 +106,7 @@ public class SAMLArtifactMetadataIndex implements MetadataIndex {
     }
 
     /** {@inheritDoc} */
-    @Nullable public Set<MetadataIndexKey> generateKeys(@Nonnull EntityDescriptor descriptor) {
+    @Nullable public Set<MetadataIndexKey> generateKeys(@Nonnull final EntityDescriptor descriptor) {
         Constraint.isNotNull(descriptor, "EntityDescriptor was null");
         HashSet<MetadataIndexKey> results = new HashSet<>();
         for (Function<EntityDescriptor, Set<MetadataIndexKey>> indexingFunction : indexingFunctions) {
@@ -119,7 +119,7 @@ public class SAMLArtifactMetadataIndex implements MetadataIndex {
     }
 
     /** {@inheritDoc} */
-    @Nullable public Set<MetadataIndexKey> generateKeys(@Nonnull CriteriaSet criteriaSet) {
+    @Nullable public Set<MetadataIndexKey> generateKeys(@Nonnull final CriteriaSet criteriaSet) {
         Constraint.isNotNull(criteriaSet, "CriteriaSet was null");
         ArtifactCriterion artifactCrit = criteriaSet.get(ArtifactCriterion.class);
         if (artifactCrit != null) {
@@ -169,12 +169,12 @@ public class SAMLArtifactMetadataIndex implements MetadataIndex {
                 ArtifactSourceIDMetadataIndexKey key = new ArtifactSourceIDMetadataIndexKey(sourceID);
                 log.trace("For entityID '{}' produced artifact SourceID index key: {}", entityID, key);
                 return Collections.<MetadataIndexKey>singleton(key);
-            } catch (NoSuchAlgorithmException e) {
+            } catch (final NoSuchAlgorithmException e) {
                 // SHA-1 should be supported in every JVM, so this should never happen.
                 log.error("Digest algorithm '{}' was invalid for encoding artifact SourceID", 
                         JCAConstants.DIGEST_SHA1, e);
                 return null;
-            } catch (UnsupportedEncodingException e) {
+            } catch (final UnsupportedEncodingException e) {
                 // UTF-8 should be supported in every JVM, this should never happen.
                 log.error("UTF-8 was unsupported for encoding artifact SourceID!");
                 return null;
@@ -223,7 +223,7 @@ public class SAMLArtifactMetadataIndex implements MetadataIndex {
                                     log.trace("For SourceID extension value '{}' produced index key: {}", 
                                             extSourceIDHex, key);
                                     results.add(key);
-                                } catch (DecoderException e) {
+                                } catch (final DecoderException e) {
                                     log.warn("Error decoding hexidecimal SourceID extension value '{}' for indexing", 
                                             extSourceIDHex, e);
                                 }
@@ -326,7 +326,7 @@ public class SAMLArtifactMetadataIndex implements MetadataIndex {
 
         /** {@inheritDoc} */
         @Override
-        public boolean equals(Object obj) {
+        public boolean equals(final Object obj) {
             if (this == obj) {
                 return true;
             }
@@ -367,7 +367,7 @@ public class SAMLArtifactMetadataIndex implements MetadataIndex {
                     "SAML artifact source location cannot be null or empty");
             try {
                 canonicalizedLocation = MetadataIndexSupport.canonicalizeLocationURI(location);
-            } catch (MalformedURLException e) {
+            } catch (final MalformedURLException e) {
                 // This is unlikely to happen on realistic real world inputs. If it does, don't be fatal, 
                 // just switch to alternate strategy.
                 log.warn("Input source location '{}' was a malformed URL, switching to lower case strategy", 
@@ -414,7 +414,7 @@ public class SAMLArtifactMetadataIndex implements MetadataIndex {
 
         /** {@inheritDoc} */
         @Override
-        public boolean equals(Object obj) {
+        public boolean equals(final Object obj) {
             if (this == obj) {
                 return true;
             }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPArtifactDecoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPArtifactDecoder.java
index ea3cc62..0fd630a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPArtifactDecoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPArtifactDecoder.java
@@ -94,7 +94,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      * 
      * @throws MessageDecodingException thrown if there is a problem decoding the TARGET parameter.
      */
-    protected void decodeTarget(MessageContext messageContext, HttpServletRequest request) 
+    protected void decodeTarget(final MessageContext messageContext, final HttpServletRequest request) 
             throws MessageDecodingException {
         String target = StringSupport.trim(request.getParameter("TARGET"));
         if (target == null) {
@@ -113,7 +113,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      * 
      * @throws MessageDecodingException thrown if there is a problem decoding or dereferencing the artifacts
      */
-    protected void processArtifacts(MessageContext messageContext, HttpServletRequest request) 
+    protected void processArtifacts(final MessageContext messageContext, final HttpServletRequest request) 
             throws MessageDecodingException {
         String[] encodedArtifacts = request.getParameterValues("SAMLart");
         if (encodedArtifacts == null || encodedArtifacts.length == 0) {
@@ -131,7 +131,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      * 
      * @param messageContext the current message context
      */
-    protected void populateBindingContext(MessageContext<SAMLObject> messageContext) {
+    protected void populateBindingContext(final MessageContext<SAMLObject> messageContext) {
         SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
         bindingContext.setBindingUri(getBindingURI());
         bindingContext.setBindingDescriptor(bindingDescriptor);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPPostDecoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPPostDecoder.java
index 7a97247..abb3ea3 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPPostDecoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPPostDecoder.java
@@ -107,7 +107,7 @@ public class HTTPPostDecoder extends BaseHttpServletRequestXMLMessageDecoder<SAM
      * 
      * @param messageContext the current message context
      */
-    protected void populateBindingContext(MessageContext<SAMLObject> messageContext) {
+    protected void populateBindingContext(final MessageContext<SAMLObject> messageContext) {
         SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
         bindingContext.setBindingUri(getBindingURI());
         bindingContext.setBindingDescriptor(bindingDescriptor);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPSOAP11Decoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPSOAP11Decoder.java
index b55a278..290710f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPSOAP11Decoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/impl/HTTPSOAP11Decoder.java
@@ -90,7 +90,7 @@ public class HTTPSOAP11Decoder extends org.opensaml.soap.soap11.decoder.http.imp
      * 
      * @param messageContext the current message context
      */
-    protected void populateBindingContext(MessageContext<SAMLObject> messageContext) {
+    protected void populateBindingContext(final MessageContext<SAMLObject> messageContext) {
         SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
         bindingContext.setBindingUri(getBindingURI());
         bindingContext.setBindingDescriptor(bindingDescriptor);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/impl/HttpClientResponseSOAP11Decoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/impl/HttpClientResponseSOAP11Decoder.java
index c3e5ab5..6a21486 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/impl/HttpClientResponseSOAP11Decoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/decoding/impl/HttpClientResponseSOAP11Decoder.java
@@ -91,7 +91,7 @@ public class HttpClientResponseSOAP11Decoder
      * 
      * @param messageContext the current message context
      */
-    protected void populateBindingContext(MessageContext<SAMLObject> messageContext) {
+    protected void populateBindingContext(final MessageContext<SAMLObject> messageContext) {
         SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
         bindingContext.setBindingUri(getBindingURI());
         bindingContext.setBindingDescriptor(bindingDescriptor);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPArtifactEncoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPArtifactEncoder.java
index 493869e..80bdef4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPArtifactEncoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPArtifactEncoder.java
@@ -132,7 +132,7 @@ public class HTTPArtifactEncoder extends BaseSAML1MessageEncoder {
         final URLBuilder urlBuilder;
         try {
             urlBuilder = new URLBuilder(endpointUrl);
-        } catch (MalformedURLException e) {
+        } catch (final MalformedURLException e) {
             throw new MessageEncodingException("Endpoint URL " + endpointUrl + " is not a valid URL", e);
         }
         
@@ -187,7 +187,7 @@ public class HTTPArtifactEncoder extends BaseSAML1MessageEncoder {
         
         try {
             response.sendRedirect(encodedEndpoint);
-        } catch (IOException e) {
+        } catch (final IOException e) {
             throw new MessageEncodingException("Problem sending HTTP redirect", e);
         }
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoder.java
index 47b6e9e..6d74c8f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/impl/HTTPPostEncoder.java
@@ -82,7 +82,7 @@ public class HTTPPostEncoder extends BaseSAML1MessageEncoder {
      * 
      * @param newVelocityEngine the new VelocityEngine instane
      */
-    public void setVelocityEngine(VelocityEngine newVelocityEngine) {
+    public void setVelocityEngine(final VelocityEngine newVelocityEngine) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
         velocityEngine = newVelocityEngine;
@@ -106,7 +106,7 @@ public class HTTPPostEncoder extends BaseSAML1MessageEncoder {
      * 
      * @param newVelocityTemplateId the new Velocity template id
      */
-    public void setVelocityTemplateId(String newVelocityTemplateId) {
+    public void setVelocityTemplateId(final String newVelocityTemplateId) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
         velocityTemplateId = newVelocityTemplateId;
@@ -151,7 +151,7 @@ public class HTTPPostEncoder extends BaseSAML1MessageEncoder {
      * 
      * @throws MessageEncodingException thrown if there is a problem encoding the message
      */
-    protected void postEncode(MessageContext<SAMLObject> messageContext, String endpointURL) 
+    protected void postEncode(final MessageContext<SAMLObject> messageContext, final String endpointURL) 
             throws MessageEncodingException {
         log.debug("Invoking velocity template to create POST body");
 
@@ -185,10 +185,10 @@ public class HTTPPostEncoder extends BaseSAML1MessageEncoder {
             Writer out = new OutputStreamWriter(response.getOutputStream(), "UTF-8");
             velocityEngine.mergeTemplate(velocityTemplateId, "UTF-8", context, out);
             out.flush();
-        } catch (UnsupportedEncodingException e) {
+        } catch (final UnsupportedEncodingException e) {
             log.error("UTF-8 encoding is not supported, this VM is not Java compliant.");
             throw new MessageEncodingException("Unable to encode message, UTF-8 encoding is not supported");
-        } catch (Exception e) {
+        } catch (final Exception e) {
             log.error("Error invoking velocity template", e);
             throw new MessageEncodingException("Error creating output document", e);
         }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ActionBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ActionBuilder.java
index 4f645bf..cb61063 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ActionBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ActionBuilder.java
@@ -41,7 +41,7 @@ public class ActionBuilder extends AbstractSAMLObjectBuilder<Action> {
 
     /** {@inheritDoc} */
     @Override
-    public Action buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Action buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ActionImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ActionImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ActionImpl.java
index 0716a6c..26ede02 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ActionImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ActionImpl.java
@@ -41,7 +41,7 @@ public class ActionImpl extends AbstractSAMLObject implements Action {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ActionImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ActionImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);   
     }
 
@@ -53,7 +53,7 @@ public class ActionImpl extends AbstractSAMLObject implements Action {
 
     /** {@inheritDoc} */
     @Override
-    public void setNamespace(String ns) {
+    public void setNamespace(final String ns) {
         namespace = prepareForAssignment(namespace, ns);
     }
 
@@ -65,7 +65,7 @@ public class ActionImpl extends AbstractSAMLObject implements Action {
 
     /** {@inheritDoc} */
     @Override
-    public void setContents(String c) {
+    public void setContents(final String c) {
         contents = prepareForAssignment(contents, c);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ActionMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ActionMarshaller.java
index 7209cad..cdc3dae 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ActionMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ActionMarshaller.java
@@ -31,7 +31,7 @@ import org.w3c.dom.Element;
 public class ActionMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlElement, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
 
         Action action = (Action) samlElement;
 
@@ -41,7 +41,7 @@ public class ActionMarshaller extends AbstractSAMLObjectMarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         Action action = (Action) samlObject;
 
         if (action.getContents() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ActionUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ActionUnmarshaller.java
index 62b8a77..06d5423 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ActionUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ActionUnmarshaller.java
@@ -29,13 +29,13 @@ import org.w3c.dom.Attr;
 public class ActionUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         final Action action = (Action) samlObject;
         action.setContents(elementContent);
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
 
         if (Action.NAMESPACE_ATTRIB_NAME.equals(attribute.getLocalName()) && attribute.getNamespaceURI() == null) {
             final Action action = (Action) samlObject;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AdviceBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AdviceBuilder.java
index 95a8b18..d06bd8d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AdviceBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AdviceBuilder.java
@@ -41,7 +41,7 @@ public class AdviceBuilder extends AbstractSAMLObjectBuilder<Advice> {
 
     /** {@inheritDoc} */
     @Override
-    public Advice buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Advice buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AdviceImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AdviceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AdviceImpl.java
index df3e587..461de49 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AdviceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AdviceImpl.java
@@ -49,7 +49,7 @@ public class AdviceImpl extends AbstractSAMLObject implements Advice {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AdviceImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AdviceImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         assertionChildren = new IndexedXMLObjectChildrenList<>(this);
         unknownChildren = new IndexedXMLObjectChildrenList<>(this);
@@ -84,7 +84,7 @@ public class AdviceImpl extends AbstractSAMLObject implements Advice {
     
     /** {@inheritDoc} */
     @Override
-    public List<XMLObject> getUnknownXMLObjects(QName typeOrName) {
+    public List<XMLObject> getUnknownXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) unknownChildren.subList(typeOrName);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AdviceUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AdviceUnmarshaller.java
index 5145d76..c0684d2 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AdviceUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AdviceUnmarshaller.java
@@ -30,7 +30,7 @@ import org.opensaml.saml.saml1.core.AssertionIDReference;
 public class AdviceUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
 
         Advice advice = (Advice) parentSAMLObject;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactBuilder.java
index de1e82e..fceee17 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactBuilder.java
@@ -42,7 +42,7 @@ public class AssertionArtifactBuilder extends AbstractSAMLObjectBuilder<Assertio
 
     /** {@inheritDoc} */
     @Override
-    public AssertionArtifact buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AssertionArtifact buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AssertionArtifactImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactImpl.java
index e09663b..6dfc2eb 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactImpl.java
@@ -38,7 +38,7 @@ public class AssertionArtifactImpl extends AbstractSAMLObject implements Asserti
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AssertionArtifactImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AssertionArtifactImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -50,7 +50,7 @@ public class AssertionArtifactImpl extends AbstractSAMLObject implements Asserti
 
     /** {@inheritDoc} */
     @Override
-    public void setAssertionArtifact(String artifact) {
+    public void setAssertionArtifact(final String artifact) {
         assertionArtifact = prepareForAssignment(assertionArtifact, artifact);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactMarshaller.java
index 4be1e1f..b6f1576 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactMarshaller.java
@@ -31,7 +31,7 @@ import org.w3c.dom.Element;
 public class AssertionArtifactMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         AssertionArtifact assertionArtifact = (AssertionArtifact) samlObject;
         if (assertionArtifact.getAssertionArtifact() != null) {
             ElementSupport.appendTextContent(domElement, assertionArtifact.getAssertionArtifact());
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactUnmarshaller.java
index 264896d..01c6b3f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionArtifactUnmarshaller.java
@@ -27,7 +27,7 @@ import org.opensaml.saml.saml1.core.AssertionArtifact;
 public class AssertionArtifactUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         AssertionArtifact assertionArtifact = (AssertionArtifact) samlObject;
 
         assertionArtifact.setAssertionArtifact(elementContent);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionBuilder.java
index 830c9f7..d8797b4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionBuilder.java
@@ -42,7 +42,7 @@ public class AssertionBuilder extends AbstractSAMLObjectBuilder<Assertion> {
 
     /** {@inheritDoc} */
     @Override
-    public AssertionImpl buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AssertionImpl buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AssertionImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceBuilder.java
index 52bd5a6..ecf2b47 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceBuilder.java
@@ -42,7 +42,7 @@ public class AssertionIDReferenceBuilder extends AbstractSAMLObjectBuilder<Asser
 
     /** {@inheritDoc} */
     @Override
-    public AssertionIDReference buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AssertionIDReference buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AssertionIDReferenceImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceImpl.java
index 504773b..f33a81b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceImpl.java
@@ -38,7 +38,7 @@ public class AssertionIDReferenceImpl extends AbstractSAMLObject implements Asse
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AssertionIDReferenceImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AssertionIDReferenceImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -49,7 +49,7 @@ public class AssertionIDReferenceImpl extends AbstractSAMLObject implements Asse
 
     /** {@inheritDoc} */
     @Override
-    public void setReference(String name) {
+    public void setReference(final String name) {
         ncName = prepareForAssignment(ncName, name);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceMarshaller.java
index 5d3d8f0..f219e70 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceMarshaller.java
@@ -31,7 +31,7 @@ import org.w3c.dom.Element;
 public class AssertionIDReferenceMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         AssertionIDReference assertionIDReference = (AssertionIDReference) samlObject;
         if (assertionIDReference.getReference() != null) {
             ElementSupport.appendTextContent(domElement, assertionIDReference.getReference());
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceUnmarshaller.java
index b31812f..2fa17f0 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionIDReferenceUnmarshaller.java
@@ -25,7 +25,7 @@ import org.opensaml.saml.saml1.core.AssertionIDReference;
 public class AssertionIDReferenceUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         AssertionIDReference assertionIDReference = (AssertionIDReference) samlObject;
 
         assertionIDReference.setReference(elementContent);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionImpl.java
index eff80ed..0da01ad 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionImpl.java
@@ -71,7 +71,7 @@ public class AssertionImpl extends AbstractSignableSAMLObject implements Asserti
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AssertionImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AssertionImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         statements = new IndexedXMLObjectChildrenList<>(this);
         version = SAMLVersion.VERSION_11;
@@ -88,7 +88,7 @@ public class AssertionImpl extends AbstractSignableSAMLObject implements Asserti
     }
     
     /** {@inheritDoc} */
-    public void setVersion(SAMLVersion newVersion){
+    public void setVersion(final SAMLVersion newVersion){
         version = prepareForAssignment(version, newVersion);
     }
 
@@ -98,7 +98,7 @@ public class AssertionImpl extends AbstractSignableSAMLObject implements Asserti
     }
 
     /** {@inheritDoc} */
-    public void setID(String newID) {
+    public void setID(final String newID) {
         String oldID = id;
         id = prepareForAssignment(id, newID);   
         registerOwnID(oldID, id);
@@ -110,7 +110,7 @@ public class AssertionImpl extends AbstractSignableSAMLObject implements Asserti
     }
 
     /** {@inheritDoc} */
-    public void setIssuer(String iss) {
+    public void setIssuer(final String iss) {
         issuer = prepareForAssignment(issuer, iss);
     }
 
@@ -120,7 +120,7 @@ public class AssertionImpl extends AbstractSignableSAMLObject implements Asserti
     }
 
     /** {@inheritDoc} */
-    public void setIssueInstant(DateTime instant) {
+    public void setIssueInstant(final DateTime instant) {
         issueInstant = prepareForAssignment(issueInstant, instant);
     }
 
@@ -130,7 +130,7 @@ public class AssertionImpl extends AbstractSignableSAMLObject implements Asserti
     }
 
     /** {@inheritDoc} */
-    public void setConditions(Conditions c) {
+    public void setConditions(final Conditions c) {
         conditions = prepareForAssignment(conditions, c);
     }
 
@@ -140,7 +140,7 @@ public class AssertionImpl extends AbstractSignableSAMLObject implements Asserti
     }
 
     /** {@inheritDoc} */
-    public void setAdvice(Advice adv) {
+    public void setAdvice(final Advice adv) {
         advice = prepareForAssignment(advice, adv);
     }
 
@@ -150,7 +150,7 @@ public class AssertionImpl extends AbstractSignableSAMLObject implements Asserti
     }
 
     /** {@inheritDoc} */
-    public List<Statement> getStatements(QName typeOrName) {
+    public List<Statement> getStatements(final QName typeOrName) {
         return (List<Statement>) statements.subList(typeOrName);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionMarshaller.java
index baf3898..393950a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionMarshaller.java
@@ -30,7 +30,7 @@ import org.w3c.dom.Element;
 public class AssertionMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlElement, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
 
         Assertion assertion = (Assertion) samlElement;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionUnmarshaller.java
index 42b0bcb..ea2a238 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AssertionUnmarshaller.java
@@ -39,7 +39,7 @@ import com.google.common.base.Strings;
 public class AssertionUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    public XMLObject unmarshall(Element domElement) throws UnmarshallingException {
+    public XMLObject unmarshall(final Element domElement) throws UnmarshallingException {
         // After regular unmarshalling, check the minor version and set ID-ness if not SAML 1.0
         final Assertion assertion = (Assertion) super.unmarshall(domElement);
         if (assertion.getMinorVersion() != 0 && !Strings.isNullOrEmpty(assertion.getID())) {
@@ -49,7 +49,7 @@ public class AssertionUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
 
         final Assertion assertion = (Assertion) parentSAMLObject;
@@ -69,7 +69,7 @@ public class AssertionUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
 // Checkstyle: CyclomaticComplexity OFF
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
 
         final Assertion assertion = (Assertion) samlObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeBuilder.java
index 68ff39f..c38dbad 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeBuilder.java
@@ -39,7 +39,7 @@ public class AttributeBuilder extends AbstractSAMLObjectBuilder<Attribute> {
     }
 
     /** {@inheritDoc} */
-    public Attribute buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Attribute buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AttributeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorBuilder.java
index e3d33a6..45c24b6 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorBuilder.java
@@ -43,7 +43,7 @@ public class AttributeDesignatorBuilder extends AbstractSAMLObjectBuilder<Attrib
     }
 
     /** {@inheritDoc} */
-    public AttributeDesignator buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AttributeDesignator buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AttributeDesignatorImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorImpl.java
index caba088..f37fb4e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorImpl.java
@@ -45,7 +45,7 @@ public class AttributeDesignatorImpl extends AbstractSAMLObject implements Attri
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AttributeDesignatorImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AttributeDesignatorImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -55,7 +55,7 @@ public class AttributeDesignatorImpl extends AbstractSAMLObject implements Attri
     }
 
     /** {@inheritDoc} */
-    public void setAttributeName(String name) {
+    public void setAttributeName(final String name) {
         attributeName = prepareForAssignment(attributeName, name);
     }
 
@@ -65,7 +65,7 @@ public class AttributeDesignatorImpl extends AbstractSAMLObject implements Attri
     }
 
     /** {@inheritDoc} */
-    public void setAttributeNamespace(String ns) {
+    public void setAttributeNamespace(final String ns) {
         attributeNamespace = prepareForAssignment(attributeNamespace, ns);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorMarshaller.java
index 0187c35..ac7c459 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorMarshaller.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Element;
 public class AttributeDesignatorMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlElement, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
         AttributeDesignator designator = (AttributeDesignator) samlElement;
 
         if (designator.getAttributeName() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorUnmarshaller.java
index 70a1dfe..c11a0f5 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeDesignatorUnmarshaller.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Attr;
 public class AttributeDesignatorUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
 
         final AttributeDesignator designator = (AttributeDesignator) samlObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeImpl.java
index a44f7bd..b44819c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeImpl.java
@@ -39,7 +39,7 @@ public class AttributeImpl extends AttributeDesignatorImpl implements Attribute
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AttributeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AttributeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         attributeValues = new XMLObjectChildrenList<>(this);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeQueryBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeQueryBuilder.java
index cfd203e..17c448c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeQueryBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeQueryBuilder.java
@@ -40,7 +40,7 @@ public class AttributeQueryBuilder extends AbstractSAMLObjectBuilder<AttributeQu
     }
 
     /** {@inheritDoc} */
-    public AttributeQuery buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AttributeQuery buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AttributeQueryImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeQueryImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeQueryImpl.java
index 9f5445f..2388b94 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeQueryImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeQueryImpl.java
@@ -44,7 +44,7 @@ public class AttributeQueryImpl extends SubjectQueryImpl implements AttributeQue
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AttributeQueryImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AttributeQueryImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         attributeDesignators = new XMLObjectChildrenList<>(this);
     }
@@ -55,7 +55,7 @@ public class AttributeQueryImpl extends SubjectQueryImpl implements AttributeQue
     }
 
     /** {@inheritDoc} */
-    public void setResource(String res) {
+    public void setResource(final String res) {
         resource = prepareForAssignment(resource, res);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeQueryMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeQueryMarshaller.java
index 364cf1a..91d7d1e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeQueryMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeQueryMarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Element;
 public class AttributeQueryMarshaller extends SubjectQueryMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlElement, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
 
         AttributeQuery attributeQuery = (AttributeQuery) samlElement;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeQueryUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeQueryUnmarshaller.java
index 6f4cc28..596d1bf 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeQueryUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeQueryUnmarshaller.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Attr;
 public class AttributeQueryUnmarshaller extends SubjectQueryUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
 
         final AttributeQuery attributeQuery = (AttributeQuery) parentSAMLObject;
@@ -42,7 +42,7 @@ public class AttributeQueryUnmarshaller extends SubjectQueryUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
 
         final AttributeQuery attributeQuery = (AttributeQuery) samlObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeStatementBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeStatementBuilder.java
index 7ddced6..55a0436 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeStatementBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeStatementBuilder.java
@@ -40,7 +40,7 @@ public class AttributeStatementBuilder extends AbstractSAMLObjectBuilder<Attribu
     }
 
     /** {@inheritDoc} */
-    public AttributeStatement buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AttributeStatement buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AttributeStatementImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeStatementImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeStatementImpl.java
index 907dd4d..99668f8 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeStatementImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeStatementImpl.java
@@ -41,7 +41,7 @@ public class AttributeStatementImpl extends SubjectStatementImpl implements Attr
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AttributeStatementImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AttributeStatementImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         attributes = new XMLObjectChildrenList<>(this);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeStatementUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeStatementUnmarshaller.java
index 4900832..a7c03d8 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeStatementUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeStatementUnmarshaller.java
@@ -28,7 +28,7 @@ import org.opensaml.saml.saml1.core.AttributeStatement;
 public class AttributeStatementUnmarshaller extends SubjectStatementUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
 
         AttributeStatement attributeStatement = (AttributeStatement) parentSAMLObject;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeUnmarshaller.java
index 760d26f..a6ef4f0 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AttributeUnmarshaller.java
@@ -30,7 +30,7 @@ import org.opensaml.saml.saml1.core.Attribute;
 public class AttributeUnmarshaller extends AttributeDesignatorUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
 
         Attribute attribute = (Attribute) parentSAMLObject;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceBuilder.java
index e24fd7c..cfef450 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceBuilder.java
@@ -39,7 +39,7 @@ public class AudienceBuilder extends AbstractSAMLObjectBuilder<Audience> {
     }
 
     /** {@inheritDoc} */
-    public Audience buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Audience buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AudienceImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceImpl.java
index 40768a6..84740c0 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceImpl.java
@@ -38,7 +38,7 @@ public class AudienceImpl extends AbstractSAMLObject implements Audience {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AudienceImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AudienceImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -48,7 +48,7 @@ public class AudienceImpl extends AbstractSAMLObject implements Audience {
     }
 
     /** {@inheritDoc} */
-    public void setUri(String s) {
+    public void setUri(final String s) {
 
         uri = prepareForAssignment(uri, s);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceMarshaller.java
index 1711e0c..837241f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceMarshaller.java
@@ -31,7 +31,7 @@ import org.w3c.dom.Element;
 public class AudienceMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         Audience audience = (Audience) samlObject;
 
         ElementSupport.appendTextContent(domElement, audience.getUri());
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceRestrictionConditionBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceRestrictionConditionBuilder.java
index 4faf152..0708062 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceRestrictionConditionBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceRestrictionConditionBuilder.java
@@ -40,7 +40,7 @@ public class AudienceRestrictionConditionBuilder extends AbstractSAMLObjectBuild
     }
 
     /** {@inheritDoc} */
-    public AudienceRestrictionCondition buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AudienceRestrictionCondition buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AudienceRestrictionConditionImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceRestrictionConditionImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceRestrictionConditionImpl.java
index 56f2fa8..d8a78f1 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceRestrictionConditionImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceRestrictionConditionImpl.java
@@ -42,7 +42,7 @@ public class AudienceRestrictionConditionImpl extends AbstractSAMLObject impleme
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AudienceRestrictionConditionImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AudienceRestrictionConditionImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         audiences = new XMLObjectChildrenList<>(this);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceRestrictionConditionUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceRestrictionConditionUnmarshaller.java
index dbec3dd..ece48bb 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceRestrictionConditionUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceRestrictionConditionUnmarshaller.java
@@ -29,7 +29,7 @@ import org.opensaml.saml.saml1.core.AudienceRestrictionCondition;
 public class AudienceRestrictionConditionUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
 
         AudienceRestrictionCondition audienceRestrictionCondition = (AudienceRestrictionCondition) parentSAMLObject;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceUnmarshaller.java
index 4cb47ac..88566f0 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AudienceUnmarshaller.java
@@ -27,7 +27,7 @@ import org.opensaml.saml.saml1.core.Audience;
 public class AudienceUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         Audience audience = (Audience) samlObject;
         audience.setUri(elementContent);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationQueryBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationQueryBuilder.java
index b9c8b4c..8327e04 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationQueryBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationQueryBuilder.java
@@ -40,7 +40,7 @@ public class AuthenticationQueryBuilder extends AbstractSAMLObjectBuilder<Authen
     }
 
     /** {@inheritDoc} */
-    public AuthenticationQuery buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AuthenticationQuery buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AuthenticationQueryImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationQueryImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationQueryImpl.java
index 1b89fe0..d5a55ae 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationQueryImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationQueryImpl.java
@@ -39,7 +39,7 @@ public class AuthenticationQueryImpl extends SubjectQueryImpl implements Authent
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AuthenticationQueryImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AuthenticationQueryImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -49,7 +49,7 @@ public class AuthenticationQueryImpl extends SubjectQueryImpl implements Authent
     }
 
     /** {@inheritDoc} */
-    public void setAuthenticationMethod(String method) {
+    public void setAuthenticationMethod(final String method) {
         authenticationMethod = prepareForAssignment(authenticationMethod, method);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationQueryMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationQueryMarshaller.java
index 1501fcf..e971f3f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationQueryMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationQueryMarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Element;
 public class AuthenticationQueryMarshaller extends SubjectQueryMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         AuthenticationQuery authenticationQuery = (AuthenticationQuery) samlObject;
 
         if (authenticationQuery.getAuthenticationMethod() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationQueryUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationQueryUnmarshaller.java
index 53fbdad..3790884 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationQueryUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationQueryUnmarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Attr;
 public class AuthenticationQueryUnmarshaller extends SubjectQueryUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final AuthenticationQuery authenticationQuery = (AuthenticationQuery) samlObject;
 
         if (AuthenticationQuery.AUTHENTICATIONMETHOD_ATTRIB_NAME.equals(attribute.getLocalName())
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementBuilder.java
index 76d10ec..3edbc79 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementBuilder.java
@@ -40,7 +40,7 @@ public class AuthenticationStatementBuilder extends AbstractSAMLObjectBuilder<Au
     }
 
     /** {@inheritDoc} */
-    public AuthenticationStatement buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AuthenticationStatement buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AuthenticationStatementImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementImpl.java
index 90bcb58..0584702 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementImpl.java
@@ -52,7 +52,7 @@ public class AuthenticationStatementImpl extends SubjectStatementImpl implements
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AuthenticationStatementImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AuthenticationStatementImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         authorityBindings = new XMLObjectChildrenList<>(this);
     }
@@ -63,7 +63,7 @@ public class AuthenticationStatementImpl extends SubjectStatementImpl implements
     }
 
     /** {@inheritDoc} */
-    public void setAuthenticationMethod(String method) {
+    public void setAuthenticationMethod(final String method) {
         authenticationMethod = prepareForAssignment(authenticationMethod, method);
     }
 
@@ -73,7 +73,7 @@ public class AuthenticationStatementImpl extends SubjectStatementImpl implements
     }
 
     /** {@inheritDoc} */
-    public void setAuthenticationInstant(DateTime instant) {
+    public void setAuthenticationInstant(final DateTime instant) {
         authenticationInstant = prepareForAssignment(authenticationInstant, instant);
     }
 
@@ -87,7 +87,7 @@ public class AuthenticationStatementImpl extends SubjectStatementImpl implements
     }
 
     /** {@inheritDoc} */
-    public void setSubjectLocality(SubjectLocality locality) {
+    public void setSubjectLocality(final SubjectLocality locality) {
         subjectLocality = prepareForAssignment(subjectLocality, locality);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementMarshaller.java
index f9ab1d4..e1ba30a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementMarshaller.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Element;
 public class AuthenticationStatementMarshaller extends SubjectStatementMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlElement, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
         AuthenticationStatement authenticationStatement = (AuthenticationStatement) samlElement;
 
         if (authenticationStatement.getAuthenticationMethod() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementUnmarshaller.java
index ed38997..da47bee9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthenticationStatementUnmarshaller.java
@@ -34,7 +34,7 @@ import com.google.common.base.Strings;
 public class AuthenticationStatementUnmarshaller extends SubjectStatementUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
 
         final AuthenticationStatement authenticationStatement = (AuthenticationStatement) parentSAMLObject;
@@ -49,7 +49,7 @@ public class AuthenticationStatementUnmarshaller extends SubjectStatementUnmarsh
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final AuthenticationStatement authenticationStatement = (AuthenticationStatement) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingBuilder.java
index 3532c92..004925a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingBuilder.java
@@ -40,7 +40,7 @@ public class AuthorityBindingBuilder extends AbstractSAMLObjectBuilder<Authority
     }
 
     /** {@inheritDoc} */
-    public AuthorityBinding buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AuthorityBinding buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AuthorityBindingImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingImpl.java
index 01b65f6..09bcf83 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingImpl.java
@@ -46,7 +46,7 @@ public class AuthorityBindingImpl extends AbstractSAMLObject implements Authorit
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AuthorityBindingImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AuthorityBindingImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
    }
     
@@ -56,7 +56,7 @@ public class AuthorityBindingImpl extends AbstractSAMLObject implements Authorit
     }
 
     /** {@inheritDoc} */
-    public void setAuthorityKind(QName kind) {
+    public void setAuthorityKind(final QName kind) {
         authorityKind = prepareAttributeValueForAssignment(AuthorityBinding.AUTHORITYKIND_ATTRIB_NAME, 
                 authorityKind, kind);
     }
@@ -67,7 +67,7 @@ public class AuthorityBindingImpl extends AbstractSAMLObject implements Authorit
     }
 
     /** {@inheritDoc} */
-    public void setLocation(String loc) {
+    public void setLocation(final String loc) {
         location = prepareForAssignment(location, loc);
     }
 
@@ -77,7 +77,7 @@ public class AuthorityBindingImpl extends AbstractSAMLObject implements Authorit
     }
 
     /** {@inheritDoc} */
-    public void setBinding(String newBinding) {
+    public void setBinding(final String newBinding) {
         binding = prepareForAssignment(binding, newBinding);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingMarshaller.java
index 14bb591..2501d32 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingMarshaller.java
@@ -33,7 +33,7 @@ import org.w3c.dom.Element;
 public class AuthorityBindingMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    public void marshallAttributes(XMLObject samlElement, Element domElement) throws MarshallingException {
+    public void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
         AuthorityBinding authorityBinding = (AuthorityBinding) samlElement;
 
         if (authorityBinding.getAuthorityKind() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingUnmarshaller.java
index fc57ed1..d35c2db 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorityBindingUnmarshaller.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Attr;
 public class AuthorityBindingUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
 
         final AuthorityBinding authorityBinding = (AuthorityBinding) samlObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionQueryBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionQueryBuilder.java
index d45752f..8998f34 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionQueryBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionQueryBuilder.java
@@ -40,7 +40,7 @@ public class AuthorizationDecisionQueryBuilder extends AbstractSAMLObjectBuilder
     }
 
     /** {@inheritDoc} */
-    public AuthorizationDecisionQuery buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AuthorizationDecisionQuery buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AuthorizationDecisionQueryImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionQueryImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionQueryImpl.java
index 715e6a8..3fc762f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionQueryImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionQueryImpl.java
@@ -49,7 +49,7 @@ public class AuthorizationDecisionQueryImpl extends SubjectQueryImpl implements
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AuthorizationDecisionQueryImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AuthorizationDecisionQueryImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         setElementNamespacePrefix(SAMLConstants.SAML1P_PREFIX);
         actions = new XMLObjectChildrenList<>(this);
@@ -61,7 +61,7 @@ public class AuthorizationDecisionQueryImpl extends SubjectQueryImpl implements
     }
 
     /** {@inheritDoc} */
-    public void setResource(String res) {
+    public void setResource(final String res) {
         resource = prepareForAssignment(resource, res);
     }
 
@@ -76,7 +76,7 @@ public class AuthorizationDecisionQueryImpl extends SubjectQueryImpl implements
     }
 
     /** {@inheritDoc} */
-    public void setEvidence(Evidence ev) {
+    public void setEvidence(final Evidence ev) {
         evidence = prepareForAssignment(evidence, ev);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionQueryMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionQueryMarshaller.java
index 6a70f9e..0ba7068 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionQueryMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionQueryMarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Element;
 public class AuthorizationDecisionQueryMarshaller extends SubjectQueryMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlElement, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
         AuthorizationDecisionQuery authorizationDecisionQuery = (AuthorizationDecisionQuery) samlElement;
 
         if (authorizationDecisionQuery.getResource() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionQueryUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionQueryUnmarshaller.java
index f7c505e..f93126e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionQueryUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionQueryUnmarshaller.java
@@ -30,7 +30,7 @@ import org.w3c.dom.Attr;
 public class AuthorizationDecisionQueryUnmarshaller extends SubjectQueryUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
 
         final AuthorizationDecisionQuery authorizationDecisionQuery = (AuthorizationDecisionQuery) parentSAMLObject;
@@ -45,7 +45,7 @@ public class AuthorizationDecisionQueryUnmarshaller extends SubjectQueryUnmarsha
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
 
         final AuthorizationDecisionQuery authorizationDecisionQuery = (AuthorizationDecisionQuery) samlObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionStatementBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionStatementBuilder.java
index 62963c1..935b113 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionStatementBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionStatementBuilder.java
@@ -40,7 +40,7 @@ public class AuthorizationDecisionStatementBuilder extends AbstractSAMLObjectBui
     }
 
     /** {@inheritDoc} */
-    public AuthorizationDecisionStatement buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AuthorizationDecisionStatement buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AuthorizationDecisionStatementImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionStatementImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionStatementImpl.java
index 12ba3b4..903398f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionStatementImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionStatementImpl.java
@@ -52,7 +52,7 @@ public class AuthorizationDecisionStatementImpl extends SubjectStatementImpl imp
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AuthorizationDecisionStatementImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AuthorizationDecisionStatementImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         actions = new XMLObjectChildrenList<>(this);
     }
@@ -63,7 +63,7 @@ public class AuthorizationDecisionStatementImpl extends SubjectStatementImpl imp
     }
 
     /** {@inheritDoc} */
-    public void setResource(String res) {
+    public void setResource(final String res) {
         resource = prepareForAssignment(resource, res);
     }
 
@@ -73,7 +73,7 @@ public class AuthorizationDecisionStatementImpl extends SubjectStatementImpl imp
     }
 
     /** {@inheritDoc} */
-    public void setDecision(DecisionTypeEnumeration dec) {
+    public void setDecision(final DecisionTypeEnumeration dec) {
         decision = prepareForAssignment(decision, dec);
     }
 
@@ -88,7 +88,7 @@ public class AuthorizationDecisionStatementImpl extends SubjectStatementImpl imp
     }
 
     /** {@inheritDoc} */
-    public void setEvidence(Evidence ev) {
+    public void setEvidence(final Evidence ev) {
         evidence = prepareForAssignment(evidence, ev);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionStatementMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionStatementMarshaller.java
index 2e00097..b22c7e2 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionStatementMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionStatementMarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Element;
 public class AuthorizationDecisionStatementMarshaller extends SubjectStatementMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlElement, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
         AuthorizationDecisionStatement authorizationDecisionStatement;
 
         authorizationDecisionStatement = (AuthorizationDecisionStatement) samlElement;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionStatementUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionStatementUnmarshaller.java
index dcd987d..7f17023 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionStatementUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/AuthorizationDecisionStatementUnmarshaller.java
@@ -36,7 +36,7 @@ public class AuthorizationDecisionStatementUnmarshaller extends SubjectStatement
     private final Logger log = LoggerFactory.getLogger(AuthorizationDecisionStatementUnmarshaller.class);
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
 
         final AuthorizationDecisionStatement authorizationDecisionStatement =
@@ -52,7 +52,7 @@ public class AuthorizationDecisionStatementUnmarshaller extends SubjectStatement
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
 
         final AuthorizationDecisionStatement authorizationDecisionStatement =
                 (AuthorizationDecisionStatement) samlObject;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsBuilder.java
index 4cb0bc2..f51667c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsBuilder.java
@@ -39,7 +39,7 @@ public class ConditionsBuilder extends AbstractSAMLObjectBuilder<Conditions> {
     }
 
     /** {@inheritDoc} */
-    public Conditions buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Conditions buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ConditionsImpl(namespaceURI, localName, namespacePrefix);
     }
 }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsImpl.java
index e5dde82..c866f5f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsImpl.java
@@ -54,7 +54,7 @@ public class ConditionsImpl extends AbstractSAMLObject implements Conditions {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ConditionsImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ConditionsImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         conditions = new IndexedXMLObjectChildrenList<>(this);
     }
@@ -65,7 +65,7 @@ public class ConditionsImpl extends AbstractSAMLObject implements Conditions {
     }
 
     /** {@inheritDoc} */
-    public void setNotBefore(DateTime dt) {
+    public void setNotBefore(final DateTime dt) {
         notBefore = prepareForAssignment(notBefore, dt);
     }
 
@@ -75,7 +75,7 @@ public class ConditionsImpl extends AbstractSAMLObject implements Conditions {
     }
 
     /** {@inheritDoc} */
-    public void setNotOnOrAfter(DateTime dt) {
+    public void setNotOnOrAfter(final DateTime dt) {
         notOnOrAfter = prepareForAssignment(notOnOrAfter, dt);
     }
 
@@ -85,7 +85,7 @@ public class ConditionsImpl extends AbstractSAMLObject implements Conditions {
     }
 
     /** {@inheritDoc} */
-    public List<Condition> getConditions(QName typeOrName) {
+    public List<Condition> getConditions(final QName typeOrName) {
         return conditions;
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsMarshaller.java
index f976e00..8137157 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsMarshaller.java
@@ -30,7 +30,7 @@ import org.w3c.dom.Element;
 public class ConditionsMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlElement, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
 
         Conditions conditions = (Conditions) samlElement;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsUnmarshaller.java
index 9b10e94..79ebe30 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConditionsUnmarshaller.java
@@ -34,7 +34,7 @@ import com.google.common.base.Strings;
 public class ConditionsUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         final Conditions conditions = (Conditions) parentSAMLObject;
 
@@ -46,7 +46,7 @@ public class ConditionsUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
 
         final Conditions conditions = (Conditions) samlObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodBuilder.java
index 428a165..d167105 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodBuilder.java
@@ -40,7 +40,7 @@ public class ConfirmationMethodBuilder extends AbstractSAMLObjectBuilder<Confirm
     }
 
     /** {@inheritDoc} */
-    public ConfirmationMethod buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ConfirmationMethod buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ConfirmationMethodImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodImpl.java
index 616f7dd..5175df7 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodImpl.java
@@ -38,7 +38,7 @@ public class ConfirmationMethodImpl extends AbstractSAMLObject implements Confir
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ConfirmationMethodImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ConfirmationMethodImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -48,7 +48,7 @@ public class ConfirmationMethodImpl extends AbstractSAMLObject implements Confir
     }
 
     /** {@inheritDoc} */
-    public void setConfirmationMethod(String method) {
+    public void setConfirmationMethod(final String method) {
         confirmationMethod = prepareForAssignment(confirmationMethod, method);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodMarshaller.java
index b2fccc8..bba8f5e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodMarshaller.java
@@ -31,7 +31,7 @@ import org.w3c.dom.Element;
 public class ConfirmationMethodMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         ConfirmationMethod confirmationMethod = (ConfirmationMethod) samlObject;
 
         ElementSupport.appendTextContent(domElement, confirmationMethod.getConfirmationMethod());
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodUnmarshaller.java
index 7c6b2e3..4a5ad8d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ConfirmationMethodUnmarshaller.java
@@ -27,7 +27,7 @@ import org.opensaml.saml.saml1.core.ConfirmationMethod;
 public class ConfirmationMethodUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         ConfirmationMethod confirmationMethod = (ConfirmationMethod) samlObject;
 
         confirmationMethod.setConfirmationMethod(elementContent);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/DoNotCacheConditionBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/DoNotCacheConditionBuilder.java
index a2e337f..8bb717d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/DoNotCacheConditionBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/DoNotCacheConditionBuilder.java
@@ -40,7 +40,7 @@ public class DoNotCacheConditionBuilder extends AbstractSAMLObjectBuilder<DoNotC
     }
 
     /** {@inheritDoc} */
-    public DoNotCacheCondition buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public DoNotCacheCondition buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new DoNotCacheConditionImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/DoNotCacheConditionImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/DoNotCacheConditionImpl.java
index bc1c8da..8a7dc2b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/DoNotCacheConditionImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/DoNotCacheConditionImpl.java
@@ -35,7 +35,7 @@ public class DoNotCacheConditionImpl extends AbstractSAMLObject implements DoNot
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected DoNotCacheConditionImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected DoNotCacheConditionImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/EvidenceBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/EvidenceBuilder.java
index 2925029..b6f3ab6 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/EvidenceBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/EvidenceBuilder.java
@@ -39,7 +39,7 @@ public class EvidenceBuilder extends AbstractSAMLObjectBuilder<Evidence> {
     }
 
     /** {@inheritDoc} */
-    public Evidence buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Evidence buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new EvidenceImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/EvidenceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/EvidenceImpl.java
index 6259241..52a143c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/EvidenceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/EvidenceImpl.java
@@ -47,7 +47,7 @@ public class EvidenceImpl extends AbstractSAMLObject implements Evidence {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected EvidenceImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected EvidenceImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         evidence = new IndexedXMLObjectChildrenList<>(this);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/EvidenceUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/EvidenceUnmarshaller.java
index cc45c3c..45fb645 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/EvidenceUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/EvidenceUnmarshaller.java
@@ -30,7 +30,7 @@ import org.opensaml.saml.saml1.core.Evidence;
 public class EvidenceUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
 
         Evidence evidence = (Evidence) parentSAMLObject;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/NameIdentifierBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/NameIdentifierBuilder.java
index 2fa6a46..1c98102 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/NameIdentifierBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/NameIdentifierBuilder.java
@@ -40,7 +40,7 @@ public class NameIdentifierBuilder extends AbstractSAMLObjectBuilder<NameIdentif
     }
 
     /** {@inheritDoc} */
-    public NameIdentifier buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public NameIdentifier buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new NameIdentifierImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/NameIdentifierImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/NameIdentifierImpl.java
index ebe295f..6859f08 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/NameIdentifierImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/NameIdentifierImpl.java
@@ -44,7 +44,7 @@ public class NameIdentifierImpl extends AbstractSAMLObject implements NameIdenti
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected NameIdentifierImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected NameIdentifierImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -70,23 +70,23 @@ public class NameIdentifierImpl extends AbstractSAMLObject implements NameIdenti
     }
     
     /** {@inheritDoc} */
-    public void setNameQualifier(String qualifier) {
+    public void setNameQualifier(final String qualifier) {
         nameQualifier = prepareForAssignment(nameQualifier, qualifier);
     }
 
     /** {@inheritDoc} */
-    public void setFormat(String fmt) {
+    public void setFormat(final String fmt) {
         format = prepareForAssignment(format, fmt);
     }
 
     /** {@inheritDoc} */
     @Deprecated
-    public void setNameIdentifier(String id) {
+    public void setNameIdentifier(final String id) {
         setValue(id);
     }
 
     /** {@inheritDoc} */
-    public void setValue(String id) {
+    public void setValue(final String id) {
         nameIdentifier = prepareForAssignment(nameIdentifier, id);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/NameIdentifierMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/NameIdentifierMarshaller.java
index 6912885..90efc1a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/NameIdentifierMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/NameIdentifierMarshaller.java
@@ -31,7 +31,7 @@ import org.w3c.dom.Element;
 public class NameIdentifierMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlElement, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
         NameIdentifier nameIdentifier = (NameIdentifier) samlElement;
 
         if (nameIdentifier.getNameQualifier() != null) {
@@ -45,7 +45,7 @@ public class NameIdentifierMarshaller extends AbstractSAMLObjectMarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         NameIdentifier nameIdentifier = (NameIdentifier) samlObject;
 
         if (nameIdentifier.getValue() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/NameIdentifierUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/NameIdentifierUnmarshaller.java
index cb7cdb1..02d721a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/NameIdentifierUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/NameIdentifierUnmarshaller.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Attr;
 public class NameIdentifierUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final NameIdentifier nameIdentifier = (NameIdentifier) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
@@ -46,7 +46,7 @@ public class NameIdentifierUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         final NameIdentifier nameIdentifier = (NameIdentifier) samlObject;
         nameIdentifier.setValue(elementContent);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestAbstractTypeImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestAbstractTypeImpl.java
index 5557684..50531bd 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestAbstractTypeImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestAbstractTypeImpl.java
@@ -53,7 +53,7 @@ public abstract class RequestAbstractTypeImpl extends AbstractSignableSAMLObject
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected RequestAbstractTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected RequestAbstractTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         version = SAMLVersion.VERSION_11;
         respondWiths = new XMLObjectChildrenList<>(this);
@@ -65,7 +65,7 @@ public abstract class RequestAbstractTypeImpl extends AbstractSignableSAMLObject
     }
 
     /** {@inheritDoc} */
-    public void setID(String newID) {
+    public void setID(final String newID) {
         String oldID = id;
         id = prepareForAssignment(id, newID);
         registerOwnID(oldID, id);
@@ -77,7 +77,7 @@ public abstract class RequestAbstractTypeImpl extends AbstractSignableSAMLObject
     }
 
     /** {@inheritDoc} */
-    public void setVersion(SAMLVersion newVersion) {
+    public void setVersion(final SAMLVersion newVersion) {
         version = prepareForAssignment(version, newVersion);
     }
 
@@ -87,7 +87,7 @@ public abstract class RequestAbstractTypeImpl extends AbstractSignableSAMLObject
     }
 
     /** {@inheritDoc} */
-    public void setIssueInstant(DateTime instant) {
+    public void setIssueInstant(final DateTime instant) {
         this.issueInstant = prepareForAssignment(this.issueInstant, instant);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestAbstractTypeMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestAbstractTypeMarshaller.java
index 04cc5d7..94adbc1 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestAbstractTypeMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestAbstractTypeMarshaller.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
 public class RequestAbstractTypeMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlElement, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
         RequestAbstractType request = (RequestAbstractType) samlElement;
 
         if (request.getID() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestAbstractTypeUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestAbstractTypeUnmarshaller.java
index f2e8992..ad4cfc0 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestAbstractTypeUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestAbstractTypeUnmarshaller.java
@@ -48,7 +48,7 @@ public abstract class RequestAbstractTypeUnmarshaller extends AbstractSAMLObject
     @Nonnull private final Logger log = LoggerFactory.getLogger(RequestAbstractType.class);
 
     /** {@inheritDoc} */
-    public XMLObject unmarshall(Element domElement) throws UnmarshallingException {
+    public XMLObject unmarshall(final Element domElement) throws UnmarshallingException {
         // After regular unmarshalling, check the minor version and set ID-ness if not SAML 1.0
         final RequestAbstractType request = (RequestAbstractType) super.unmarshall(domElement);
         if (request.getVersion() != SAMLVersion.VERSION_10 && !Strings.isNullOrEmpty(request.getID())) {
@@ -58,7 +58,7 @@ public abstract class RequestAbstractTypeUnmarshaller extends AbstractSAMLObject
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         final RequestAbstractType request = (RequestAbstractType) parentSAMLObject;
 
@@ -73,7 +73,7 @@ public abstract class RequestAbstractTypeUnmarshaller extends AbstractSAMLObject
 
 // Checkstyle: CyclomaticComplexity OFF
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlElement, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlElement, final Attr attribute) throws UnmarshallingException {
         final RequestAbstractType request = (RequestAbstractType) samlElement;
 
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestBuilder.java
index da58ffc..ea27169 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestBuilder.java
@@ -37,7 +37,7 @@ public class RequestBuilder extends AbstractSAMLObjectBuilder<Request> {
     }
 
     /** {@inheritDoc} */
-    public Request buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Request buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new RequestImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestImpl.java
index 4f3a607..97ba505 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestImpl.java
@@ -53,7 +53,7 @@ public class RequestImpl extends RequestAbstractTypeImpl implements Request {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected RequestImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected RequestImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         assertionIDReferences = new XMLObjectChildrenList<>(this);
         assertionArtifacts = new XMLObjectChildrenList<>(this);
@@ -85,7 +85,7 @@ public class RequestImpl extends RequestAbstractTypeImpl implements Request {
     }
 
     /** {@inheritDoc} */
-    public void setQuery(Query q) {
+    public void setQuery(final Query q) {
         query = prepareForAssignment(query, q);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestUnmarshaller.java
index 4e24331..157fd3d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RequestUnmarshaller.java
@@ -30,7 +30,7 @@ import org.opensaml.saml.saml1.core.Request;
 public class RequestUnmarshaller extends RequestAbstractTypeUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentElement, XMLObject childElement) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentElement, final XMLObject childElement) throws UnmarshallingException {
         Request request = (Request) parentElement;
 
         try {
@@ -43,7 +43,7 @@ public class RequestUnmarshaller extends RequestAbstractTypeUnmarshaller {
             } else {
                 super.processChildElement(parentElement, childElement);
             }
-        } catch (IllegalArgumentException e) {
+        } catch (final IllegalArgumentException e) {
             throw new UnmarshallingException(e);
         }
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RespondWithBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RespondWithBuilder.java
index 27fa71c..d077bda 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RespondWithBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RespondWithBuilder.java
@@ -33,7 +33,7 @@ public class RespondWithBuilder extends AbstractSAMLObjectBuilder<RespondWith> {
     }
 
     /** {@inheritDoc} */
-    public RespondWith buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public RespondWith buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new RespondWithImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RespondWithImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RespondWithImpl.java
index a1ae3ce..23f07f8 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RespondWithImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/RespondWithImpl.java
@@ -40,7 +40,7 @@ public class RespondWithImpl extends AbstractSAMLObject implements RespondWith {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected RespondWithImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected RespondWithImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -50,7 +50,7 @@ public class RespondWithImpl extends AbstractSAMLObject implements RespondWith {
     }
 
     /** {@inheritDoc} */
-    public void setValue(QName newValue) {
+    public void setValue(final QName newValue) {
         value = prepareElementContentForAssignment(value, newValue);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseAbstractTypeImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseAbstractTypeImpl.java
index ae9bbf5..2b52b51 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseAbstractTypeImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseAbstractTypeImpl.java
@@ -54,7 +54,7 @@ public abstract class ResponseAbstractTypeImpl extends AbstractSignableSAMLObjec
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ResponseAbstractTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ResponseAbstractTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         version = SAMLVersion.VERSION_11;
     }
@@ -65,7 +65,7 @@ public abstract class ResponseAbstractTypeImpl extends AbstractSignableSAMLObjec
     }
 
     /** {@inheritDoc} */
-    public void setID(String newID) {
+    public void setID(final String newID) {
         String oldID = id;
         id = prepareForAssignment(id, newID);
         registerOwnID(oldID, id);
@@ -77,7 +77,7 @@ public abstract class ResponseAbstractTypeImpl extends AbstractSignableSAMLObjec
     }
 
     /** {@inheritDoc} */
-    public void setInResponseTo(String to) {
+    public void setInResponseTo(final String to) {
         inResponseTo = prepareForAssignment(inResponseTo, to);
     }
 
@@ -87,7 +87,7 @@ public abstract class ResponseAbstractTypeImpl extends AbstractSignableSAMLObjec
     }
     
     /** {@inheritDoc} */
-    public void setVersion(SAMLVersion newVersion) {
+    public void setVersion(final SAMLVersion newVersion) {
         version = prepareForAssignment(version, newVersion);
     }
 
@@ -98,7 +98,7 @@ public abstract class ResponseAbstractTypeImpl extends AbstractSignableSAMLObjec
     }
 
     /** {@inheritDoc} */
-    public void setIssueInstant(DateTime date) {
+    public void setIssueInstant(final DateTime date) {
         this.issueInstant = prepareForAssignment(this.issueInstant, date);
     }
 
@@ -108,7 +108,7 @@ public abstract class ResponseAbstractTypeImpl extends AbstractSignableSAMLObjec
     }
 
     /** {@inheritDoc} */
-    public void setRecipient(String recip) {
+    public void setRecipient(final String recip) {
         recipient = prepareForAssignment(recipient, recip);
     }
     
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseAbstractTypeMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseAbstractTypeMarshaller.java
index 623f571..acef217 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseAbstractTypeMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseAbstractTypeMarshaller.java
@@ -36,7 +36,7 @@ import org.w3c.dom.Element;
 public abstract class ResponseAbstractTypeMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlElement, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
         ResponseAbstractType response = (ResponseAbstractType) samlElement;
 
         if (response.getID() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseAbstractTypeUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseAbstractTypeUnmarshaller.java
index 1eed6a3..2f92cf8 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseAbstractTypeUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseAbstractTypeUnmarshaller.java
@@ -48,7 +48,7 @@ public abstract class ResponseAbstractTypeUnmarshaller extends AbstractSAMLObjec
     @Nonnull private final Logger log = LoggerFactory.getLogger(ResponseUnmarshaller.class);
 
     /** {@inheritDoc} */
-    public XMLObject unmarshall(Element domElement) throws UnmarshallingException {
+    public XMLObject unmarshall(final Element domElement) throws UnmarshallingException {
         // After regular unmarshalling, check the minor version and set ID-ness if not SAML 1.0
         final ResponseAbstractType response = (ResponseAbstractType) super.unmarshall(domElement);
         if (response.getVersion() != SAMLVersion.VERSION_10 && !Strings.isNullOrEmpty(response.getID())) {
@@ -58,7 +58,7 @@ public abstract class ResponseAbstractTypeUnmarshaller extends AbstractSAMLObjec
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         final ResponseAbstractType response = (ResponseAbstractType) parentSAMLObject;
 
@@ -71,7 +71,7 @@ public abstract class ResponseAbstractTypeUnmarshaller extends AbstractSAMLObjec
 
 // Checkstyle: CyclomaticComplexity OFF
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final ResponseAbstractType response = (ResponseAbstractType) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseBuilder.java
index 6825480..f067049 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseBuilder.java
@@ -32,7 +32,7 @@ public class ResponseBuilder extends AbstractSAMLObjectBuilder<Response> {
     }
 
     /** {@inheritDoc} */
-    public Response buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Response buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ResponseImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseImpl.java
index 19b8254..d30c0ed 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseImpl.java
@@ -45,7 +45,7 @@ public class ResponseImpl extends ResponseAbstractTypeImpl implements Response {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ResponseImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ResponseImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         assertions = new XMLObjectChildrenList<>(this);
     }
@@ -61,7 +61,7 @@ public class ResponseImpl extends ResponseAbstractTypeImpl implements Response {
     }
 
     /** {@inheritDoc} */
-    public void setStatus(Status s) {
+    public void setStatus(final Status s) {
         status = prepareForAssignment(status, s);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseUnmarshaller.java
index eddef86..4a0b796 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/ResponseUnmarshaller.java
@@ -30,7 +30,7 @@ import org.opensaml.saml.saml1.core.Status;
 public class ResponseUnmarshaller extends ResponseAbstractTypeUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
 
         Response response = (Response) parentSAMLObject;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusBuilder.java
index e4c536c..3be0bd0 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusBuilder.java
@@ -39,7 +39,7 @@ public class StatusBuilder extends AbstractSAMLObjectBuilder<Status> {
     }
 
     /** {@inheritDoc} */
-    public Status buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Status buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new StatusImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusCodeBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusCodeBuilder.java
index 9866f8b..87c2c6d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusCodeBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusCodeBuilder.java
@@ -40,7 +40,7 @@ public class StatusCodeBuilder extends AbstractSAMLObjectBuilder<StatusCode> {
     }
 
     /** {@inheritDoc} */
-    public StatusCode buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public StatusCode buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new StatusCodeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusCodeImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusCodeImpl.java
index 59e08ce..c9ceed0 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusCodeImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusCodeImpl.java
@@ -45,7 +45,7 @@ public class StatusCodeImpl extends AbstractSAMLObject implements StatusCode {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected StatusCodeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected StatusCodeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -55,7 +55,7 @@ public class StatusCodeImpl extends AbstractSAMLObject implements StatusCode {
     }
 
     /** {@inheritDoc} */
-    public void setValue(QName newValue) {
+    public void setValue(final QName newValue) {
         this.value = prepareAttributeValueForAssignment(StatusCode.VALUE_ATTRIB_NAME, this.value, newValue);
     }
 
@@ -65,7 +65,7 @@ public class StatusCodeImpl extends AbstractSAMLObject implements StatusCode {
     }
 
     /** {@inheritDoc} */
-    public void setStatusCode(StatusCode statusCode) {
+    public void setStatusCode(final StatusCode statusCode) {
         childStatusCode = prepareForAssignment(childStatusCode, statusCode);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusCodeMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusCodeMarshaller.java
index ed962eb..b3df1ed 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusCodeMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusCodeMarshaller.java
@@ -33,7 +33,7 @@ import org.w3c.dom.Element;
 public class StatusCodeMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlElement, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
         StatusCode statusCode = (StatusCode) samlElement;
 
         QName statusValue = statusCode.getValue();
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusCodeUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusCodeUnmarshaller.java
index 0a8bfb9..32acb6f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusCodeUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusCodeUnmarshaller.java
@@ -31,7 +31,7 @@ import org.w3c.dom.Attr;
 public class StatusCodeUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
 
         final StatusCode statusCode = (StatusCode) parentSAMLObject;
@@ -45,7 +45,7 @@ public class StatusCodeUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
 
         final StatusCode statusCode = (StatusCode) samlObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusDetailBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusDetailBuilder.java
index 06dbdaf..7c28dab 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusDetailBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusDetailBuilder.java
@@ -44,7 +44,7 @@ public class StatusDetailBuilder extends AbstractSAMLObjectBuilder<StatusDetail>
     /**
      * {@inheritDoc}
      */
-    public StatusDetail buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public StatusDetail buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new StatusDetailImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusDetailImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusDetailImpl.java
index 580c681..5e95cf7 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusDetailImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusDetailImpl.java
@@ -42,7 +42,7 @@ public class StatusDetailImpl extends AbstractSAMLObject implements StatusDetail
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected StatusDetailImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected StatusDetailImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         unknownChildren = new IndexedXMLObjectChildrenList<>(this);
     }
@@ -55,7 +55,7 @@ public class StatusDetailImpl extends AbstractSAMLObject implements StatusDetail
     }
     
     /** {@inheritDoc} */
-    public List<XMLObject> getUnknownXMLObjects(QName typeOrName) {
+    public List<XMLObject> getUnknownXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) unknownChildren.subList(typeOrName);
     }
     /**
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusDetailUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusDetailUnmarshaller.java
index 3626097..adaf39f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusDetailUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusDetailUnmarshaller.java
@@ -30,7 +30,7 @@ public class StatusDetailUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     /**
      * {@inheritDoc}
      */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         StatusDetail statusDetail = (StatusDetail) parentSAMLObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusImpl.java
index d31d23f..cd01652 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusImpl.java
@@ -49,7 +49,7 @@ public class StatusImpl extends AbstractSAMLObject implements Status {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected StatusImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected StatusImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -59,7 +59,7 @@ public class StatusImpl extends AbstractSAMLObject implements Status {
     }
 
     /** {@inheritDoc} */
-    public void setStatusMessage(StatusMessage message) {
+    public void setStatusMessage(final StatusMessage message) {
         statusMessage = prepareForAssignment(statusMessage, message);
     }
 
@@ -69,7 +69,7 @@ public class StatusImpl extends AbstractSAMLObject implements Status {
     }
 
     /** {@inheritDoc} */
-    public void setStatusCode(StatusCode code) {
+    public void setStatusCode(final StatusCode code) {
         statusCode = prepareForAssignment(statusCode, code);
     }
 
@@ -79,7 +79,7 @@ public class StatusImpl extends AbstractSAMLObject implements Status {
     }
 
     /** {@inheritDoc} */
-    public void setStatusDetail(StatusDetail detail) {
+    public void setStatusDetail(final StatusDetail detail) {
         statusDetail = prepareForAssignment(statusDetail, detail);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusMessageBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusMessageBuilder.java
index ff627c1..81a3244 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusMessageBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusMessageBuilder.java
@@ -40,7 +40,7 @@ public class StatusMessageBuilder extends AbstractSAMLObjectBuilder<StatusMessag
     }
 
     /** {@inheritDoc} */
-    public StatusMessage buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public StatusMessage buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new StatusMessageImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusMessageImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusMessageImpl.java
index 0a7e028..a1127d4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusMessageImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusMessageImpl.java
@@ -40,7 +40,7 @@ public class StatusMessageImpl extends AbstractSAMLObject implements StatusMessa
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected StatusMessageImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected StatusMessageImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -50,7 +50,7 @@ public class StatusMessageImpl extends AbstractSAMLObject implements StatusMessa
     }
 
     /** {@inheritDoc} */
-    public void setMessage(String msg) {
+    public void setMessage(final String msg) {
         message = prepareForAssignment(message, msg);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusMessageMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusMessageMarshaller.java
index 2bd6ac6..54b755f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusMessageMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusMessageMarshaller.java
@@ -30,7 +30,7 @@ import org.w3c.dom.Element;
  */
 public class StatusMessageMarshaller extends AbstractSAMLObjectMarshaller {
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         StatusMessage statusMessage = (StatusMessage) samlObject;
 
         if (statusMessage.getMessage() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusMessageUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusMessageUnmarshaller.java
index 9ea618e..2683979 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusMessageUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusMessageUnmarshaller.java
@@ -27,7 +27,7 @@ import org.opensaml.saml.saml1.core.StatusMessage;
 public class StatusMessageUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         StatusMessage statusMessage = (StatusMessage) samlObject;
         statusMessage.setMessage(elementContent);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusUnmarshaller.java
index cf3e20a..a5e7763 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/StatusUnmarshaller.java
@@ -31,7 +31,7 @@ import org.opensaml.saml.saml1.core.StatusMessage;
 public class StatusUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
 
         Status status = (Status) parentSAMLObject;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectBuilder.java
index 54dcee3..c3b3e2b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectBuilder.java
@@ -39,7 +39,7 @@ public class SubjectBuilder extends AbstractSAMLObjectBuilder<Subject> {
     }
 
     /** {@inheritDoc} */
-    public Subject buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Subject buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new SubjectImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationBuilder.java
index d8b43f9..dbaea05 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationBuilder.java
@@ -40,7 +40,7 @@ public class SubjectConfirmationBuilder extends AbstractSAMLObjectBuilder<Subjec
     }
 
     /** {@inheritDoc} */
-    public SubjectConfirmation buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public SubjectConfirmation buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new SubjectConfirmationImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationImpl.java
index 58f0483..4610298 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationImpl.java
@@ -49,7 +49,7 @@ public class SubjectConfirmationImpl extends AbstractSAMLObject implements Subje
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SubjectConfirmationImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SubjectConfirmationImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         confirmationMethods = new XMLObjectChildrenList<>(this);
     }
@@ -60,7 +60,7 @@ public class SubjectConfirmationImpl extends AbstractSAMLObject implements Subje
     }
 
     /** {@inheritDoc} */
-    public void setSubjectConfirmationData(XMLObject data) {
+    public void setSubjectConfirmationData(final XMLObject data) {
         subjectConfirmationData = prepareForAssignment(subjectConfirmationData, data);
     }
 
@@ -75,7 +75,7 @@ public class SubjectConfirmationImpl extends AbstractSAMLObject implements Subje
     }
 
     /** {@inheritDoc} */
-    public void setKeyInfo(KeyInfo info) {
+    public void setKeyInfo(final KeyInfo info) {
         keyInfo = prepareForAssignment(keyInfo, info);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationUnmarshaller.java
index c2b9d4d..fd61cf6 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationUnmarshaller.java
@@ -30,7 +30,7 @@ import org.opensaml.xmlsec.signature.KeyInfo;
 public class SubjectConfirmationUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
 
         SubjectConfirmation subjectConfirmation = (SubjectConfirmation) parentSAMLObject;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectImpl.java
index 20dcb71..eb7c697 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectImpl.java
@@ -45,7 +45,7 @@ public class SubjectImpl extends AbstractSAMLObject implements Subject {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SubjectImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SubjectImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -55,7 +55,7 @@ public class SubjectImpl extends AbstractSAMLObject implements Subject {
     }
 
     /** {@inheritDoc} */
-    public void setNameIdentifier(NameIdentifier name) {
+    public void setNameIdentifier(final NameIdentifier name) {
         nameIdentifier = prepareForAssignment(nameIdentifier, name);
     }
 
@@ -65,7 +65,7 @@ public class SubjectImpl extends AbstractSAMLObject implements Subject {
     }
 
     /** {@inheritDoc} */
-    public void setSubjectConfirmation(SubjectConfirmation conf) {
+    public void setSubjectConfirmation(final SubjectConfirmation conf) {
         subjectConfirmation = prepareForAssignment(subjectConfirmation, conf);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityBuilder.java
index de1477c..e9302fa 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityBuilder.java
@@ -40,7 +40,7 @@ public class SubjectLocalityBuilder extends AbstractSAMLObjectBuilder<SubjectLoc
     }
 
     /** {@inheritDoc} */
-    public SubjectLocality buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public SubjectLocality buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new SubjectLocalityImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityImpl.java
index 5aa7f54..25be653 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityImpl.java
@@ -41,7 +41,7 @@ public class SubjectLocalityImpl extends AbstractSAMLObject implements SubjectLo
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SubjectLocalityImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SubjectLocalityImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -51,7 +51,7 @@ public class SubjectLocalityImpl extends AbstractSAMLObject implements SubjectLo
     }
 
     /** {@inheritDoc} */
-    public void setIPAddress(String address) {
+    public void setIPAddress(final String address) {
         ipAddress = prepareForAssignment(ipAddress, address);
     }
 
@@ -61,7 +61,7 @@ public class SubjectLocalityImpl extends AbstractSAMLObject implements SubjectLo
     }
 
     /** {@inheritDoc} */
-    public void setDNSAddress(String address) {
+    public void setDNSAddress(final String address) {
         dnsAddress = prepareForAssignment(dnsAddress, address);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityMarshaller.java
index dabccc2..9b14d77 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityMarshaller.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Element;
 public class SubjectLocalityMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    public void marshallAttributes(XMLObject samlElement, Element domElement) throws MarshallingException {
+    public void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
         SubjectLocality subjectLocality = (SubjectLocality) samlElement;
 
         if (subjectLocality.getIPAddress() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityUnmarshaller.java
index 5617567..5b52c10 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectLocalityUnmarshaller.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Attr;
 public class SubjectLocalityUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
 
         final SubjectLocality subjectLocality = (SubjectLocality) samlObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectQueryImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectQueryImpl.java
index 2b071a6..98b94a5 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectQueryImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectQueryImpl.java
@@ -41,7 +41,7 @@ public abstract class SubjectQueryImpl extends AbstractSAMLObject implements Sub
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SubjectQueryImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SubjectQueryImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -51,7 +51,7 @@ public abstract class SubjectQueryImpl extends AbstractSAMLObject implements Sub
     }
 
     /** {@inheritDoc} */
-    public void setSubject(Subject sub) {
+    public void setSubject(final Subject sub) {
         subject = prepareForAssignment(subject, sub);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectQueryUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectQueryUnmarshaller.java
index b132050..388c4c6 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectQueryUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectQueryUnmarshaller.java
@@ -33,7 +33,7 @@ import org.opensaml.saml.saml1.core.SubjectQuery;
 public abstract class SubjectQueryUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         SubjectQuery query = (SubjectQuery) parentSAMLObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectStatementImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectStatementImpl.java
index 4e8c054..42031d2 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectStatementImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectStatementImpl.java
@@ -41,7 +41,7 @@ public abstract class SubjectStatementImpl extends AbstractSAMLObject implements
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SubjectStatementImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SubjectStatementImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -51,7 +51,7 @@ public abstract class SubjectStatementImpl extends AbstractSAMLObject implements
     }
 
     /** {@inheritDoc} */
-    public void setSubject(Subject sub) {
+    public void setSubject(final Subject sub) {
         subject = prepareForAssignment(subject, sub);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectStatementUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectStatementUnmarshaller.java
index ae2effc..416e148 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectStatementUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectStatementUnmarshaller.java
@@ -33,7 +33,7 @@ import org.opensaml.saml.saml1.core.SubjectStatement;
 public abstract class SubjectStatementUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         SubjectStatement statement = (SubjectStatement) parentSAMLObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectUnmarshaller.java
index f8cfef9..cb1b743 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectUnmarshaller.java
@@ -30,7 +30,7 @@ import org.opensaml.saml.saml1.core.SubjectConfirmation;
 public class SubjectUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
 
         Subject subject = (Subject) parentSAMLObject;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddResponseShell.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddResponseShell.java
index 419e4db..1413321 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddResponseShell.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddResponseShell.java
@@ -75,7 +75,7 @@ public class AddResponseShell extends AbstractProfileAction {
     public AddResponseShell() {
         // Default strategy is a 16-byte secure random source.
         idGeneratorLookupStrategy = new Function<ProfileRequestContext,IdentifierGenerationStrategy>() {
-            public IdentifierGenerationStrategy apply(ProfileRequestContext input) {
+            public IdentifierGenerationStrategy apply(final ProfileRequestContext input) {
                 return new SecureRandomIdentifierGenerationStrategy();
             }
         };
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddStatusToResponse.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddStatusToResponse.java
index 997d7ad..3fe54f6 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddStatusToResponse.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddStatusToResponse.java
@@ -159,7 +159,7 @@ public class AddStatusToResponse extends AbstractProfileAction {
      * 
      * @param codes list of status code values to insert
      */
-    public void setStatusCodes(@Nonnull @NonnullElements List<QName> codes) {
+    public void setStatusCodes(@Nonnull @NonnullElements final List<QName> codes) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         
         Constraint.isNotNull(codes, "Status code list cannot be null");
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/AbstractSubjectConfirmationValidator.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/AbstractSubjectConfirmationValidator.java
index 6e317ca..9b2f761 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/AbstractSubjectConfirmationValidator.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/AbstractSubjectConfirmationValidator.java
@@ -194,7 +194,7 @@ public abstract class AbstractSubjectConfirmationValidator implements SubjectCon
         try {
             validRecipients = (Set<String>) context.getStaticParameters().get(
                     SAML2AssertionValidationParameters.SC_VALID_RECIPIENTS);
-        } catch (ClassCastException e) {
+        } catch (final ClassCastException e) {
             log.warn("The value of the static validation parameter '{}' was not java.util.Set<String>",
                     SAML2AssertionValidationParameters.SC_VALID_RECIPIENTS);
             context.setValidationFailureMessage(
@@ -249,7 +249,7 @@ public abstract class AbstractSubjectConfirmationValidator implements SubjectCon
         InetAddress[] confirmingAddresses;
         try {
             confirmingAddresses = InetAddress.getAllByName(address);
-        } catch (UnknownHostException e) {
+        } catch (final UnknownHostException e) {
             log.warn("The subject confirmation address '{}' in assetion '{}' can not be resolved " 
                     + "to a valid set of IP address(s)", address, assertion.getID());
             context.setValidationFailureMessage(String.format(
@@ -266,7 +266,7 @@ public abstract class AbstractSubjectConfirmationValidator implements SubjectCon
         try {
             validAddresses = (Set<InetAddress>) context.getStaticParameters().get(
                     SAML2AssertionValidationParameters.SC_VALID_ADDRESSES);
-        } catch (ClassCastException e) {
+        } catch (final ClassCastException e) {
             log.warn("The value of the static validation parameter '{}' was not java.util.Set<InetAddress>",
                     SAML2AssertionValidationParameters.SC_VALID_ADDRESSES);
             context.setValidationFailureMessage("Unable to determine list of valid subject confirmation addresses");
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/AudienceRestrictionConditionValidator.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/AudienceRestrictionConditionValidator.java
index 43223c1..f9eb9c8 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/AudienceRestrictionConditionValidator.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/AudienceRestrictionConditionValidator.java
@@ -85,7 +85,7 @@ public class AudienceRestrictionConditionValidator implements ConditionValidator
         try {
             validAudiences = (Set<String>) context.getStaticParameters().get(
                     SAML2AssertionValidationParameters.COND_VALID_AUDIENCES);
-        } catch (ClassCastException e) {
+        } catch (final ClassCastException e) {
             log.warn("The value of the static validation parameter '{}' was not java.util.Set<String>",
                     SAML2AssertionValidationParameters.COND_VALID_AUDIENCES);
             context.setValidationFailureMessage("Unable to determine list of valid audiences");
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/HolderOfKeySubjectConfirmationValidator.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/HolderOfKeySubjectConfirmationValidator.java
index 844be89..886892d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/HolderOfKeySubjectConfirmationValidator.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/HolderOfKeySubjectConfirmationValidator.java
@@ -141,7 +141,7 @@ public class HolderOfKeySubjectConfirmationValidator extends AbstractSubjectConf
         Pair<PublicKey, X509Certificate> keyCertPair = null;
         try {
             keyCertPair = getKeyAndCertificate(context);
-        } catch (IllegalArgumentException e) {
+        } catch (final IllegalArgumentException e) {
             log.warn("Problem with the validation context presenter key/cert params: {}", e.getMessage());
             context.setValidationFailureMessage("Unable to obtain presenter key/cert params from validation context");
             return ValidationResult.INDETERMINATE;
@@ -211,7 +211,7 @@ public class HolderOfKeySubjectConfirmationValidator extends AbstractSubjectConf
         try {
             presenterKey = (PublicKey) context.getStaticParameters().get(
                     SAML2AssertionValidationParameters.SC_HOK_PRESENTER_KEY);
-        } catch (ClassCastException e) {
+        } catch (final ClassCastException e) {
             throw new IllegalArgumentException(String.format(
                     "The value of the static validation parameter '%s' was not of the required type '%s'",
                     SAML2AssertionValidationParameters.SC_HOK_PRESENTER_KEY, PublicKey.class.getName()));
@@ -232,7 +232,7 @@ public class HolderOfKeySubjectConfirmationValidator extends AbstractSubjectConf
                     presenterKey = presenterCert.getPublicKey();
                 }
             }
-        } catch (ClassCastException e) {
+        } catch (final ClassCastException e) {
             throw new IllegalArgumentException(String.format(
                     "The value of the static validation parameter '%s' was not of the required type '%s'",
                     SAML2AssertionValidationParameters.SC_HOK_PRESENTER_CERT, X509Certificate.class.getName()));
@@ -341,7 +341,7 @@ public class HolderOfKeySubjectConfirmationValidator extends AbstractSubjectConf
                     log.debug("Matched KeyValue PublicKey");
                     return true;
                 }
-            } catch (KeyException e) {
+            } catch (final KeyException e) {
                 log.warn("KeyInfo contained KeyValue that can not be parsed", e);
             }
         }
@@ -384,7 +384,7 @@ public class HolderOfKeySubjectConfirmationValidator extends AbstractSubjectConf
                     log.debug("Matched DEREncodedKeyValue PublicKey");
                     return true;
                 }
-            } catch (KeyException e) {
+            } catch (final KeyException e) {
                 log.warn("KeyInfo contained DEREncodedKeyValue that can not be parsed", e);
             }
         }
@@ -441,7 +441,7 @@ public class HolderOfKeySubjectConfirmationValidator extends AbstractSubjectConf
                         log.debug("Matched X509Certificate");
                         return true;
                     }
-                } catch (CertificateException e) {
+                } catch (final CertificateException e) {
                     log.warn("KeyInfo contained Certificate value that can not be parsed", e);
                 }
             }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/OneTimeUseConditionValidator.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/OneTimeUseConditionValidator.java
index 7a19597..b56056d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/OneTimeUseConditionValidator.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/assertion/impl/OneTimeUseConditionValidator.java
@@ -149,12 +149,12 @@ public class OneTimeUseConditionValidator implements ConditionValidator {
      * 
      * @return the effective one-time use expiration for the assertion being evaluated
      */
-    protected long getExpires(Assertion assertion, ValidationContext context) {
+    protected long getExpires(final Assertion assertion, final ValidationContext context) {
         Long expires = null;
         try {
             expires = (Long) context.getStaticParameters().get(
                     SAML2AssertionValidationParameters.COND_ONE_TIME_USE_EXPIRES);
-        } catch (ClassCastException e) {
+        } catch (final ClassCastException e) {
             log.warn("Value of param was not a Long: {}", SAML2AssertionValidationParameters.COND_ONE_TIME_USE_EXPIRES);
         }
         log.debug("Saw one-time use cache expires context param: {}", expires);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPArtifactDecoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPArtifactDecoder.java
index c72bded..5785940 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPArtifactDecoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPArtifactDecoder.java
@@ -326,7 +326,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      * 
      * @throws MessageDecodingException thrown if there is a problem decoding or dereferencing the artifact
      */
-    private void processArtifact(MessageContext messageContext, HttpServletRequest request) 
+    private void processArtifact(final MessageContext messageContext, final HttpServletRequest request) 
             throws MessageDecodingException {
         String encodedArtifact = StringSupport.trimOrNull(request.getParameter("SAMLart"));
         if (encodedArtifact == null) {
@@ -347,9 +347,9 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
             SAMLObject inboundMessage = dereferenceArtifact(artifact, peerRoleDescriptor, ars);
 
             messageContext.setMessage(inboundMessage);
-        } catch (MessageDecodingException e) {
+        } catch (final MessageDecodingException e) {
             throw e;
-        } catch (Exception e) {
+        } catch (final Exception e) {
             throw new MessageDecodingException("Fatal error decoding or resolving inbound artifact", e);
         }
     }
@@ -360,7 +360,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      * @param artifactResolveEndpointURL
      * @return
      */
-    private SAMLObject dereferenceArtifact(SAML2Artifact artifact, RoleDescriptor peerRoleDescriptor, ArtifactResolutionService ars) 
+    private SAMLObject dereferenceArtifact(final SAML2Artifact artifact, final RoleDescriptor peerRoleDescriptor, final ArtifactResolutionService ars) 
             throws MessageDecodingException {
         
         MessageContext<SAMLObject> outbound = new MessageContext<>();
@@ -378,7 +378,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
             log.trace("Executing ArtifactResolve over SOAP 1.1 binding to endpoint: {}", ars.getLocation());
             soapClient.send(ars.getLocation(), opContext);
             return opContext.getInboundMessageContext().getMessage();
-        } catch (SOAPException | SecurityException e) {
+        } catch (final SOAPException | SecurityException e) {
             throw new MessageDecodingException("Error dereferencing artifact", e);
         }
     }
@@ -389,7 +389,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      * @param peerRoleDescriptor 
      * @return
      */
-    private ArtifactResolve buildArtifactResolveRequestMessage(SAML2Artifact artifact, String endpoint, RoleDescriptor peerRoleDescriptor) {
+    private ArtifactResolve buildArtifactResolveRequestMessage(final SAML2Artifact artifact, final String endpoint, final RoleDescriptor peerRoleDescriptor) {
         ArtifactResolve request = 
                 (ArtifactResolve) XMLObjectSupport.buildXMLObject(ArtifactResolve.DEFAULT_ELEMENT_NAME);
         
@@ -409,7 +409,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      * @param peerRoleDescriptor 
      * @return
      */
-    private Issuer buildIssuer(RoleDescriptor peerRoleDescriptor) {
+    private Issuer buildIssuer(final RoleDescriptor peerRoleDescriptor) {
         Issuer issuer = (Issuer) XMLObjectSupport.buildXMLObject(Issuer.DEFAULT_ELEMENT_NAME);
         //TODO how do we get our own entityID?
         //     probably support optional static injected self entityID as well as injected resolution strategy
@@ -422,7 +422,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      * @param peerRoleDescriptor
      * @return
      */
-    private ArtifactResolutionService resolveArtifactEndpoint(SAML2Artifact artifact, RoleDescriptor peerRoleDescriptor) throws MessageDecodingException {
+    private ArtifactResolutionService resolveArtifactEndpoint(final SAML2Artifact artifact, final RoleDescriptor peerRoleDescriptor) throws MessageDecodingException {
         RoleDescriptorCriterion roleDescriptorCriterion = new RoleDescriptorCriterion(peerRoleDescriptor);
 
         ArtifactResolutionService arsTemplate = 
@@ -450,7 +450,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
             } else {
                 throw new MessageDecodingException("Unable to resolve ArtifactResolutionService endpoint");
             }
-        } catch (ResolverException e) {
+        } catch (final ResolverException e) {
             throw new MessageDecodingException("Unable to resolve ArtifactResolutionService endpoint");
         }
     }
@@ -459,7 +459,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      * @param artifact
      * @return
      */
-    private RoleDescriptor resolvePeerRoleDescriptor(SAML2Artifact artifact) throws MessageDecodingException {
+    private RoleDescriptor resolvePeerRoleDescriptor(final SAML2Artifact artifact) throws MessageDecodingException {
 
         CriteriaSet criteriaSet = new CriteriaSet(
                 new ArtifactCriterion(artifact),
@@ -467,7 +467,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
                 new EntityRoleCriterion(getPeerEntityRole()));
         try {
             return roleDescriptorResolver.resolveSingle(criteriaSet);
-        } catch (ResolverException e) {
+        } catch (final ResolverException e) {
             throw new MessageDecodingException("Error resolving peer entity RoleDescriptor", e);
         }
     }
@@ -476,7 +476,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      * @param encodedArtifact
      * @return
      */
-    private SAML2Artifact parseArtifact(String encodedArtifact) throws MessageDecodingException {
+    private SAML2Artifact parseArtifact(final String encodedArtifact) throws MessageDecodingException {
         return artifactBuilderFactory.buildArtifact(encodedArtifact);
     }
 
@@ -485,7 +485,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      * 
      * @param messageContext the current message context
      */
-    protected void populateBindingContext(MessageContext<SAMLObject> messageContext) {
+    protected void populateBindingContext(final MessageContext<SAMLObject> messageContext) {
         SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
         bindingContext.setBindingUri(getBindingURI());
         bindingContext.setBindingDescriptor(bindingDescriptor);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPPostDecoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPPostDecoder.java
index fd5b4fa..38c003c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPPostDecoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPPostDecoder.java
@@ -105,7 +105,7 @@ public class HTTPPostDecoder extends BaseHttpServletRequestXMLMessageDecoder<SAM
      * 
      * @throws MessageDecodingException thrown if the message does not contain a base64 encoded SAML message
      */
-    protected InputStream getBase64DecodedMessage(HttpServletRequest request) throws MessageDecodingException {
+    protected InputStream getBase64DecodedMessage(final HttpServletRequest request) throws MessageDecodingException {
         log.debug("Getting Base64 encoded message from request");
         String encodedMessage = request.getParameter("SAMLRequest");
         if (Strings.isNullOrEmpty(encodedMessage)) {
@@ -134,7 +134,7 @@ public class HTTPPostDecoder extends BaseHttpServletRequestXMLMessageDecoder<SAM
      * 
      * @param messageContext the current message context
      */
-    protected void populateBindingContext(MessageContext<SAMLObject> messageContext) {
+    protected void populateBindingContext(final MessageContext<SAMLObject> messageContext) {
         SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
         bindingContext.setBindingUri(getBindingURI());
         bindingContext.setBindingDescriptor(bindingDescriptor);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPPostSimpleSignDecoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPPostSimpleSignDecoder.java
index 6734164..08c3bac 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPPostSimpleSignDecoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPPostSimpleSignDecoder.java
@@ -42,7 +42,7 @@ public class HTTPPostSimpleSignDecoder extends HTTPPostDecoder {
      * 
      * @param messageContext the current message context
      */
-    protected void populateBindingContext(MessageContext<SAMLObject> messageContext) {
+    protected void populateBindingContext(final MessageContext<SAMLObject> messageContext) {
         SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
         bindingContext.setBindingUri(getBindingURI());
         bindingContext.setBindingDescriptor(getBindingDescriptor());
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPRedirectDeflateDecoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPRedirectDeflateDecoder.java
index e96806d..f393848 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPRedirectDeflateDecoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPRedirectDeflateDecoder.java
@@ -127,7 +127,7 @@ public class HTTPRedirectDeflateDecoder extends BaseHttpServletRequestXMLMessage
      * 
      * @throws MessageDecodingException thrown if the message can not be decoded
      */
-    protected InputStream decodeMessage(String message) throws MessageDecodingException {
+    protected InputStream decodeMessage(final String message) throws MessageDecodingException {
         log.debug("Base64 decoding and inflating SAML message");
 
         byte[] decodedBytes = Base64Support.decode(message);
@@ -140,7 +140,7 @@ public class HTTPRedirectDeflateDecoder extends BaseHttpServletRequestXMLMessage
             ByteArrayInputStream bytesIn = new ByteArrayInputStream(decodedBytes);
             InflaterInputStream inflater = new InflaterInputStream(bytesIn, new Inflater(true));
             return inflater;
-        } catch (Exception e) {
+        } catch (final Exception e) {
             log.error("Unable to Base64 decode and inflate SAML message", e);
             throw new MessageDecodingException("Unable to Base64 decode and inflate SAML message", e);
         }
@@ -151,7 +151,7 @@ public class HTTPRedirectDeflateDecoder extends BaseHttpServletRequestXMLMessage
      * 
      * @param messageContext the current message context
      */
-    protected void populateBindingContext(MessageContext<SAMLObject> messageContext) {
+    protected void populateBindingContext(final MessageContext<SAMLObject> messageContext) {
         SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
         bindingContext.setBindingUri(getBindingURI());
         bindingContext.setBindingDescriptor(bindingDescriptor);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPSOAP11Decoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPSOAP11Decoder.java
index fcc2f2c..ca9b99e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPSOAP11Decoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPSOAP11Decoder.java
@@ -90,7 +90,7 @@ public class HTTPSOAP11Decoder extends org.opensaml.soap.soap11.decoder.http.imp
      * 
      * @param messageContext the current message context
      */
-    protected void populateBindingContext(MessageContext<SAMLObject> messageContext) {
+    protected void populateBindingContext(final MessageContext<SAMLObject> messageContext) {
         SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
         bindingContext.setBindingUri(getBindingURI());
         bindingContext.setBindingDescriptor(bindingDescriptor);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HttpClientResponseSOAP11Decoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HttpClientResponseSOAP11Decoder.java
index 2a7053c..66d9311 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HttpClientResponseSOAP11Decoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HttpClientResponseSOAP11Decoder.java
@@ -91,7 +91,7 @@ public class HttpClientResponseSOAP11Decoder
      * 
      * @param messageContext the current message context
      */
-    protected void populateBindingContext(MessageContext<SAMLObject> messageContext) {
+    protected void populateBindingContext(final MessageContext<SAMLObject> messageContext) {
         SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
         bindingContext.setBindingUri(getBindingURI());
         bindingContext.setBindingDescriptor(bindingDescriptor);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/BaseSAML2MessageEncoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/BaseSAML2MessageEncoder.java
index b62da41..dabc2a3 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/BaseSAML2MessageEncoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/BaseSAML2MessageEncoder.java
@@ -42,10 +42,10 @@ public abstract class BaseSAML2MessageEncoder extends BaseHttpServletResponseXML
      * 
      * @throws MessageEncodingException throw if no relying party endpoint is available
      */
-    protected URI getEndpointURL(MessageContext<SAMLObject> messageContext) throws MessageEncodingException {
+    protected URI getEndpointURL(final MessageContext<SAMLObject> messageContext) throws MessageEncodingException {
         try {
             return SAMLBindingSupport.getEndpointURL(messageContext);
-        } catch (BindingException e) {
+        } catch (final BindingException e) {
             throw new MessageEncodingException("Could not obtain message endpoint URL", e);
         }
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPArtifactEncoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPArtifactEncoder.java
index 65b592e..b334aa3 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPArtifactEncoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPArtifactEncoder.java
@@ -107,7 +107,7 @@ public class HTTPArtifactEncoder extends BaseSAML2MessageEncoder {
      * 
      * @param post true if POST encoding will be used, false if GET encoding will be used
      */
-    public void setPostEncoding(boolean post) {
+    public void setPostEncoding(final boolean post) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
         postEncoding = post;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostEncoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostEncoder.java
index b284c9f..81cfb3b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostEncoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostEncoder.java
@@ -84,7 +84,7 @@ public class HTTPPostEncoder extends BaseSAML2MessageEncoder {
      * 
      * @param newVelocityEngine the new VelocityEngine instane
      */
-    public void setVelocityEngine(VelocityEngine newVelocityEngine) {
+    public void setVelocityEngine(final VelocityEngine newVelocityEngine) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
         velocityEngine = newVelocityEngine;
@@ -108,7 +108,7 @@ public class HTTPPostEncoder extends BaseSAML2MessageEncoder {
      * 
      * @param newVelocityTemplateId the new Velocity template id
      */
-    public void setVelocityTemplateId(String newVelocityTemplateId) {
+    public void setVelocityTemplateId(final String newVelocityTemplateId) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
         velocityTemplateId = newVelocityTemplateId;
@@ -154,7 +154,7 @@ public class HTTPPostEncoder extends BaseSAML2MessageEncoder {
      * 
      * @throws MessageEncodingException thrown if there is a problem encoding the message
      */
-    protected void postEncode(MessageContext<SAMLObject> messageContext, String endpointURL) 
+    protected void postEncode(final MessageContext<SAMLObject> messageContext, final String endpointURL) 
             throws MessageEncodingException {
         log.debug("Invoking Velocity template to create POST body");
         try {
@@ -171,7 +171,7 @@ public class HTTPPostEncoder extends BaseSAML2MessageEncoder {
             Writer out = new OutputStreamWriter(response.getOutputStream(), "UTF-8");
             velocityEngine.mergeTemplate(velocityTemplateId, "UTF-8", context, out);
             out.flush();
-        } catch (Exception e) {
+        } catch (final Exception e) {
             log.error("Error invoking Velocity template", e);
             throw new MessageEncodingException("Error creating output document", e);
         }
@@ -185,8 +185,8 @@ public class HTTPPostEncoder extends BaseSAML2MessageEncoder {
      * @param endpointURL endpoint URL to which to encode message
      * @throws MessageEncodingException thrown if there is a problem encoding the message
      */
-    protected void populateVelocityContext(VelocityContext velocityContext, MessageContext<SAMLObject> messageContext,
-            String endpointURL) throws MessageEncodingException {
+    protected void populateVelocityContext(final VelocityContext velocityContext, final MessageContext<SAMLObject> messageContext,
+            final String endpointURL) throws MessageEncodingException {
 
         String encodedEndpointURL = HTMLEncoder.encodeForHTMLAttribute(endpointURL);
         log.debug("Encoding action url of '{}' with encoded value '{}'", endpointURL, encodedEndpointURL);
@@ -209,7 +209,7 @@ public class HTTPPostEncoder extends BaseSAML2MessageEncoder {
                 throw new MessageEncodingException(
                         "SAML message is neither a SAML RequestAbstractType or StatusResponseType");
             }
-        } catch (UnsupportedEncodingException e) {
+        } catch (final UnsupportedEncodingException e) {
             log.error("UTF-8 encoding is not supported, this VM is not Java compliant.");
             throw new MessageEncodingException("Unable to encode message, UTF-8 encoding is not supported");
         }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostSimpleSignEncoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostSimpleSignEncoder.java
index 0fb0685..3d19ec6 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostSimpleSignEncoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostSimpleSignEncoder.java
@@ -66,8 +66,8 @@ public class HTTPPostSimpleSignEncoder extends HTTPPostEncoder {
     }
 
     /** {@inheritDoc} */
-    protected void populateVelocityContext(VelocityContext velocityContext, MessageContext<SAMLObject> messageContext,
-            String endpointURL) throws MessageEncodingException {
+    protected void populateVelocityContext(final VelocityContext velocityContext, final MessageContext<SAMLObject> messageContext,
+            final String endpointURL) throws MessageEncodingException {
 
         super.populateVelocityContext(velocityContext, messageContext, endpointURL);
 
@@ -104,7 +104,7 @@ public class HTTPPostSimpleSignEncoder extends HTTPPostEncoder {
      * @throws MessageEncodingException thrown if there is an error generating or marshalling the KeyInfo
      * @return the marshalled, serialized and base64-encoded KeyInfo, or null if none was generated
      */
-    protected String buildKeyInfo(Credential signingCredential, KeyInfoGenerator kiGenerator)
+    protected String buildKeyInfo(final Credential signingCredential, final KeyInfoGenerator kiGenerator)
             throws MessageEncodingException {
 
         try {
@@ -140,8 +140,8 @@ public class HTTPPostSimpleSignEncoder extends HTTPPostEncoder {
      * 
      * @return the form control data string for signature computation
      */
-    protected String buildFormDataToSign(VelocityContext velocityContext, MessageContext<SAMLObject> messageContext,
-            String sigAlgURI) {
+    protected String buildFormDataToSign(final VelocityContext velocityContext, final MessageContext<SAMLObject> messageContext,
+            final String sigAlgURI) {
         StringBuilder builder = new StringBuilder();
 
         boolean isRequest = false;
@@ -189,7 +189,7 @@ public class HTTPPostSimpleSignEncoder extends HTTPPostEncoder {
      * @throws MessageEncodingException thrown if the algorithm URI is not supplied explicitly and 
      *          could not be derived from the supplied credential
      */
-    protected String getSignatureAlgorithmURI(SignatureSigningParameters signingParameters)
+    protected String getSignatureAlgorithmURI(final SignatureSigningParameters signingParameters)
             throws MessageEncodingException {
         
         if (signingParameters.getSignatureAlgorithm() != null) {
@@ -210,7 +210,7 @@ public class HTTPPostSimpleSignEncoder extends HTTPPostEncoder {
      * 
      * @throws MessageEncodingException there is an error computing the signature
      */
-    protected String generateSignature(Credential signingCredential, String algorithmURI, String formData)
+    protected String generateSignature(final Credential signingCredential, final String algorithmURI, final String formData)
             throws MessageEncodingException {
 
         log.debug(String.format(
@@ -223,10 +223,10 @@ public class HTTPPostSimpleSignEncoder extends HTTPPostEncoder {
                     XMLSigningUtil.signWithURI(signingCredential, algorithmURI, formData.getBytes("UTF-8"));
             b64Signature = Base64Support.encode(rawSignature, Base64Support.UNCHUNKED);
             log.debug("Generated digital signature value (base64-encoded) {}", b64Signature);
-        } catch (SecurityException e) {
+        } catch (final SecurityException e) {
             log.error("Error during URL signing process", e);
             throw new MessageEncodingException("Unable to sign form control string", e);
-        } catch (UnsupportedEncodingException e) {
+        } catch (final UnsupportedEncodingException e) {
             // UTF-8 encoding is required to be supported by all JVMs
         }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoder.java
index e302b7e..41fc86d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPRedirectDeflateEncoder.java
@@ -89,7 +89,7 @@ public class HTTPRedirectDeflateEncoder extends BaseSAML2MessageEncoder {
 
         try {
             response.sendRedirect(redirectURL);
-        } catch (IOException e) {
+        } catch (final IOException e) {
             throw new MessageEncodingException("Problem sending HTTP redirect", e);
         }
     }
@@ -99,7 +99,7 @@ public class HTTPRedirectDeflateEncoder extends BaseSAML2MessageEncoder {
      * 
      * @param message current message context
      */
-    protected void removeSignature(SAMLObject message) {
+    protected void removeSignature(final SAMLObject message) {
         if (message instanceof SignableSAMLObject) {
             SignableSAMLObject signableMessage = (SignableSAMLObject) message;
             if (signableMessage.isSigned()) {
@@ -118,7 +118,7 @@ public class HTTPRedirectDeflateEncoder extends BaseSAML2MessageEncoder {
      * 
      * @throws MessageEncodingException thrown if there is a problem compressing the message
      */
-    protected String deflateAndBase64Encode(SAMLObject message) throws MessageEncodingException {
+    protected String deflateAndBase64Encode(final SAMLObject message) throws MessageEncodingException {
         log.debug("Deflating and Base64 encoding SAML message");
         try {
             String messageStr = SerializeSupport.nodeToString(marshallMessage(message));
@@ -130,7 +130,7 @@ public class HTTPRedirectDeflateEncoder extends BaseSAML2MessageEncoder {
             deflaterStream.finish();
 
             return Base64Support.encode(bytesOut.toByteArray(), Base64Support.UNCHUNKED);
-        } catch (IOException e) {
+        } catch (final IOException e) {
             throw new MessageEncodingException("Unable to DEFLATE and Base64 encode SAML message", e);
         }
     }
@@ -146,14 +146,14 @@ public class HTTPRedirectDeflateEncoder extends BaseSAML2MessageEncoder {
      * 
      * @throws MessageEncodingException thrown if the SAML message is neither a RequestAbstractType or Response
      */
-    protected String buildRedirectURL(MessageContext<SAMLObject> messageContext, String endpoint, String message)
+    protected String buildRedirectURL(final MessageContext<SAMLObject> messageContext, final String endpoint, final String message)
             throws MessageEncodingException {
         log.debug("Building URL to redirect client to");
         
         URLBuilder urlBuilder = null;
         try {
             urlBuilder = new URLBuilder(endpoint);
-        } catch (MalformedURLException e) {
+        } catch (final MalformedURLException e) {
             throw new MessageEncodingException("Endpoint URL " + endpoint + " is not a valid URL", e);
         }
 
@@ -203,7 +203,7 @@ public class HTTPRedirectDeflateEncoder extends BaseSAML2MessageEncoder {
      * @throws MessageEncodingException thrown if the algorithm URI is not supplied explicitly and 
      *          could not be derived from the supplied credential
      */
-    protected String getSignatureAlgorithmURI(SignatureSigningParameters signingParameters)
+    protected String getSignatureAlgorithmURI(final SignatureSigningParameters signingParameters)
             throws MessageEncodingException {
         
         if (signingParameters.getSignatureAlgorithm() != null) {
@@ -224,7 +224,7 @@ public class HTTPRedirectDeflateEncoder extends BaseSAML2MessageEncoder {
      * 
      * @throws MessageEncodingException there is an error computing the signature
      */
-    protected String generateSignature(Credential signingCredential, String algorithmURI, String queryString)
+    protected String generateSignature(final Credential signingCredential, final String algorithmURI, final String queryString)
             throws MessageEncodingException {
 
         log.debug(String.format("Generating signature with key type '%s', algorithm URI '%s' over query string '%s'",
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandler.java
index b0675fd..da006f9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPRedirectDeflateSignatureSecurityHandler.java
@@ -80,7 +80,7 @@ public class SAML2HTTPRedirectDeflateSignatureSecurityHandler extends BaseSAMLSi
      * @return a string representation of the signed content
      * @throws MessageHandlerException thrown if there is an error during request processing
      */
-    @Nonnull @NotEmpty private String buildSignedContentString(String queryString) throws MessageHandlerException {
+    @Nonnull @NotEmpty private String buildSignedContentString(final String queryString) throws MessageHandlerException {
         final StringBuilder builder = new StringBuilder();
 
         // One of these two is mandatory
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AbstractNameIDType.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AbstractNameIDType.java
index b19d438..c4013b2 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AbstractNameIDType.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AbstractNameIDType.java
@@ -50,7 +50,7 @@ public class AbstractNameIDType extends AbstractSAMLObject implements NameIDType
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AbstractNameIDType(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AbstractNameIDType(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -60,7 +60,7 @@ public class AbstractNameIDType extends AbstractSAMLObject implements NameIDType
     }
     
     /** {@inheritDoc} */
-    public void setValue(String newName) {
+    public void setValue(final String newName) {
         this.name = prepareForAssignment(this.name, newName);
     }
     
@@ -70,7 +70,7 @@ public class AbstractNameIDType extends AbstractSAMLObject implements NameIDType
     }
 
     /** {@inheritDoc} */
-    public void setNameQualifier(String newNameQualifier) {
+    public void setNameQualifier(final String newNameQualifier) {
         this.nameQualifier = prepareForAssignment(this.nameQualifier, newNameQualifier);
     }
 
@@ -80,7 +80,7 @@ public class AbstractNameIDType extends AbstractSAMLObject implements NameIDType
     }
 
     /** {@inheritDoc} */
-    public void setSPNameQualifier(String newSPNameQualifier) {
+    public void setSPNameQualifier(final String newSPNameQualifier) {
         this.spNameQualifier = prepareForAssignment(this.spNameQualifier, newSPNameQualifier);
     }
 
@@ -90,7 +90,7 @@ public class AbstractNameIDType extends AbstractSAMLObject implements NameIDType
     }
 
     /** {@inheritDoc} */
-    public void setFormat(String newFormat) {
+    public void setFormat(final String newFormat) {
         this.format = prepareForAssignment(this.format, newFormat);
     }
 
@@ -100,7 +100,7 @@ public class AbstractNameIDType extends AbstractSAMLObject implements NameIDType
     }
 
     /** {@inheritDoc} */
-    public void setSPProvidedID(String newSPProvidedID) {
+    public void setSPProvidedID(final String newSPProvidedID) {
         this.spProvidedID = prepareForAssignment(this.spProvidedID, newSPProvidedID);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AbstractNameIDTypeMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AbstractNameIDTypeMarshaller.java
index f73f504..ab964f2 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AbstractNameIDTypeMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AbstractNameIDTypeMarshaller.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Element;
 public abstract class AbstractNameIDTypeMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         NameIDType nameID = (NameIDType) samlObject;
 
         if (nameID.getNameQualifier() != null) {
@@ -53,7 +53,7 @@ public abstract class AbstractNameIDTypeMarshaller extends AbstractSAMLObjectMar
     }
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         NameIDType nameID = (NameIDType) samlObject;
         ElementSupport.appendTextContent(domElement, nameID.getValue());
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AbstractNameIDTypeUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AbstractNameIDTypeUnmarshaller.java
index 1f2b9a0..69c10fc 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AbstractNameIDTypeUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AbstractNameIDTypeUnmarshaller.java
@@ -30,13 +30,13 @@ import org.w3c.dom.Attr;
 public abstract class AbstractNameIDTypeUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         final NameIDType nameID = (NameIDType) samlObject;
         nameID.setValue(elementContent);
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final NameIDType nameID = (NameIDType) samlObject;
         
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ActionBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ActionBuilder.java
index d8c9856..7f747da 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ActionBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ActionBuilder.java
@@ -41,7 +41,7 @@ public class ActionBuilder extends AbstractSAMLObjectBuilder<Action> {
     }
 
     /** {@inheritDoc} */
-    public Action buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Action buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ActionImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ActionImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ActionImpl.java
index 98b619f..e6a8cc4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ActionImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ActionImpl.java
@@ -45,7 +45,7 @@ public class ActionImpl extends AbstractSAMLObject implements Action {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ActionImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ActionImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -55,7 +55,7 @@ public class ActionImpl extends AbstractSAMLObject implements Action {
     }
 
     /** {@inheritDoc} */
-    public void setNamespace(String newNamespace) {
+    public void setNamespace(final String newNamespace) {
         this.namespace = prepareForAssignment(this.namespace, newNamespace);
     }
 
@@ -65,7 +65,7 @@ public class ActionImpl extends AbstractSAMLObject implements Action {
     }
 
     /** {@inheritDoc} */
-    public void setAction(String newAction) {
+    public void setAction(final String newAction) {
         this.action = prepareForAssignment(this.action, newAction);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ActionMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ActionMarshaller.java
index c2f70ae..e5ecf2d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ActionMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ActionMarshaller.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
 public class ActionMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         Action action = (Action) samlObject;
 
         if (action.getNamespace() != null) {
@@ -44,7 +44,7 @@ public class ActionMarshaller extends AbstractSAMLObjectMarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         Action action = (Action) samlObject;
         ElementSupport.appendTextContent(domElement, action.getAction());
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ActionUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ActionUnmarshaller.java
index d96f3b3..86c7a25 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ActionUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ActionUnmarshaller.java
@@ -33,13 +33,13 @@ import org.w3c.dom.Attr;
 public class ActionUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         final Action action = (Action) samlObject;
         action.setAction(elementContent);
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final Action action = (Action) samlObject;
 
         if (attribute.getLocalName().equals(Action.NAMEPSACE_ATTRIB_NAME) && attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AdviceBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AdviceBuilder.java
index 500fccc..b721f25 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AdviceBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AdviceBuilder.java
@@ -40,7 +40,7 @@ public class AdviceBuilder extends AbstractSAMLObjectBuilder<Advice> {
     }
 
     /** {@inheritDoc} */
-    public Advice buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Advice buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AdviceImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AdviceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AdviceImpl.java
index 48c250d..8a11c66 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AdviceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AdviceImpl.java
@@ -51,7 +51,7 @@ public class AdviceImpl extends AbstractSAMLObject implements Advice {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AdviceImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AdviceImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         indexedChildren = new IndexedXMLObjectChildrenList<>(this);
     }
@@ -62,7 +62,7 @@ public class AdviceImpl extends AbstractSAMLObject implements Advice {
     }
 
     /** {@inheritDoc} */
-    public List<XMLObject> getChildren(QName typeOrName) {
+    public List<XMLObject> getChildren(final QName typeOrName) {
         return (List<XMLObject>) indexedChildren.subList(typeOrName);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AdviceUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AdviceUnmarshaller.java
index 1cadd8f..caf87ef 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AdviceUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AdviceUnmarshaller.java
@@ -32,7 +32,7 @@ import org.opensaml.saml.saml2.core.Advice;
 public class AdviceUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
         Advice advice = (Advice) parentObject;
 
         // This is an unbounded choice over several unrelated elements, and the <any> wildcard element.
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactBuilder.java
index fe3d0dc..38b41b6 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactBuilder.java
@@ -42,7 +42,7 @@ public class ArtifactBuilder extends AbstractSAMLObjectBuilder<Artifact> {
     }
 
     /** {@inheritDoc} */
-    public Artifact buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Artifact buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ArtifactImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactImpl.java
index d34525a..b361c50 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactImpl.java
@@ -42,7 +42,7 @@ public class ArtifactImpl extends AbstractSAMLObject implements Artifact {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ArtifactImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ArtifactImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -52,7 +52,7 @@ public class ArtifactImpl extends AbstractSAMLObject implements Artifact {
     }
 
     /** {@inheritDoc} */
-    public void setArtifact(String newArtifact) {
+    public void setArtifact(final String newArtifact) {
         this.artifact = prepareForAssignment(this.artifact, newArtifact);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactMarshaller.java
index 3da0884..6041587 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactMarshaller.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
 public class ArtifactMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         Artifact artifact = (Artifact) samlObject;
 
         if (artifact.getArtifact() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactResolveBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactResolveBuilder.java
index 48eadb3..1fd6d14 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactResolveBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactResolveBuilder.java
@@ -44,7 +44,7 @@ public class ArtifactResolveBuilder extends AbstractSAMLObjectBuilder<ArtifactRe
     }
 
     /** {@inheritDoc} */
-    public ArtifactResolve buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ArtifactResolve buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ArtifactResolveImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactResolveImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactResolveImpl.java
index 74048c0..c8b2138 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactResolveImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactResolveImpl.java
@@ -44,7 +44,7 @@ public class ArtifactResolveImpl extends RequestAbstractTypeImpl implements Arti
      * @param elementLocalName element name
      * @param namespacePrefix namespace prefix
      */
-    protected ArtifactResolveImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ArtifactResolveImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -54,7 +54,7 @@ public class ArtifactResolveImpl extends RequestAbstractTypeImpl implements Arti
     }
 
     /** {@inheritDoc} */
-    public void setArtifact(Artifact newArtifact) {
+    public void setArtifact(final Artifact newArtifact) {
         this.artifact = prepareForAssignment(this.artifact, newArtifact);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactResolveUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactResolveUnmarshaller.java
index d47600d..d76baca 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactResolveUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactResolveUnmarshaller.java
@@ -32,7 +32,7 @@ import org.opensaml.saml.saml2.core.ArtifactResolve;
 public class ArtifactResolveUnmarshaller extends RequestAbstractTypeUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         ArtifactResolve ar = (ArtifactResolve) parentSAMLObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactResponseBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactResponseBuilder.java
index d3a0afb..b4f4c23 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactResponseBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactResponseBuilder.java
@@ -44,7 +44,7 @@ public class ArtifactResponseBuilder extends AbstractSAMLObjectBuilder<ArtifactR
     }
 
     /** {@inheritDoc} */
-    public ArtifactResponse buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ArtifactResponse buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ArtifactResponseImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactResponseImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactResponseImpl.java
index 76213e5..adecc2f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactResponseImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactResponseImpl.java
@@ -44,7 +44,7 @@ public class ArtifactResponseImpl extends StatusResponseTypeImpl implements Arti
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ArtifactResponseImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ArtifactResponseImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -54,7 +54,7 @@ public class ArtifactResponseImpl extends StatusResponseTypeImpl implements Arti
     }
 
     /** {@inheritDoc} */
-    public void setMessage(SAMLObject message) {
+    public void setMessage(final SAMLObject message) {
         protocolMessage = prepareForAssignment(protocolMessage, message);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactResponseUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactResponseUnmarshaller.java
index 02e35a0..ac165b8 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactResponseUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactResponseUnmarshaller.java
@@ -36,7 +36,7 @@ import org.opensaml.xmlsec.signature.Signature;
 public class ArtifactResponseUnmarshaller extends StatusResponseTypeUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         ArtifactResponse artifactResponse = (ArtifactResponse) parentSAMLObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactUnmarshaller.java
index 48013ca..66739b3 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ArtifactUnmarshaller.java
@@ -31,7 +31,7 @@ import org.opensaml.saml.saml2.core.Artifact;
 public class ArtifactUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         Artifact artifact = (Artifact) samlObject;
 
         artifact.setArtifact(elementContent);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionBuilder.java
index 73836ea..d8de64e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionBuilder.java
@@ -41,7 +41,7 @@ public class AssertionBuilder extends AbstractSAMLObjectBuilder<Assertion> {
     }
 
     /** {@inheritDoc} */
-    public Assertion buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Assertion buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AssertionImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefBuilder.java
index 79ae6bb..1706082 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefBuilder.java
@@ -42,7 +42,7 @@ public class AssertionIDRefBuilder extends AbstractSAMLObjectBuilder<AssertionID
     }
 
     /** {@inheritDoc} */
-    public AssertionIDRef buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AssertionIDRef buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AssertionIDRefImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefImpl.java
index 070c282..3cf767e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefImpl.java
@@ -42,7 +42,7 @@ public class AssertionIDRefImpl extends AbstractSAMLObject implements AssertionI
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AssertionIDRefImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AssertionIDRefImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -52,7 +52,7 @@ public class AssertionIDRefImpl extends AbstractSAMLObject implements AssertionI
     }
 
     /** {@inheritDoc} */
-    public void setAssertionID(String newIDRef) {
+    public void setAssertionID(final String newIDRef) {
         this.assertionID = prepareForAssignment(this.assertionID, newIDRef);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefMarshaller.java
index 2b70ba6..33811e3 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefMarshaller.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
 public class AssertionIDRefMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         AssertionIDRef assertionIDRef = (AssertionIDRef) samlObject;
         ElementSupport.appendTextContent(domElement, assertionIDRef.getAssertionID());
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefUnmarshaller.java
index 8800a02..12f52b4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRefUnmarshaller.java
@@ -31,7 +31,7 @@ import org.opensaml.saml.saml2.core.AssertionIDRef;
 public class AssertionIDRefUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         AssertionIDRef assertionIDRef = (AssertionIDRef) samlObject;
         assertionIDRef.setAssertionID(elementContent);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRequestBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRequestBuilder.java
index fc3a12c..df82b26 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRequestBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRequestBuilder.java
@@ -43,7 +43,7 @@ public class AssertionIDRequestBuilder extends AbstractSAMLObjectBuilder<Asserti
     }
 
     /** {@inheritDoc} */
-    public AssertionIDRequest buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AssertionIDRequest buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AssertionIDRequestImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRequestImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRequestImpl.java
index a07e045..c3bf519 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRequestImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRequestImpl.java
@@ -45,7 +45,7 @@ public class AssertionIDRequestImpl extends RequestAbstractTypeImpl implements A
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AssertionIDRequestImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AssertionIDRequestImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         assertionIDRefs = new XMLObjectChildrenList<>(this);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRequestUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRequestUnmarshaller.java
index f448dc0..80b6152 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRequestUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionIDRequestUnmarshaller.java
@@ -32,7 +32,7 @@ import org.opensaml.saml.saml2.core.AssertionIDRequest;
 public class AssertionIDRequestUnmarshaller extends RequestAbstractTypeUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         AssertionIDRequest idRequest = (AssertionIDRequest) parentSAMLObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionImpl.java
index 9e536c0..d03a577 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionImpl.java
@@ -79,7 +79,7 @@ public class AssertionImpl extends AbstractSignableSAMLObject implements Asserti
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AssertionImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AssertionImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         version = SAMLVersion.VERSION_20;
         statements = new IndexedXMLObjectChildrenList<>(this);
@@ -91,7 +91,7 @@ public class AssertionImpl extends AbstractSignableSAMLObject implements Asserti
     }
 
     /** {@inheritDoc} */
-    public void setVersion(SAMLVersion newVersion) {
+    public void setVersion(final SAMLVersion newVersion) {
         this.version = prepareForAssignment(this.version, newVersion);
     }
 
@@ -101,7 +101,7 @@ public class AssertionImpl extends AbstractSignableSAMLObject implements Asserti
     }
 
     /** {@inheritDoc} */
-    public void setIssueInstant(DateTime newIssueInstance) {
+    public void setIssueInstant(final DateTime newIssueInstance) {
         this.issueInstant = prepareForAssignment(this.issueInstant, newIssueInstance);
     }
 
@@ -111,7 +111,7 @@ public class AssertionImpl extends AbstractSignableSAMLObject implements Asserti
     }
 
     /** {@inheritDoc} */
-    public void setID(String newID) {
+    public void setID(final String newID) {
         String oldID = this.id;
         this.id = prepareForAssignment(this.id, newID);
         registerOwnID(oldID, this.id);
@@ -123,7 +123,7 @@ public class AssertionImpl extends AbstractSignableSAMLObject implements Asserti
     }
 
     /** {@inheritDoc} */
-    public void setIssuer(Issuer newIssuer) {
+    public void setIssuer(final Issuer newIssuer) {
         this.issuer = prepareForAssignment(this.issuer, newIssuer);
     }
 
@@ -133,7 +133,7 @@ public class AssertionImpl extends AbstractSignableSAMLObject implements Asserti
     }
 
     /** {@inheritDoc} */
-    public void setSubject(Subject newSubject) {
+    public void setSubject(final Subject newSubject) {
         this.subject = prepareForAssignment(this.subject, newSubject);
     }
 
@@ -143,7 +143,7 @@ public class AssertionImpl extends AbstractSignableSAMLObject implements Asserti
     }
 
     /** {@inheritDoc} */
-    public void setConditions(Conditions newConditions) {
+    public void setConditions(final Conditions newConditions) {
         this.conditions = prepareForAssignment(this.conditions, newConditions);
     }
 
@@ -153,7 +153,7 @@ public class AssertionImpl extends AbstractSignableSAMLObject implements Asserti
     }
 
     /** {@inheritDoc} */
-    public void setAdvice(Advice newAdvice) {
+    public void setAdvice(final Advice newAdvice) {
         this.advice = prepareForAssignment(this.advice, newAdvice);
     }
 
@@ -163,7 +163,7 @@ public class AssertionImpl extends AbstractSignableSAMLObject implements Asserti
     }
 
     /** {@inheritDoc} */
-    public List<Statement> getStatements(QName typeOrName) {
+    public List<Statement> getStatements(final QName typeOrName) {
         return (List<Statement>) statements.subList(typeOrName);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionMarshaller.java
index 26bfdca..f8df877 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionMarshaller.java
@@ -34,7 +34,7 @@ import org.w3c.dom.Element;
 public class AssertionMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         Assertion assertion = (Assertion) samlObject;
 
         if (assertion.getVersion() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefBuilder.java
index be9317c..e2710f3 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefBuilder.java
@@ -42,7 +42,7 @@ public class AssertionURIRefBuilder extends AbstractSAMLObjectBuilder<AssertionU
     }
 
     /** {@inheritDoc} */
-    public AssertionURIRef buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AssertionURIRef buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AssertionURIRefImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefImpl.java
index 6a52c56..d63d6aa 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefImpl.java
@@ -42,7 +42,7 @@ public class AssertionURIRefImpl extends AbstractSAMLObject implements Assertion
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AssertionURIRefImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AssertionURIRefImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -52,7 +52,7 @@ public class AssertionURIRefImpl extends AbstractSAMLObject implements Assertion
     }
 
     /** {@inheritDoc} */
-    public void setAssertionURI(String newAssertionURI) {
+    public void setAssertionURI(final String newAssertionURI) {
         this.assertionURI = prepareForAssignment(this.assertionURI, newAssertionURI);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefMarshaller.java
index 1b87838..b7a5d64 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefMarshaller.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
 public class AssertionURIRefMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         AssertionURIRef assertionURIRef = (AssertionURIRef) samlObject;
         ElementSupport.appendTextContent(domElement, assertionURIRef.getAssertionURI());
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefUnmarshaller.java
index 45328d9..6893368 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefUnmarshaller.java
@@ -31,7 +31,7 @@ import org.opensaml.saml.saml2.core.AssertionURIRef;
 public class AssertionURIRefUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         AssertionURIRef assertionURIRef = (AssertionURIRef) samlObject;
         assertionURIRef.setAssertionURI(elementContent);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionUnmarshaller.java
index 172eeec..2c22f0a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionUnmarshaller.java
@@ -43,7 +43,7 @@ import com.google.common.base.Strings;
 public class AssertionUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
         final Assertion assertion = (Assertion) parentObject;
 
         if (childObject instanceof Issuer) {
@@ -64,7 +64,7 @@ public class AssertionUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final Assertion assertion = (Assertion) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeBuilder.java
index 0285eff..d31f147 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeBuilder.java
@@ -39,7 +39,7 @@ public class AttributeBuilder extends AbstractSAMLObjectBuilder<Attribute> {
     }
 
     /** {@inheritDoc} */
-    public Attribute buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Attribute buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AttributeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeImpl.java
index 2250415..9ee3b4a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeImpl.java
@@ -54,7 +54,7 @@ public class AttributeImpl extends AbstractSAMLObject implements Attribute {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AttributeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AttributeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         unknownAttributes = new AttributeMap(this);
         attributeValues = new XMLObjectChildrenList<>(this);
@@ -66,7 +66,7 @@ public class AttributeImpl extends AbstractSAMLObject implements Attribute {
     }
 
     /** {@inheritDoc} */
-    public void setName(String n) {
+    public void setName(final String n) {
         name = prepareForAssignment(name, n);
     }
 
@@ -76,7 +76,7 @@ public class AttributeImpl extends AbstractSAMLObject implements Attribute {
     }
 
     /** {@inheritDoc} */
-    public void setNameFormat(String format) {
+    public void setNameFormat(final String format) {
         nameFormat = prepareForAssignment(nameFormat, format);
     }
 
@@ -86,7 +86,7 @@ public class AttributeImpl extends AbstractSAMLObject implements Attribute {
     }
 
     /** {@inheritDoc} */
-    public void setFriendlyName(String fname) {
+    public void setFriendlyName(final String fname) {
         friendlyName = prepareForAssignment(friendlyName, fname);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeMarshaller.java
index 0b4afe8..4930ab4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeMarshaller.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Element;
 public class AttributeMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlElement, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
         Attribute attribute = (Attribute) samlElement;
 
         if (attribute.getName() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeQueryBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeQueryBuilder.java
index e665265..c11e708 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeQueryBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeQueryBuilder.java
@@ -44,7 +44,7 @@ public class AttributeQueryBuilder extends AbstractSAMLObjectBuilder<AttributeQu
     }
 
     /** {@inheritDoc} */
-    public AttributeQuery buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AttributeQuery buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AttributeQueryImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeQueryImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeQueryImpl.java
index 96227b4..abaa008 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeQueryImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeQueryImpl.java
@@ -45,7 +45,7 @@ public class AttributeQueryImpl extends SubjectQueryImpl implements AttributeQue
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AttributeQueryImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AttributeQueryImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         attributes = new XMLObjectChildrenList<>(this);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeQueryUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeQueryUnmarshaller.java
index 131a78f..8e5b76a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeQueryUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeQueryUnmarshaller.java
@@ -32,7 +32,7 @@ import org.opensaml.saml.saml2.core.AttributeQuery;
 public class AttributeQueryUnmarshaller extends SubjectQueryUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         AttributeQuery query = (AttributeQuery) parentSAMLObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeStatementBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeStatementBuilder.java
index 30f3251..aa741c5 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeStatementBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeStatementBuilder.java
@@ -42,7 +42,7 @@ public class AttributeStatementBuilder extends AbstractSAMLObjectBuilder<Attribu
     }
 
     /** {@inheritDoc} */
-    public AttributeStatement buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AttributeStatement buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AttributeStatementImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeStatementImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeStatementImpl.java
index c2dca22..d2cdfd4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeStatementImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeStatementImpl.java
@@ -47,7 +47,7 @@ public class AttributeStatementImpl extends AbstractSAMLObject implements Attrib
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AttributeStatementImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AttributeStatementImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         indexedChildren = new IndexedXMLObjectChildrenList<>(this);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeStatementUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeStatementUnmarshaller.java
index 057fc83..ec75279 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeStatementUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeStatementUnmarshaller.java
@@ -34,7 +34,7 @@ import org.opensaml.saml.saml2.core.EncryptedAttribute;
 public class AttributeStatementUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
         AttributeStatement attributeStatement = (AttributeStatement) parentObject;
 
         if (childObject instanceof Attribute) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeUnmarshaller.java
index 19847d4..210c8ae 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AttributeUnmarshaller.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Attr;
 public class AttributeUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
 
         final Attribute attribute = (Attribute) parentSAMLObject;
@@ -47,7 +47,7 @@ public class AttributeUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
 
         final Attribute attrib = (Attribute) samlObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceBuilder.java
index eb574cf..bfa1d7a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceBuilder.java
@@ -40,7 +40,7 @@ public class AudienceBuilder extends AbstractSAMLObjectBuilder<Audience> {
     }
 
     /** {@inheritDoc} */
-    public Audience buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Audience buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AudienceImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceImpl.java
index c41b89b..633b39a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceImpl.java
@@ -42,7 +42,7 @@ public class AudienceImpl extends AbstractSAMLObject implements Audience {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AudienceImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AudienceImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -52,7 +52,7 @@ public class AudienceImpl extends AbstractSAMLObject implements Audience {
     }
 
     /** {@inheritDoc} */
-    public void setAudienceURI(String newAudienceURI) {
+    public void setAudienceURI(final String newAudienceURI) {
         this.audienceURI = prepareForAssignment(this.audienceURI, newAudienceURI);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceMarshaller.java
index f1af5a9..57ec61f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceMarshaller.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
 public class AudienceMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         Audience audience = (Audience) samlObject;
         ElementSupport.appendTextContent(domElement, audience.getAudienceURI());
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceRestrictionBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceRestrictionBuilder.java
index 7b41ba2..35b0c6e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceRestrictionBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceRestrictionBuilder.java
@@ -42,7 +42,7 @@ public class AudienceRestrictionBuilder extends AbstractSAMLObjectBuilder<Audien
     }
 
     /** {@inheritDoc} */
-    public AudienceRestriction buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AudienceRestriction buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AudienceRestrictionImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceRestrictionImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceRestrictionImpl.java
index 13ee94e..bcc7008 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceRestrictionImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceRestrictionImpl.java
@@ -46,7 +46,7 @@ public class AudienceRestrictionImpl extends AbstractSAMLObject implements Audie
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AudienceRestrictionImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AudienceRestrictionImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         audience = new XMLObjectChildrenList<>(this);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceRestrictionUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceRestrictionUnmarshaller.java
index dc196da..b2b14e2 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceRestrictionUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceRestrictionUnmarshaller.java
@@ -33,7 +33,7 @@ import org.opensaml.saml.saml2.core.AudienceRestriction;
 public class AudienceRestrictionUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
         AudienceRestriction audienceRestriction = (AudienceRestriction) parentObject;
 
         if (childObject instanceof Audience) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceUnmarshaller.java
index 592a2ea..e44276e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AudienceUnmarshaller.java
@@ -31,7 +31,7 @@ import org.opensaml.saml.saml2.core.Audience;
 public class AudienceUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         Audience audience = (Audience) samlObject;
         audience.setAudienceURI(elementContent);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityBuilder.java
index 71eeed7..bf8d3b1 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityBuilder.java
@@ -42,7 +42,7 @@ public class AuthenticatingAuthorityBuilder extends AbstractSAMLObjectBuilder<Au
     }
 
     /** {@inheritDoc} */
-    public AuthenticatingAuthority buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AuthenticatingAuthority buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AuthenticatingAuthorityImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityImpl.java
index 244f29a..36c9f86 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityImpl.java
@@ -42,7 +42,7 @@ public class AuthenticatingAuthorityImpl extends AbstractSAMLObject implements A
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AuthenticatingAuthorityImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AuthenticatingAuthorityImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -52,7 +52,7 @@ public class AuthenticatingAuthorityImpl extends AbstractSAMLObject implements A
     }
 
     /** {@inheritDoc} */
-    public void setURI(String newURI) {
+    public void setURI(final String newURI) {
         this.uri = prepareForAssignment(this.uri, newURI);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityMarshaller.java
index 8b6850f..b9f37b0 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityMarshaller.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
 public class AuthenticatingAuthorityMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         AuthenticatingAuthority authenticatingAuthority = (AuthenticatingAuthority) samlObject;
         ElementSupport.appendTextContent(domElement, authenticatingAuthority.getURI());
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityUnmarshaller.java
index 2db5a14..1a8b412 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthenticatingAuthorityUnmarshaller.java
@@ -31,7 +31,7 @@ import org.opensaml.saml.saml2.core.AuthenticatingAuthority;
 public class AuthenticatingAuthorityUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         AuthenticatingAuthority authenticatingAuthority = (AuthenticatingAuthority) samlObject;
         authenticatingAuthority.setURI(elementContent);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextBuilder.java
index 20c003a..f89ac90 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextBuilder.java
@@ -42,7 +42,7 @@ public class AuthnContextBuilder extends AbstractSAMLObjectBuilder<AuthnContext>
     }
 
     /** {@inheritDoc} */
-    public AuthnContext buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AuthnContext buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AuthnContextImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefBuilder.java
index ac2277c..b35c78c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefBuilder.java
@@ -42,7 +42,7 @@ public class AuthnContextClassRefBuilder extends AbstractSAMLObjectBuilder<Authn
     }
 
     /** {@inheritDoc} */
-    public AuthnContextClassRef buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AuthnContextClassRef buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AuthnContextClassRefImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefImpl.java
index f1aa1bf..f166fb7 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefImpl.java
@@ -42,7 +42,7 @@ public class AuthnContextClassRefImpl extends AbstractSAMLObject implements Auth
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AuthnContextClassRefImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AuthnContextClassRefImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -52,7 +52,7 @@ public class AuthnContextClassRefImpl extends AbstractSAMLObject implements Auth
     }
 
     /** {@inheritDoc} */
-    public void setAuthnContextClassRef(String newAuthnContextClassRef) {
+    public void setAuthnContextClassRef(final String newAuthnContextClassRef) {
         this.authnContextClassRef = prepareForAssignment(this.authnContextClassRef, newAuthnContextClassRef);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefMarshaller.java
index 74fffc0..ae23729 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefMarshaller.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
 public class AuthnContextClassRefMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         AuthnContextClassRef authnContextClassRef = (AuthnContextClassRef) samlObject;
         ElementSupport.appendTextContent(domElement, authnContextClassRef.getAuthnContextClassRef());
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefUnmarshaller.java
index b332ac5..31ac80e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextClassRefUnmarshaller.java
@@ -31,7 +31,7 @@ import org.opensaml.saml.saml2.core.AuthnContextClassRef;
 public class AuthnContextClassRefUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         AuthnContextClassRef authnContextClassRef = (AuthnContextClassRef) samlObject;
         authnContextClassRef.setAuthnContextClassRef(elementContent);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclBuilder.java
index 7accc17..66c605b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclBuilder.java
@@ -42,7 +42,7 @@ public class AuthnContextDeclBuilder extends AbstractSAMLObjectBuilder<AuthnCont
     }
 
     /** {@inheritDoc} */
-    public AuthnContextDecl buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AuthnContextDecl buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AuthnContextDeclImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclImpl.java
index f97d5f2..a945359 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclImpl.java
@@ -53,7 +53,7 @@ public class AuthnContextDeclImpl extends AbstractSAMLObject implements AuthnCon
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AuthnContextDeclImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AuthnContextDeclImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
 
         unknownXMLObjects = new IndexedXMLObjectChildrenList<>(this);
@@ -66,7 +66,7 @@ public class AuthnContextDeclImpl extends AbstractSAMLObject implements AuthnCon
     }
 
     /** {@inheritDoc} */
-    public void setTextContent(String newContent) {
+    public void setTextContent(final String newContent) {
         textContent = prepareForAssignment(textContent, newContent);
     }
 
@@ -76,7 +76,7 @@ public class AuthnContextDeclImpl extends AbstractSAMLObject implements AuthnCon
     }
     
     /** {@inheritDoc} */
-    public List<XMLObject> getUnknownXMLObjects(QName typeOrName) {
+    public List<XMLObject> getUnknownXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) unknownXMLObjects.subList(typeOrName);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclMarshaller.java
index 9a99171..ad7172b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclMarshaller.java
@@ -42,7 +42,7 @@ import org.w3c.dom.Element;
 public class AuthnContextDeclMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         AuthnContextDecl authnCtxDecl = (AuthnContextDecl) xmlObject;
 
         Attr attribute;
@@ -58,7 +58,7 @@ public class AuthnContextDeclMarshaller extends AbstractSAMLObjectMarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         AuthnContextDecl authnCtxDecl = (AuthnContextDecl) xmlObject;
 
         if (authnCtxDecl.getTextContent() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefBuilder.java
index 99022fa..06a4a35 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefBuilder.java
@@ -42,7 +42,7 @@ public class AuthnContextDeclRefBuilder extends AbstractSAMLObjectBuilder<AuthnC
     }
 
     /** {@inheritDoc} */
-    public AuthnContextDeclRef buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AuthnContextDeclRef buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AuthnContextDeclRefImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefImpl.java
index 932df5b..6fe4baf 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefImpl.java
@@ -42,7 +42,7 @@ public class AuthnContextDeclRefImpl extends AbstractSAMLObject implements Authn
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AuthnContextDeclRefImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AuthnContextDeclRefImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -52,7 +52,7 @@ public class AuthnContextDeclRefImpl extends AbstractSAMLObject implements Authn
     }
 
     /** {@inheritDoc} */
-    public void setAuthnContextDeclRef(String newAuthnContextDeclRef) {
+    public void setAuthnContextDeclRef(final String newAuthnContextDeclRef) {
         this.authnContextDeclRef = prepareForAssignment(this.authnContextDeclRef, newAuthnContextDeclRef);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefMarshaller.java
index 93c348d..3d6c0ff 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefMarshaller.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
 public class AuthnContextDeclRefMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         AuthnContextDeclRef authnContextDeclRef = (AuthnContextDeclRef) samlObject;
         ElementSupport.appendTextContent(domElement, authnContextDeclRef.getAuthnContextDeclRef());
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefUnmarshaller.java
index 64c37b4..0988b88 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclRefUnmarshaller.java
@@ -31,7 +31,7 @@ import org.opensaml.saml.saml2.core.AuthnContextDeclRef;
 public class AuthnContextDeclRefUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         AuthnContextDeclRef authnContextDeclRef = (AuthnContextDeclRef) samlObject;
         authnContextDeclRef.setAuthnContextDeclRef(elementContent);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclUnmarshaller.java
index 360eef9..2c80336 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextDeclUnmarshaller.java
@@ -37,7 +37,7 @@ import org.w3c.dom.Attr;
 public class AuthnContextDeclUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         AuthnContextDecl authnCtcDecl = (AuthnContextDecl) parentXMLObject;
 
@@ -45,7 +45,7 @@ public class AuthnContextDeclUnmarshaller extends AbstractSAMLObjectUnmarshaller
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         AuthnContextDecl authnCtcDecl = (AuthnContextDecl) xmlObject;
 
         QName attribQName = QNameSupport.constructQName(attribute.getNamespaceURI(), attribute.getLocalName(), attribute
@@ -59,7 +59,7 @@ public class AuthnContextDeclUnmarshaller extends AbstractSAMLObjectUnmarshaller
     }
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject xmlObject, String elementContent) {
+    protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
         AuthnContextDecl authnCtcDecl = (AuthnContextDecl) xmlObject;
 
         authnCtcDecl.setTextContent(elementContent);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextImpl.java
index e2d57a7..c80f4d8 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextImpl.java
@@ -58,7 +58,7 @@ public class AuthnContextImpl extends AbstractSAMLObject implements AuthnContext
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AuthnContextImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AuthnContextImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         authenticatingAuthority = new XMLObjectChildrenList<>(this);
     }
@@ -69,7 +69,7 @@ public class AuthnContextImpl extends AbstractSAMLObject implements AuthnContext
     }
 
     /** {@inheritDoc} */
-    public void setAuthnContextClassRef(AuthnContextClassRef newAuthnContextClassRef) {
+    public void setAuthnContextClassRef(final AuthnContextClassRef newAuthnContextClassRef) {
         this.authnContextClassRef = prepareForAssignment(this.authnContextClassRef, newAuthnContextClassRef);
     }
 
@@ -79,7 +79,7 @@ public class AuthnContextImpl extends AbstractSAMLObject implements AuthnContext
     }
 
     /** {@inheritDoc} */
-    public void setAuthnContextDecl(AuthnContextDecl newAuthnContextDecl) {
+    public void setAuthnContextDecl(final AuthnContextDecl newAuthnContextDecl) {
         this.authnContextDecl = prepareForAssignment(this.authnContextDecl, newAuthnContextDecl);
     }
 
@@ -89,7 +89,7 @@ public class AuthnContextImpl extends AbstractSAMLObject implements AuthnContext
     }
 
     /** {@inheritDoc} */
-    public void setAuthnContextDeclRef(AuthnContextDeclRef newAuthnContextDeclRef) {
+    public void setAuthnContextDeclRef(final AuthnContextDeclRef newAuthnContextDeclRef) {
         this.authnContextDeclRef = prepareForAssignment(this.authnContextDeclRef, newAuthnContextDeclRef);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextUnmarshaller.java
index 33cd5f5..05a2bc9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnContextUnmarshaller.java
@@ -36,7 +36,7 @@ import org.opensaml.saml.saml2.core.AuthnContextDeclRef;
 public class AuthnContextUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
         AuthnContext authnContext = (AuthnContext) parentObject;
         if (childObject instanceof AuthnContextClassRef) {
             authnContext.setAuthnContextClassRef((AuthnContextClassRef) childObject);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnQueryBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnQueryBuilder.java
index 3f6d57c..d76d895 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnQueryBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnQueryBuilder.java
@@ -44,7 +44,7 @@ public class AuthnQueryBuilder extends AbstractSAMLObjectBuilder<AuthnQuery> {
     }
 
     /** {@inheritDoc} */
-    public AuthnQuery buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AuthnQuery buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AuthnQueryImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnQueryImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnQueryImpl.java
index e0a39ea..f36bec4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnQueryImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnQueryImpl.java
@@ -47,7 +47,7 @@ public class AuthnQueryImpl extends SubjectQueryImpl implements AuthnQuery {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AuthnQueryImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AuthnQueryImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -57,7 +57,7 @@ public class AuthnQueryImpl extends SubjectQueryImpl implements AuthnQuery {
     }
 
     /** {@inheritDoc} */
-    public void setSessionIndex(String newSessionIndex) {
+    public void setSessionIndex(final String newSessionIndex) {
         this.sessionIndex = prepareForAssignment(this.sessionIndex, newSessionIndex);
     }
 
@@ -67,7 +67,7 @@ public class AuthnQueryImpl extends SubjectQueryImpl implements AuthnQuery {
     }
 
     /** {@inheritDoc} */
-    public void setRequestedAuthnContext(RequestedAuthnContext newRequestedAuthnContext) {
+    public void setRequestedAuthnContext(final RequestedAuthnContext newRequestedAuthnContext) {
         this.requestedAuthnContext = prepareForAssignment(this.requestedAuthnContext, newRequestedAuthnContext);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnQueryMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnQueryMarshaller.java
index 05193cd..ed9b3e5 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnQueryMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnQueryMarshaller.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Element;
 public class AuthnQueryMarshaller extends SubjectQueryMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         AuthnQuery query = (AuthnQuery) samlObject;
 
         if (query.getSessionIndex() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnQueryUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnQueryUnmarshaller.java
index 38d1e3f..777ff21 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnQueryUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnQueryUnmarshaller.java
@@ -33,7 +33,7 @@ import org.w3c.dom.Attr;
 public class AuthnQueryUnmarshaller extends SubjectQueryUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         final AuthnQuery query = (AuthnQuery) parentSAMLObject;
     
@@ -45,7 +45,7 @@ public class AuthnQueryUnmarshaller extends SubjectQueryUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final AuthnQuery query = (AuthnQuery) samlObject;
 
         if (attribute.getLocalName().equals(AuthnQuery.SESSION_INDEX_ATTRIB_NAME)
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnRequestBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnRequestBuilder.java
index 0ade4d0..60d5332 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnRequestBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnRequestBuilder.java
@@ -44,7 +44,7 @@ public class AuthnRequestBuilder extends AbstractSAMLObjectBuilder<AuthnRequest>
     }
 
     /** {@inheritDoc} */
-    public AuthnRequest buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AuthnRequest buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AuthnRequestImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnRequestImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnRequestImpl.java
index 7b4126e..e546c8a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnRequestImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnRequestImpl.java
@@ -82,7 +82,7 @@ public class AuthnRequestImpl extends RequestAbstractTypeImpl implements AuthnRe
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AuthnRequestImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AuthnRequestImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -101,7 +101,7 @@ public class AuthnRequestImpl extends RequestAbstractTypeImpl implements AuthnRe
     }
 
     /** {@inheritDoc} */
-    public void setForceAuthn(Boolean newForceAuth) {
+    public void setForceAuthn(final Boolean newForceAuth) {
         if (newForceAuth != null) {
             forceAuthn = prepareForAssignment(forceAuthn, new XSBooleanValue(newForceAuth, false));
         } else {
@@ -110,7 +110,7 @@ public class AuthnRequestImpl extends RequestAbstractTypeImpl implements AuthnRe
     }
 
     /** {@inheritDoc} */
-    public void setForceAuthn(XSBooleanValue newForceAuthn) {
+    public void setForceAuthn(final XSBooleanValue newForceAuthn) {
         forceAuthn = prepareForAssignment(this.forceAuthn, newForceAuthn);
     }
 
@@ -129,7 +129,7 @@ public class AuthnRequestImpl extends RequestAbstractTypeImpl implements AuthnRe
     }
 
     /** {@inheritDoc} */
-    public void setIsPassive(Boolean newIsPassive) {
+    public void setIsPassive(final Boolean newIsPassive) {
         if (newIsPassive != null) {
             isPassive = prepareForAssignment(isPassive, new XSBooleanValue(newIsPassive, false));
         } else {
@@ -138,7 +138,7 @@ public class AuthnRequestImpl extends RequestAbstractTypeImpl implements AuthnRe
     }
 
     /** {@inheritDoc} */
-    public void setIsPassive(XSBooleanValue newIsPassive) {
+    public void setIsPassive(final XSBooleanValue newIsPassive) {
         this.isPassive = prepareForAssignment(this.isPassive, newIsPassive);
     }
 
@@ -148,7 +148,7 @@ public class AuthnRequestImpl extends RequestAbstractTypeImpl implements AuthnRe
     }
 
     /** {@inheritDoc} */
-    public void setProtocolBinding(String newProtocolBinding) {
+    public void setProtocolBinding(final String newProtocolBinding) {
         this.protocolBinding = prepareForAssignment(this.protocolBinding, newProtocolBinding);
     }
 
@@ -158,7 +158,7 @@ public class AuthnRequestImpl extends RequestAbstractTypeImpl implements AuthnRe
     }
 
     /** {@inheritDoc} */
-    public void setAssertionConsumerServiceIndex(Integer newAssertionConsumerServiceIndex) {
+    public void setAssertionConsumerServiceIndex(final Integer newAssertionConsumerServiceIndex) {
         this.assertionConsumerServiceIndex = prepareForAssignment(this.assertionConsumerServiceIndex,
                 newAssertionConsumerServiceIndex);
     }
@@ -169,7 +169,7 @@ public class AuthnRequestImpl extends RequestAbstractTypeImpl implements AuthnRe
     }
 
     /** {@inheritDoc} */
-    public void setAssertionConsumerServiceURL(String newAssertionConsumerServiceURL) {
+    public void setAssertionConsumerServiceURL(final String newAssertionConsumerServiceURL) {
         this.assertionConsumerServiceURL = prepareForAssignment(this.assertionConsumerServiceURL,
                 newAssertionConsumerServiceURL);
     }
@@ -180,7 +180,7 @@ public class AuthnRequestImpl extends RequestAbstractTypeImpl implements AuthnRe
     }
 
     /** {@inheritDoc} */
-    public void setAttributeConsumingServiceIndex(Integer newAttributeConsumingServiceIndex) {
+    public void setAttributeConsumingServiceIndex(final Integer newAttributeConsumingServiceIndex) {
         this.attributeConsumingServiceIndex = prepareForAssignment(this.attributeConsumingServiceIndex,
                 newAttributeConsumingServiceIndex);
     }
@@ -191,7 +191,7 @@ public class AuthnRequestImpl extends RequestAbstractTypeImpl implements AuthnRe
     }
 
     /** {@inheritDoc} */
-    public void setProviderName(String newProviderName) {
+    public void setProviderName(final String newProviderName) {
         this.providerName = prepareForAssignment(this.providerName, newProviderName);
     }
 
@@ -201,7 +201,7 @@ public class AuthnRequestImpl extends RequestAbstractTypeImpl implements AuthnRe
     }
 
     /** {@inheritDoc} */
-    public void setSubject(Subject newSubject) {
+    public void setSubject(final Subject newSubject) {
         this.subject = prepareForAssignment(this.subject, newSubject);
     }
 
@@ -211,7 +211,7 @@ public class AuthnRequestImpl extends RequestAbstractTypeImpl implements AuthnRe
     }
 
     /** {@inheritDoc} */
-    public void setNameIDPolicy(NameIDPolicy newNameIDPolicy) {
+    public void setNameIDPolicy(final NameIDPolicy newNameIDPolicy) {
         this.nameIDPolicy = prepareForAssignment(this.nameIDPolicy, newNameIDPolicy);
     }
 
@@ -221,7 +221,7 @@ public class AuthnRequestImpl extends RequestAbstractTypeImpl implements AuthnRe
     }
 
     /** {@inheritDoc} */
-    public void setConditions(Conditions newConditions) {
+    public void setConditions(final Conditions newConditions) {
         this.conditions = prepareForAssignment(this.conditions, newConditions);
     }
 
@@ -231,7 +231,7 @@ public class AuthnRequestImpl extends RequestAbstractTypeImpl implements AuthnRe
     }
 
     /** {@inheritDoc} */
-    public void setRequestedAuthnContext(RequestedAuthnContext newRequestedAuthnContext) {
+    public void setRequestedAuthnContext(final RequestedAuthnContext newRequestedAuthnContext) {
         this.requestedAuthnContext = prepareForAssignment(this.requestedAuthnContext, newRequestedAuthnContext);
     }
 
@@ -241,7 +241,7 @@ public class AuthnRequestImpl extends RequestAbstractTypeImpl implements AuthnRe
     }
 
     /** {@inheritDoc} */
-    public void setScoping(Scoping newScoping) {
+    public void setScoping(final Scoping newScoping) {
         this.scoping = prepareForAssignment(this.scoping, newScoping);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnRequestMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnRequestMarshaller.java
index 5553dda..a69efff 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnRequestMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnRequestMarshaller.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Element;
 public class AuthnRequestMarshaller extends RequestAbstractTypeMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         AuthnRequest req = (AuthnRequest) samlObject;
 
         if (req.isForceAuthnXSBoolean() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnRequestUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnRequestUnmarshaller.java
index 935562c..8a8e428 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnRequestUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnRequestUnmarshaller.java
@@ -38,7 +38,7 @@ import org.w3c.dom.Attr;
 public class AuthnRequestUnmarshaller extends RequestAbstractTypeUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         final AuthnRequest req = (AuthnRequest) parentSAMLObject;
     
@@ -58,7 +58,7 @@ public class AuthnRequestUnmarshaller extends RequestAbstractTypeUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final AuthnRequest req = (AuthnRequest) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnStatementBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnStatementBuilder.java
index a87c453..13bec6c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnStatementBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnStatementBuilder.java
@@ -41,7 +41,7 @@ public class AuthnStatementBuilder extends AbstractSAMLObjectBuilder<AuthnStatem
     }
 
     /** {@inheritDoc} */
-    public AuthnStatement buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AuthnStatement buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AuthnStatementImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnStatementImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnStatementImpl.java
index de90a80..e8a535e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnStatementImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnStatementImpl.java
@@ -59,7 +59,7 @@ public class AuthnStatementImpl extends AbstractSAMLObject implements AuthnState
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AuthnStatementImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AuthnStatementImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -69,7 +69,7 @@ public class AuthnStatementImpl extends AbstractSAMLObject implements AuthnState
     }
 
     /** {@inheritDoc} */
-    public void setSubjectLocality(SubjectLocality newSubjectLocality) {
+    public void setSubjectLocality(final SubjectLocality newSubjectLocality) {
         this.subjectLocality = prepareForAssignment(this.subjectLocality, newSubjectLocality);
     }
 
@@ -79,7 +79,7 @@ public class AuthnStatementImpl extends AbstractSAMLObject implements AuthnState
     }
 
     /** {@inheritDoc} */
-    public void setAuthnContext(AuthnContext newAuthnContext) {
+    public void setAuthnContext(final AuthnContext newAuthnContext) {
         this.authnContext = prepareForAssignment(this.authnContext, newAuthnContext);
     }
 
@@ -89,7 +89,7 @@ public class AuthnStatementImpl extends AbstractSAMLObject implements AuthnState
     }
 
     /** {@inheritDoc} */
-    public void setAuthnInstant(DateTime newAuthnInstant) {
+    public void setAuthnInstant(final DateTime newAuthnInstant) {
         this.authnInstant = prepareForAssignment(this.authnInstant, newAuthnInstant);
     }
 
@@ -99,7 +99,7 @@ public class AuthnStatementImpl extends AbstractSAMLObject implements AuthnState
     }
 
     /** {@inheritDoc} */
-    public void setSessionIndex(String newSessionIndex) {
+    public void setSessionIndex(final String newSessionIndex) {
         this.sessionIndex = prepareForAssignment(this.sessionIndex, newSessionIndex);
     }
 
@@ -109,7 +109,7 @@ public class AuthnStatementImpl extends AbstractSAMLObject implements AuthnState
     }
 
     /** {@inheritDoc} */
-    public void setSessionNotOnOrAfter(DateTime newSessionNotOnOrAfter) {
+    public void setSessionNotOnOrAfter(final DateTime newSessionNotOnOrAfter) {
         this.sessionNotOnOrAfter = prepareForAssignment(this.sessionNotOnOrAfter, newSessionNotOnOrAfter);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnStatementMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnStatementMarshaller.java
index 1047a18..b98fd45 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnStatementMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnStatementMarshaller.java
@@ -34,7 +34,7 @@ import org.w3c.dom.Element;
 public class AuthnStatementMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         AuthnStatement authnStatement = (AuthnStatement) samlObject;
 
         if (authnStatement.getAuthnInstant() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnStatementUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnStatementUnmarshaller.java
index 32ec2ec..1311acc 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnStatementUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthnStatementUnmarshaller.java
@@ -39,7 +39,7 @@ import com.google.common.base.Strings;
 public class AuthnStatementUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
         final AuthnStatement authnStatement = (AuthnStatement) parentObject;
         if (childObject instanceof SubjectLocality) {
             authnStatement.setSubjectLocality((SubjectLocality) childObject);
@@ -51,7 +51,7 @@ public class AuthnStatementUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final AuthnStatement authnStatement = (AuthnStatement) samlObject;
         
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionQueryBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionQueryBuilder.java
index b5ce957..7e3d899 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionQueryBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionQueryBuilder.java
@@ -44,7 +44,7 @@ public class AuthzDecisionQueryBuilder extends AbstractSAMLObjectBuilder<AuthzDe
     }
 
     /** {@inheritDoc} */
-    public AuthzDecisionQuery buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AuthzDecisionQuery buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AuthzDecisionQueryImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionQueryImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionQueryImpl.java
index e2fabb0..96f7fb4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionQueryImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionQueryImpl.java
@@ -52,7 +52,7 @@ public class AuthzDecisionQueryImpl extends SubjectQueryImpl implements AuthzDec
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AuthzDecisionQueryImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AuthzDecisionQueryImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         actions = new XMLObjectChildrenList<>(this);
     }
@@ -63,7 +63,7 @@ public class AuthzDecisionQueryImpl extends SubjectQueryImpl implements AuthzDec
     }
 
     /** {@inheritDoc} */
-    public void setResource(String newResource) {
+    public void setResource(final String newResource) {
         this.resource = prepareForAssignment(this.resource, newResource);
     }
 
@@ -78,7 +78,7 @@ public class AuthzDecisionQueryImpl extends SubjectQueryImpl implements AuthzDec
     }
 
     /** {@inheritDoc} */
-    public void setEvidence(Evidence newEvidence) {
+    public void setEvidence(final Evidence newEvidence) {
         this.evidence = prepareForAssignment(this.evidence, newEvidence);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionQueryMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionQueryMarshaller.java
index 07030cb..a52935e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionQueryMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionQueryMarshaller.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Element;
 public class AuthzDecisionQueryMarshaller extends SubjectQueryMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         AuthzDecisionQuery query = (AuthzDecisionQuery) samlObject;
 
         if (query.getResource() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionQueryUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionQueryUnmarshaller.java
index fc53cee..3a93c55 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionQueryUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionQueryUnmarshaller.java
@@ -34,7 +34,7 @@ import org.w3c.dom.Attr;
 public class AuthzDecisionQueryUnmarshaller extends SubjectQueryUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         final AuthzDecisionQuery query = (AuthzDecisionQuery) parentSAMLObject;
     
@@ -48,7 +48,7 @@ public class AuthzDecisionQueryUnmarshaller extends SubjectQueryUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final AuthzDecisionQuery query = (AuthzDecisionQuery) samlObject;
 
         if (attribute.getLocalName().equals(AuthzDecisionQuery.RESOURCE_ATTRIB_NAME)
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementBuilder.java
index cbd2539..6a24028 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementBuilder.java
@@ -42,7 +42,7 @@ public class AuthzDecisionStatementBuilder extends AbstractSAMLObjectBuilder<Aut
     }
 
     /** {@inheritDoc} */
-    public AuthzDecisionStatement buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AuthzDecisionStatement buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AuthzDecisionStatementImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementImpl.java
index 73feab8..0beaeb8 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementImpl.java
@@ -57,7 +57,7 @@ public class AuthzDecisionStatementImpl extends AbstractSAMLObject implements Au
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AuthzDecisionStatementImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AuthzDecisionStatementImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         actions = new XMLObjectChildrenList<>(this);
     }
@@ -68,7 +68,7 @@ public class AuthzDecisionStatementImpl extends AbstractSAMLObject implements Au
     }
 
     /** {@inheritDoc} */
-    public void setResource(String newResourceURI) {
+    public void setResource(final String newResourceURI) {
         this.resource = prepareForAssignment(this.resource, newResourceURI, false);
     }
 
@@ -78,7 +78,7 @@ public class AuthzDecisionStatementImpl extends AbstractSAMLObject implements Au
     }
 
     /** {@inheritDoc} */
-    public void setDecision(DecisionTypeEnumeration newDecision) {
+    public void setDecision(final DecisionTypeEnumeration newDecision) {
         this.decision = prepareForAssignment(this.decision, newDecision);
     }
 
@@ -93,7 +93,7 @@ public class AuthzDecisionStatementImpl extends AbstractSAMLObject implements Au
     }
 
     /** {@inheritDoc} */
-    public void setEvidence(Evidence newEvidence) {
+    public void setEvidence(final Evidence newEvidence) {
         this.evidence = prepareForAssignment(this.evidence, newEvidence);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementMarshaller.java
index 805e08b..df7066a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementMarshaller.java
@@ -33,7 +33,7 @@ import org.w3c.dom.Element;
 public class AuthzDecisionStatementMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         AuthzDecisionStatement authzDS = (AuthzDecisionStatement) samlObject;
 
         if (authzDS.getResource() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementUnmarshaller.java
index 5f91bb0..8f0c713 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AuthzDecisionStatementUnmarshaller.java
@@ -36,7 +36,7 @@ import org.w3c.dom.Attr;
 public class AuthzDecisionStatementUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
         final AuthzDecisionStatement authzDS = (AuthzDecisionStatement) parentObject;
 
         if (childObject instanceof Action) {
@@ -49,7 +49,7 @@ public class AuthzDecisionStatementUnmarshaller extends AbstractSAMLObjectUnmars
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final AuthzDecisionStatement authzDS = (AuthzDecisionStatement) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/BaseIDImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/BaseIDImpl.java
index 6dabd0c..6a875b5 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/BaseIDImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/BaseIDImpl.java
@@ -41,7 +41,7 @@ public abstract class BaseIDImpl extends AbstractSAMLObject implements BaseID {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected BaseIDImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected BaseIDImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -51,7 +51,7 @@ public abstract class BaseIDImpl extends AbstractSAMLObject implements BaseID {
     }
 
     /** {@inheritDoc} */
-    public void setNameQualifier(String newNameQualifier) {
+    public void setNameQualifier(final String newNameQualifier) {
         this.nameQualifier = prepareForAssignment(this.nameQualifier, newNameQualifier);
     }
 
@@ -61,7 +61,7 @@ public abstract class BaseIDImpl extends AbstractSAMLObject implements BaseID {
     }
 
     /** {@inheritDoc} */
-    public void setSPNameQualifier(String newSPNameQualifier) {
+    public void setSPNameQualifier(final String newSPNameQualifier) {
         this.spNameQualfier = prepareForAssignment(this.spNameQualfier, newSPNameQualifier);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/BaseIDMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/BaseIDMarshaller.java
index db62507..c6b07f9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/BaseIDMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/BaseIDMarshaller.java
@@ -33,7 +33,7 @@ import org.w3c.dom.Element;
 public abstract class BaseIDMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         BaseID baseID = (BaseID) samlObject;
         if (baseID.getNameQualifier() != null) {
             domElement.setAttributeNS(null, BaseID.NAME_QUALIFIER_ATTRIB_NAME, baseID.getNameQualifier());
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/BaseIDUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/BaseIDUnmarshaller.java
index 2a169b0..63fd12a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/BaseIDUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/BaseIDUnmarshaller.java
@@ -33,7 +33,7 @@ import org.w3c.dom.Attr;
 public abstract class BaseIDUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final BaseID baseID = (BaseID) samlObject;
         
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsBuilder.java
index b9ebc73..4d3a062 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsBuilder.java
@@ -41,7 +41,7 @@ public class ConditionsBuilder extends AbstractSAMLObjectBuilder<Conditions> {
     }
 
     /** {@inheritDoc} */
-    public Conditions buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Conditions buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ConditionsImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsImpl.java
index 74e0ed9..183a76b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsImpl.java
@@ -59,7 +59,7 @@ public class ConditionsImpl extends AbstractSAMLObject implements Conditions {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ConditionsImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ConditionsImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         conditions = new IndexedXMLObjectChildrenList<>(this);
     }
@@ -106,7 +106,7 @@ public class ConditionsImpl extends AbstractSAMLObject implements Conditions {
     }
 
     /** {@inheritDoc} */
-    public void setNotBefore(DateTime newNotBefore) {
+    public void setNotBefore(final DateTime newNotBefore) {
         this.notBefore = prepareForAssignment(this.notBefore, newNotBefore);
     }
 
@@ -116,7 +116,7 @@ public class ConditionsImpl extends AbstractSAMLObject implements Conditions {
     }
 
     /** {@inheritDoc} */
-    public void setNotOnOrAfter(DateTime newNotOnOrAfter) {
+    public void setNotOnOrAfter(final DateTime newNotOnOrAfter) {
         this.notOnOrAfter = prepareForAssignment(this.notOnOrAfter, newNotOnOrAfter);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsMarshaller.java
index 823af50..17f3fd2 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsMarshaller.java
@@ -34,7 +34,7 @@ import org.w3c.dom.Element;
 public class ConditionsMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         Conditions conditions = (Conditions) samlObject;
 
         if (conditions.getNotBefore() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsUnmarshaller.java
index 72f19c0..9a007f6 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsUnmarshaller.java
@@ -38,7 +38,7 @@ import com.google.common.base.Strings;
 public class ConditionsUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
         final Conditions conditions = (Conditions) parentObject;
 
         if (childObject instanceof Condition) {
@@ -49,7 +49,7 @@ public class ConditionsUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final Conditions conditions = (Conditions) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedAssertionBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedAssertionBuilder.java
index dfd3758..9f45549 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedAssertionBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedAssertionBuilder.java
@@ -40,7 +40,7 @@ public class EncryptedAssertionBuilder extends AbstractSAMLObjectBuilder<Encrypt
     }
 
     /** {@inheritDoc} */
-    public EncryptedAssertion buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public EncryptedAssertion buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new EncryptedAssertionImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedAssertionImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedAssertionImpl.java
index 3310170..88dddc9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedAssertionImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedAssertionImpl.java
@@ -31,7 +31,7 @@ public class EncryptedAssertionImpl extends EncryptedElementTypeImpl implements
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected EncryptedAssertionImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected EncryptedAssertionImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedAttributeBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedAttributeBuilder.java
index 0561af1..6ea8737 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedAttributeBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedAttributeBuilder.java
@@ -40,7 +40,7 @@ public class EncryptedAttributeBuilder extends AbstractSAMLObjectBuilder<Encrypt
     }
 
     /** {@inheritDoc} */
-    public EncryptedAttribute buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public EncryptedAttribute buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new EncryptedAttributeImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedAttributeImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedAttributeImpl.java
index 6212bbe..d4852e4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedAttributeImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedAttributeImpl.java
@@ -31,7 +31,7 @@ public class EncryptedAttributeImpl extends EncryptedElementTypeImpl implements
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected EncryptedAttributeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected EncryptedAttributeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedElementTypeImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedElementTypeImpl.java
index 9f98ec5..6dbc012 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedElementTypeImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedElementTypeImpl.java
@@ -46,7 +46,7 @@ public class EncryptedElementTypeImpl extends AbstractSAMLObject implements Encr
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected EncryptedElementTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected EncryptedElementTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         encryptedKeys = new XMLObjectChildrenList<>(this);
     }
@@ -57,7 +57,7 @@ public class EncryptedElementTypeImpl extends AbstractSAMLObject implements Encr
     }
 
     /** {@inheritDoc} */
-    public void setEncryptedData(EncryptedData newEncryptedData) {
+    public void setEncryptedData(final EncryptedData newEncryptedData) {
         this.encryptedData = prepareForAssignment(this.encryptedData, newEncryptedData);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedElementTypeUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedElementTypeUnmarshaller.java
index c448df6..83ed68e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedElementTypeUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedElementTypeUnmarshaller.java
@@ -30,7 +30,7 @@ import org.opensaml.xmlsec.encryption.EncryptedKey;
 public class EncryptedElementTypeUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         EncryptedElementType eet = (EncryptedElementType) parentSAMLObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedIDBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedIDBuilder.java
index f31b880..482cf03 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedIDBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedIDBuilder.java
@@ -40,7 +40,7 @@ public class EncryptedIDBuilder extends AbstractSAMLObjectBuilder<EncryptedID> {
     }
 
     /** {@inheritDoc} */
-    public EncryptedID buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public EncryptedID buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new EncryptedIDImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedIDImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedIDImpl.java
index c54bca9..1b5bd9c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedIDImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EncryptedIDImpl.java
@@ -31,7 +31,7 @@ public class EncryptedIDImpl extends EncryptedElementTypeImpl implements Encrypt
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected EncryptedIDImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected EncryptedIDImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EvidenceBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EvidenceBuilder.java
index f6d42ff..1339311 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EvidenceBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EvidenceBuilder.java
@@ -41,7 +41,7 @@ public class EvidenceBuilder extends AbstractSAMLObjectBuilder<Evidence> {
     }
 
     /** {@inheritDoc} */
-    public Evidence buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Evidence buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new EvidenceImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EvidenceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EvidenceImpl.java
index 05a78fd..306a53c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EvidenceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EvidenceImpl.java
@@ -50,7 +50,7 @@ public class EvidenceImpl extends AbstractSAMLObject implements Evidence {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected EvidenceImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected EvidenceImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         evidence = new IndexedXMLObjectChildrenList<>(this);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EvidenceUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EvidenceUnmarshaller.java
index 271272e..6d8a8a4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EvidenceUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/EvidenceUnmarshaller.java
@@ -36,7 +36,7 @@ import org.opensaml.saml.saml2.core.Evidence;
 public class EvidenceUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
         Evidence evidence = (Evidence) parentObject;
 
         if (childObject instanceof AssertionIDRef) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ExtensionsBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ExtensionsBuilder.java
index 0b2c45c..4b8a525 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ExtensionsBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ExtensionsBuilder.java
@@ -37,7 +37,7 @@ public class ExtensionsBuilder extends AbstractSAMLObjectBuilder<Extensions> {
     /**
      * {@inheritDoc}
      */
-    public Extensions buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Extensions buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ExtensionsImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ExtensionsImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ExtensionsImpl.java
index 8733753..8572777 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ExtensionsImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ExtensionsImpl.java
@@ -43,7 +43,7 @@ public class ExtensionsImpl extends AbstractSAMLObject implements Extensions {
      * @param elementLocalName local name
      * @param namespacePrefix prefix
      */
-    protected ExtensionsImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ExtensionsImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         unknownChildren = new IndexedXMLObjectChildrenList<>(this);
     }
@@ -56,7 +56,7 @@ public class ExtensionsImpl extends AbstractSAMLObject implements Extensions {
     }
     
     /** {@inheritDoc} */
-    public List<XMLObject> getUnknownXMLObjects(QName typeOrName) {
+    public List<XMLObject> getUnknownXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) unknownChildren.subList(typeOrName);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ExtensionsMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ExtensionsMarshaller.java
index 07b1d9e..2e36f8f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ExtensionsMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ExtensionsMarshaller.java
@@ -37,14 +37,14 @@ public class ExtensionsMarshaller extends AbstractSAMLObjectMarshaller {
     /**
      * {@inheritDoc}
      */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         // no attributes
     }
 
     /**
      * {@inheritDoc}
      */
-    protected void marshallElementContent(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         // no content
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ExtensionsUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ExtensionsUnmarshaller.java
index 385a7d8..edec5b7 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ExtensionsUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ExtensionsUnmarshaller.java
@@ -42,7 +42,7 @@ public class ExtensionsUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     /**
      * {@inheritDoc}
      */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         Extensions extensions = (Extensions) parentXMLObject;
 
@@ -52,14 +52,14 @@ public class ExtensionsUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     /**
      * {@inheritDoc}
      */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         log.debug("Ignorning unknown attribute {}", attribute.getLocalName());
     }
 
     /**
      * {@inheritDoc}
      */
-    protected void processElementContent(XMLObject xmlObject, String elementContent) {
+    protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
         log.debug("Ignoring element content {}", elementContent);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteBuilder.java
index fd7cc00..985076b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteBuilder.java
@@ -43,7 +43,7 @@ public class GetCompleteBuilder extends AbstractSAMLObjectBuilder<GetComplete> {
     }
 
     /** {@inheritDoc} */
-    public GetComplete buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public GetComplete buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new GetCompleteImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteImpl.java
index 7028cae..379f60e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteImpl.java
@@ -42,7 +42,7 @@ public class GetCompleteImpl extends AbstractSAMLObject implements GetComplete {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected GetCompleteImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected GetCompleteImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -52,7 +52,7 @@ public class GetCompleteImpl extends AbstractSAMLObject implements GetComplete {
     }
 
     /** {@inheritDoc} */
-    public void setGetComplete(String newGetComplete) {
+    public void setGetComplete(final String newGetComplete) {
         this.getComplete = prepareForAssignment(this.getComplete, newGetComplete);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteMarshaller.java
index 93aa354..cb4c9c4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteMarshaller.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
 public class GetCompleteMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         GetComplete gc = (GetComplete) samlObject;
 
         if (gc.getGetComplete() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteUnmarshaller.java
index dda2dbf..3a27bff 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/GetCompleteUnmarshaller.java
@@ -31,7 +31,7 @@ import org.opensaml.saml.saml2.core.GetComplete;
 public class GetCompleteUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         GetComplete gc = (GetComplete) samlObject;
 
         gc.setGetComplete(elementContent);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPEntryBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPEntryBuilder.java
index d9e1c1c..603e241 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPEntryBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPEntryBuilder.java
@@ -42,7 +42,7 @@ public class IDPEntryBuilder extends AbstractSAMLObjectBuilder<IDPEntry> {
     }
 
     /** {@inheritDoc} */
-    public IDPEntry buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public IDPEntry buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new IDPEntryImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPEntryImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPEntryImpl.java
index 8b2a354..c8efccc 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPEntryImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPEntryImpl.java
@@ -51,7 +51,7 @@ public class IDPEntryImpl extends AbstractSAMLObject implements IDPEntry {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected IDPEntryImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected IDPEntryImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -61,7 +61,7 @@ public class IDPEntryImpl extends AbstractSAMLObject implements IDPEntry {
     }
 
     /** {@inheritDoc} */
-    public void setProviderID(String newProviderID) {
+    public void setProviderID(final String newProviderID) {
         this.providerID = prepareForAssignment(this.providerID, newProviderID);
 
     }
@@ -72,7 +72,7 @@ public class IDPEntryImpl extends AbstractSAMLObject implements IDPEntry {
     }
 
     /** {@inheritDoc} */
-    public void setName(String newName) {
+    public void setName(final String newName) {
         this.name = prepareForAssignment(this.name, newName);
 
     }
@@ -83,7 +83,7 @@ public class IDPEntryImpl extends AbstractSAMLObject implements IDPEntry {
     }
 
     /** {@inheritDoc} */
-    public void setLoc(String newLoc) {
+    public void setLoc(final String newLoc) {
         this.loc = prepareForAssignment(this.loc, newLoc);
 
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPEntryMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPEntryMarshaller.java
index a299921..0c694f9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPEntryMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPEntryMarshaller.java
@@ -33,7 +33,7 @@ import org.w3c.dom.Element;
 public class IDPEntryMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         IDPEntry entry = (IDPEntry) samlObject;
 
         if (entry.getProviderID() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPEntryUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPEntryUnmarshaller.java
index c7e9f21..8de0aec 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPEntryUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPEntryUnmarshaller.java
@@ -33,7 +33,7 @@ import org.w3c.dom.Attr;
 public class IDPEntryUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final IDPEntry entry = (IDPEntry) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPListBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPListBuilder.java
index 7fb172c..05d3c13 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPListBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPListBuilder.java
@@ -43,7 +43,7 @@ public class IDPListBuilder extends AbstractSAMLObjectBuilder<IDPList> {
     }
 
     /** {@inheritDoc} */
-    public IDPList buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public IDPList buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new IDPListImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPListImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPListImpl.java
index 33fa182..8ec9cad 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPListImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPListImpl.java
@@ -50,7 +50,7 @@ public class IDPListImpl extends AbstractSAMLObject implements IDPList {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected IDPListImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected IDPListImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         idpEntries = new XMLObjectChildrenList<>(this);
     }
@@ -66,7 +66,7 @@ public class IDPListImpl extends AbstractSAMLObject implements IDPList {
     }
 
     /** {@inheritDoc} */
-    public void setGetComplete(GetComplete newGetComplete) {
+    public void setGetComplete(final GetComplete newGetComplete) {
         this.getComplete = prepareForAssignment(this.getComplete, newGetComplete);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPListUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPListUnmarshaller.java
index 0aeb4ba..d27f5d8 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPListUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IDPListUnmarshaller.java
@@ -34,7 +34,7 @@ import org.opensaml.saml.saml2.core.IDPList;
 public class IDPListUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         IDPList list = (IDPList) parentSAMLObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IssuerBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IssuerBuilder.java
index cb75046..d6eec4a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IssuerBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IssuerBuilder.java
@@ -40,7 +40,7 @@ public class IssuerBuilder extends AbstractSAMLObjectBuilder<Issuer> {
     }
 
     /** {@inheritDoc} */
-    public Issuer buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Issuer buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new IssuerImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IssuerImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IssuerImpl.java
index 0543aab..0d26be4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IssuerImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/IssuerImpl.java
@@ -31,7 +31,7 @@ public class IssuerImpl extends AbstractNameIDType implements Issuer {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected IssuerImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected IssuerImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/KeyInfoConfirmationDataTypeBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/KeyInfoConfirmationDataTypeBuilder.java
index b73e409..4dae473 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/KeyInfoConfirmationDataTypeBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/KeyInfoConfirmationDataTypeBuilder.java
@@ -41,7 +41,7 @@ public class KeyInfoConfirmationDataTypeBuilder extends AbstractSAMLObjectBuilde
     }
 
     /** {@inheritDoc} */
-    public KeyInfoConfirmationDataType buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public KeyInfoConfirmationDataType buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new KeyInfoConfirmationDataTypeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/KeyInfoConfirmationDataTypeImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/KeyInfoConfirmationDataTypeImpl.java
index 258cdc7..f1f6b12 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/KeyInfoConfirmationDataTypeImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/KeyInfoConfirmationDataTypeImpl.java
@@ -36,7 +36,7 @@ public class KeyInfoConfirmationDataTypeImpl extends SubjectConfirmationDataImpl
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected KeyInfoConfirmationDataTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected KeyInfoConfirmationDataTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutRequestBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutRequestBuilder.java
index fb9ff52..8187145 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutRequestBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutRequestBuilder.java
@@ -43,7 +43,7 @@ public class LogoutRequestBuilder extends AbstractSAMLObjectBuilder<LogoutReques
     }
 
     /** {@inheritDoc} */
-    public LogoutRequest buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public LogoutRequest buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new LogoutRequestImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutRequestImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutRequestImpl.java
index 1112623..a83388d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutRequestImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutRequestImpl.java
@@ -61,7 +61,7 @@ public class LogoutRequestImpl extends RequestAbstractTypeImpl implements Logout
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected LogoutRequestImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected LogoutRequestImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         sessionIndexes = new XMLObjectChildrenList<>(this);
     }
@@ -72,7 +72,7 @@ public class LogoutRequestImpl extends RequestAbstractTypeImpl implements Logout
     }
 
     /** {@inheritDoc} */
-    public void setReason(String newReason) {
+    public void setReason(final String newReason) {
         this.reason = prepareForAssignment(this.reason, newReason);
     }
 
@@ -82,7 +82,7 @@ public class LogoutRequestImpl extends RequestAbstractTypeImpl implements Logout
     }
 
     /** {@inheritDoc} */
-    public void setNotOnOrAfter(DateTime newNotOnOrAfter) {
+    public void setNotOnOrAfter(final DateTime newNotOnOrAfter) {
         this.notOnOrAfter = prepareForAssignment(this.notOnOrAfter, newNotOnOrAfter);
     }
 
@@ -92,7 +92,7 @@ public class LogoutRequestImpl extends RequestAbstractTypeImpl implements Logout
     }
 
     /** {@inheritDoc} */
-    public void setBaseID(BaseID newBaseID) {
+    public void setBaseID(final BaseID newBaseID) {
         baseID = prepareForAssignment(baseID, newBaseID);
     }
 
@@ -102,7 +102,7 @@ public class LogoutRequestImpl extends RequestAbstractTypeImpl implements Logout
     }
 
     /** {@inheritDoc} */
-    public void setNameID(NameID newNameID) {
+    public void setNameID(final NameID newNameID) {
         nameID = prepareForAssignment(nameID, newNameID);
     }
 
@@ -112,7 +112,7 @@ public class LogoutRequestImpl extends RequestAbstractTypeImpl implements Logout
     }
 
     /** {@inheritDoc} */
-    public void setEncryptedID(EncryptedID newEncryptedID) {
+    public void setEncryptedID(final EncryptedID newEncryptedID) {
         this.encryptedID = prepareForAssignment(this.encryptedID, newEncryptedID);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutRequestMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutRequestMarshaller.java
index 0d61d8b..25dcc52 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutRequestMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutRequestMarshaller.java
@@ -33,7 +33,7 @@ import org.w3c.dom.Element;
 public class LogoutRequestMarshaller extends RequestAbstractTypeMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         LogoutRequest req = (LogoutRequest) samlObject;
 
         if (req.getReason() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutRequestUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutRequestUnmarshaller.java
index 434c4d6..fde76f3 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutRequestUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutRequestUnmarshaller.java
@@ -36,7 +36,7 @@ import com.google.common.base.Strings;
 public class LogoutRequestUnmarshaller extends RequestAbstractTypeUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         final LogoutRequest req = (LogoutRequest) parentSAMLObject;
     
@@ -54,7 +54,7 @@ public class LogoutRequestUnmarshaller extends RequestAbstractTypeUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final LogoutRequest req = (LogoutRequest) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutResponseBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutResponseBuilder.java
index f4ade44..f7257b3 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutResponseBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutResponseBuilder.java
@@ -43,7 +43,7 @@ public class LogoutResponseBuilder extends AbstractSAMLObjectBuilder<LogoutRespo
     }
 
     /** {@inheritDoc} */
-    public LogoutResponse buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public LogoutResponse buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new LogoutResponseImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutResponseImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutResponseImpl.java
index 7f6b05c..4604ba7 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutResponseImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/LogoutResponseImpl.java
@@ -35,7 +35,7 @@ public class LogoutResponseImpl extends StatusResponseTypeImpl implements Logout
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected LogoutResponseImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected LogoutResponseImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ManageNameIDRequestBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ManageNameIDRequestBuilder.java
index ba2dbb0..0c88889 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ManageNameIDRequestBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ManageNameIDRequestBuilder.java
@@ -44,7 +44,7 @@ public class ManageNameIDRequestBuilder extends AbstractSAMLObjectBuilder<Manage
     }
 
     /** {@inheritDoc} */
-    public ManageNameIDRequest buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ManageNameIDRequest buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ManageNameIDRequestImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ManageNameIDRequestImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ManageNameIDRequestImpl.java
index 11d63b6..a13971b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ManageNameIDRequestImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ManageNameIDRequestImpl.java
@@ -60,7 +60,7 @@ public class ManageNameIDRequestImpl extends RequestAbstractTypeImpl implements
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ManageNameIDRequestImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ManageNameIDRequestImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -70,7 +70,7 @@ public class ManageNameIDRequestImpl extends RequestAbstractTypeImpl implements
     }
 
     /** {@inheritDoc} */
-    public void setNameID(NameID newNameID) {
+    public void setNameID(final NameID newNameID) {
         this.nameID = prepareForAssignment(this.nameID, newNameID);
     }
 
@@ -80,7 +80,7 @@ public class ManageNameIDRequestImpl extends RequestAbstractTypeImpl implements
     }
 
     /** {@inheritDoc} */
-    public void setEncryptedID(EncryptedID newEncID) {
+    public void setEncryptedID(final EncryptedID newEncID) {
         this.encryptedID = prepareForAssignment(this.encryptedID, newEncID);
     }
 
@@ -90,7 +90,7 @@ public class ManageNameIDRequestImpl extends RequestAbstractTypeImpl implements
     }
 
     /** {@inheritDoc} */
-    public void setNewID(NewID newNewID) {
+    public void setNewID(final NewID newNewID) {
         this.newID = prepareForAssignment(this.newID, newNewID);
     }
 
@@ -100,7 +100,7 @@ public class ManageNameIDRequestImpl extends RequestAbstractTypeImpl implements
     }
 
     /** {@inheritDoc} */
-    public void setNewEncryptedID(NewEncryptedID newNewEncryptedID) {
+    public void setNewEncryptedID(final NewEncryptedID newNewEncryptedID) {
         this.newEncryptedID = prepareForAssignment(this.newEncryptedID, newNewEncryptedID);
     }
 
@@ -110,7 +110,7 @@ public class ManageNameIDRequestImpl extends RequestAbstractTypeImpl implements
     }
 
     /** {@inheritDoc} */
-    public void setTerminate(Terminate newTerminate) {
+    public void setTerminate(final Terminate newTerminate) {
         this.terminate = prepareForAssignment(this.terminate, newTerminate);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ManageNameIDRequestUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ManageNameIDRequestUnmarshaller.java
index c2a2bad..28983cb 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ManageNameIDRequestUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ManageNameIDRequestUnmarshaller.java
@@ -36,7 +36,7 @@ import org.opensaml.saml.saml2.core.Terminate;
 public class ManageNameIDRequestUnmarshaller extends RequestAbstractTypeUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         ManageNameIDRequest req = (ManageNameIDRequest) parentSAMLObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ManageNameIDResponseBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ManageNameIDResponseBuilder.java
index 30cd4b8..a11dfb6 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ManageNameIDResponseBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ManageNameIDResponseBuilder.java
@@ -44,7 +44,7 @@ public class ManageNameIDResponseBuilder extends AbstractSAMLObjectBuilder<Manag
     }
 
     /** {@inheritDoc} */
-    public ManageNameIDResponse buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ManageNameIDResponse buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ManageNameIDResponseImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ManageNameIDResponseImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ManageNameIDResponseImpl.java
index 81377dd..e387130 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ManageNameIDResponseImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ManageNameIDResponseImpl.java
@@ -35,7 +35,7 @@ public class ManageNameIDResponseImpl extends StatusResponseTypeImpl implements
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ManageNameIDResponseImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ManageNameIDResponseImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDBuilder.java
index 15b58b7..131ecea 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDBuilder.java
@@ -41,7 +41,7 @@ public class NameIDBuilder extends AbstractSAMLObjectBuilder<NameID> {
     }
 
     /** {@inheritDoc} */
-    public NameID buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public NameID buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new NameIDImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDImpl.java
index f9e6a40..0d1ae17 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDImpl.java
@@ -31,7 +31,7 @@ public class NameIDImpl extends AbstractNameIDType implements NameID {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected NameIDImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected NameIDImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMappingRequestBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMappingRequestBuilder.java
index f410c5c..66682cf 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMappingRequestBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMappingRequestBuilder.java
@@ -44,7 +44,7 @@ public class NameIDMappingRequestBuilder extends AbstractSAMLObjectBuilder<NameI
     }
 
     /** {@inheritDoc} */
-    public NameIDMappingRequest buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public NameIDMappingRequest buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new NameIDMappingRequestImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMappingRequestImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMappingRequestImpl.java
index f531990..d96e882 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMappingRequestImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMappingRequestImpl.java
@@ -52,7 +52,7 @@ public class NameIDMappingRequestImpl extends RequestAbstractTypeImpl implements
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected NameIDMappingRequestImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected NameIDMappingRequestImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -62,7 +62,7 @@ public class NameIDMappingRequestImpl extends RequestAbstractTypeImpl implements
     }
 
     /** {@inheritDoc} */
-    public void setBaseID(BaseID newBaseID) {
+    public void setBaseID(final BaseID newBaseID) {
         baseID = prepareForAssignment(baseID, newBaseID);
     }
 
@@ -72,7 +72,7 @@ public class NameIDMappingRequestImpl extends RequestAbstractTypeImpl implements
     }
 
     /** {@inheritDoc} */
-    public void setNameID(NameID newNameID) {
+    public void setNameID(final NameID newNameID) {
         nameID = prepareForAssignment(nameID, newNameID);
     }
 
@@ -82,7 +82,7 @@ public class NameIDMappingRequestImpl extends RequestAbstractTypeImpl implements
     }
 
     /** {@inheritDoc} */
-    public void setEncryptedID(EncryptedID newEncryptedID) {
+    public void setEncryptedID(final EncryptedID newEncryptedID) {
         this.encryptedID = prepareForAssignment(this.encryptedID, newEncryptedID);
     }
 
@@ -92,7 +92,7 @@ public class NameIDMappingRequestImpl extends RequestAbstractTypeImpl implements
     }
 
     /** {@inheritDoc} */
-    public void setNameIDPolicy(NameIDPolicy newNameIDPolicy) {
+    public void setNameIDPolicy(final NameIDPolicy newNameIDPolicy) {
         this.nameIDPolicy = prepareForAssignment(this.nameIDPolicy, newNameIDPolicy);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMappingRequestUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMappingRequestUnmarshaller.java
index 9e0b7ec..f590ad2 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMappingRequestUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMappingRequestUnmarshaller.java
@@ -31,7 +31,7 @@ import org.opensaml.saml.saml2.core.NameIDPolicy;
 public class NameIDMappingRequestUnmarshaller extends RequestAbstractTypeUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         NameIDMappingRequest req = (NameIDMappingRequest) parentSAMLObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMappingResponseBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMappingResponseBuilder.java
index 01bae2c..99b8e64 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMappingResponseBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMappingResponseBuilder.java
@@ -44,7 +44,7 @@ public class NameIDMappingResponseBuilder extends AbstractSAMLObjectBuilder<Name
     }
 
     /** {@inheritDoc} */
-    public NameIDMappingResponse buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public NameIDMappingResponse buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new NameIDMappingResponseImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMappingResponseImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMappingResponseImpl.java
index 7e6d2a8..19fdc5e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMappingResponseImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMappingResponseImpl.java
@@ -44,7 +44,7 @@ public class NameIDMappingResponseImpl extends StatusResponseTypeImpl implements
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected NameIDMappingResponseImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected NameIDMappingResponseImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -54,7 +54,7 @@ public class NameIDMappingResponseImpl extends StatusResponseTypeImpl implements
     }
 
     /** {@inheritDoc} */
-    public void setNameID(NameID newNameID) {
+    public void setNameID(final NameID newNameID) {
         this.nameID = prepareForAssignment(this.nameID, newNameID);
     }
 
@@ -64,7 +64,7 @@ public class NameIDMappingResponseImpl extends StatusResponseTypeImpl implements
     }
 
     /** {@inheritDoc} */
-    public void setEncryptedID(EncryptedID newEncryptedID) {
+    public void setEncryptedID(final EncryptedID newEncryptedID) {
         this.encryptedID = prepareForAssignment(this.encryptedID, newEncryptedID);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMappingResponseUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMappingResponseUnmarshaller.java
index 780e479..2a8362a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMappingResponseUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDMappingResponseUnmarshaller.java
@@ -29,7 +29,7 @@ import org.opensaml.saml.saml2.core.NameIDMappingResponse;
 public class NameIDMappingResponseUnmarshaller extends StatusResponseTypeUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         NameIDMappingResponse resp = (NameIDMappingResponse) parentSAMLObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyBuilder.java
index 4752137..f08b6a6 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyBuilder.java
@@ -43,7 +43,7 @@ public class NameIDPolicyBuilder extends AbstractSAMLObjectBuilder<NameIDPolicy>
     }
 
     /** {@inheritDoc} */
-    public NameIDPolicy buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public NameIDPolicy buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new NameIDPolicyImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyImpl.java
index 85a3597..66f1260 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyImpl.java
@@ -49,7 +49,7 @@ public class NameIDPolicyImpl extends AbstractSAMLObject implements NameIDPolicy
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected NameIDPolicyImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected NameIDPolicyImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -59,7 +59,7 @@ public class NameIDPolicyImpl extends AbstractSAMLObject implements NameIDPolicy
     }
 
     /** {@inheritDoc} */
-    public void setFormat(String newFormat) {
+    public void setFormat(final String newFormat) {
         format = prepareForAssignment(format, newFormat);
 
     }
@@ -70,7 +70,7 @@ public class NameIDPolicyImpl extends AbstractSAMLObject implements NameIDPolicy
     }
 
     /** {@inheritDoc} */
-    public void setSPNameQualifier(String newSPNameQualifier) {
+    public void setSPNameQualifier(final String newSPNameQualifier) {
         spNameQualifier = prepareForAssignment(spNameQualifier, newSPNameQualifier);
 
     }
@@ -90,7 +90,7 @@ public class NameIDPolicyImpl extends AbstractSAMLObject implements NameIDPolicy
     }
 
     /** {@inheritDoc} */
-    public void setAllowCreate(Boolean newAllowCreate){
+    public void setAllowCreate(final Boolean newAllowCreate){
         if(newAllowCreate != null){
             allowCreate = prepareForAssignment(allowCreate, new XSBooleanValue(newAllowCreate, false));
         }else{
@@ -99,7 +99,7 @@ public class NameIDPolicyImpl extends AbstractSAMLObject implements NameIDPolicy
     }
     
     /** {@inheritDoc} */
-    public void setAllowCreate(XSBooleanValue newAllowCreate) {
+    public void setAllowCreate(final XSBooleanValue newAllowCreate) {
         allowCreate = prepareForAssignment(allowCreate, newAllowCreate);
 
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyMarshaller.java
index 6c4ad64..92d887a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyMarshaller.java
@@ -33,7 +33,7 @@ import org.w3c.dom.Element;
 public class NameIDPolicyMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         NameIDPolicy policy = (NameIDPolicy) samlObject;
 
         if (policy.getFormat() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyUnmarshaller.java
index a0279a6..a39da26 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NameIDPolicyUnmarshaller.java
@@ -34,7 +34,7 @@ import org.w3c.dom.Attr;
 public class NameIDPolicyUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final NameIDPolicy policy = (NameIDPolicy) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewEncryptedIDBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewEncryptedIDBuilder.java
index 3f4060a..3211aa6 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewEncryptedIDBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewEncryptedIDBuilder.java
@@ -40,7 +40,7 @@ public class NewEncryptedIDBuilder extends AbstractSAMLObjectBuilder<NewEncrypte
     }
 
     /** {@inheritDoc} */
-    public NewEncryptedID buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public NewEncryptedID buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new NewEncryptedIDImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewEncryptedIDImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewEncryptedIDImpl.java
index adbbc34..dbd075b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewEncryptedIDImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewEncryptedIDImpl.java
@@ -31,7 +31,7 @@ public class NewEncryptedIDImpl extends EncryptedElementTypeImpl implements NewE
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected NewEncryptedIDImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected NewEncryptedIDImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDBuilder.java
index 7a59de2..9049e27 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDBuilder.java
@@ -42,7 +42,7 @@ public class NewIDBuilder extends AbstractSAMLObjectBuilder<NewID> {
     }
 
     /** {@inheritDoc} */
-    public NewID buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public NewID buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new NewIDImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDImpl.java
index 2873811..dfffd5d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDImpl.java
@@ -42,7 +42,7 @@ public class NewIDImpl extends AbstractSAMLObject implements NewID {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected NewIDImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected NewIDImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -52,7 +52,7 @@ public class NewIDImpl extends AbstractSAMLObject implements NewID {
     }
 
     /** {@inheritDoc} */
-    public void setNewID(String newNewID) {
+    public void setNewID(final String newNewID) {
         this.newID = prepareForAssignment(this.newID, newNewID);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDMarshaller.java
index df1e511..8eb492e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDMarshaller.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
 public class NewIDMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         NewID newID = (NewID) samlObject;
 
         if (newID.getNewID() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDUnmarshaller.java
index 5a9c989..1eb3240 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/NewIDUnmarshaller.java
@@ -31,7 +31,7 @@ import org.opensaml.saml.saml2.core.NewID;
 public class NewIDUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         NewID newID = (NewID) samlObject;
 
         newID.setNewID(elementContent);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/OneTimeUseBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/OneTimeUseBuilder.java
index 9e2e897..9a198a3 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/OneTimeUseBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/OneTimeUseBuilder.java
@@ -41,7 +41,7 @@ public class OneTimeUseBuilder extends AbstractSAMLObjectBuilder<OneTimeUse> {
     }
 
     /** {@inheritDoc} */
-    public OneTimeUse buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public OneTimeUse buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new OneTimeUseImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/OneTimeUseImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/OneTimeUseImpl.java
index 168837b..9ad8737 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/OneTimeUseImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/OneTimeUseImpl.java
@@ -39,7 +39,7 @@ public class OneTimeUseImpl extends AbstractSAMLObject implements OneTimeUse {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected OneTimeUseImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected OneTimeUseImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionBuilder.java
index 06a014c..420f61c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionBuilder.java
@@ -41,7 +41,7 @@ public class ProxyRestrictionBuilder extends AbstractSAMLObjectBuilder<ProxyRest
     }
 
     /** {@inheritDoc} */
-    public ProxyRestriction buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ProxyRestriction buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ProxyRestrictionImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionImpl.java
index fd56215..e5d4c4b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionImpl.java
@@ -49,7 +49,7 @@ public class ProxyRestrictionImpl extends AbstractSAMLObject implements ProxyRes
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ProxyRestrictionImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ProxyRestrictionImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         audiences = new XMLObjectChildrenList<>(this);
     }
@@ -65,7 +65,7 @@ public class ProxyRestrictionImpl extends AbstractSAMLObject implements ProxyRes
     }
 
     /** {@inheritDoc} */
-    public void setProxyCount(Integer newProxyCount) {
+    public void setProxyCount(final Integer newProxyCount) {
         if (newProxyCount >= 0) {
             this.proxyCount = prepareForAssignment(this.proxyCount, newProxyCount);
         } else {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionMarshaller.java
index 3f6a448..bd509f2 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionMarshaller.java
@@ -33,7 +33,7 @@ import org.w3c.dom.Element;
 public class ProxyRestrictionMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         ProxyRestriction proxyRestriction = (ProxyRestriction) samlObject;
         if (proxyRestriction.getProxyCount() != null) {
             domElement.setAttributeNS(null, ProxyRestriction.COUNT_ATTRIB_NAME, Integer.toString(proxyRestriction
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionUnmarshaller.java
index dd4f31d..8c2bfa8 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ProxyRestrictionUnmarshaller.java
@@ -34,7 +34,7 @@ import org.w3c.dom.Attr;
 public class ProxyRestrictionUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
         final ProxyRestriction proxyRestriction = (ProxyRestriction) parentObject;
 
         if (childObject instanceof Audience) {
@@ -45,7 +45,7 @@ public class ProxyRestrictionUnmarshaller extends AbstractSAMLObjectUnmarshaller
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final ProxyRestriction proxyRestriction = (ProxyRestriction) samlObject;
 
         if (attribute.getLocalName().equals(ProxyRestriction.COUNT_ATTRIB_NAME)
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestAbstractTypeImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestAbstractTypeImpl.java
index 0b543fc..9b16c35 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestAbstractTypeImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestAbstractTypeImpl.java
@@ -66,7 +66,7 @@ public abstract class RequestAbstractTypeImpl extends AbstractSignableSAMLObject
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected RequestAbstractTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected RequestAbstractTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         version = SAMLVersion.VERSION_20;
     }
@@ -77,7 +77,7 @@ public abstract class RequestAbstractTypeImpl extends AbstractSignableSAMLObject
     }
 
     /** {@inheritDoc} */
-    public void setVersion(SAMLVersion newVersion) {
+    public void setVersion(final SAMLVersion newVersion) {
         this.version = prepareForAssignment(this.version, newVersion);
     }
 
@@ -87,7 +87,7 @@ public abstract class RequestAbstractTypeImpl extends AbstractSignableSAMLObject
     }
 
     /** {@inheritDoc} */
-    public void setID(String newID) {
+    public void setID(final String newID) {
         String oldID = this.id;
         this.id = prepareForAssignment(this.id, newID);
         registerOwnID(oldID, this.id);
@@ -99,7 +99,7 @@ public abstract class RequestAbstractTypeImpl extends AbstractSignableSAMLObject
     }
 
     /** {@inheritDoc} */
-    public void setIssueInstant(DateTime newIssueInstant) {
+    public void setIssueInstant(final DateTime newIssueInstant) {
         this.issueInstant = prepareForAssignment(this.issueInstant, newIssueInstant);
     }
 
@@ -109,7 +109,7 @@ public abstract class RequestAbstractTypeImpl extends AbstractSignableSAMLObject
     }
 
     /** {@inheritDoc} */
-    public void setDestination(String newDestination) {
+    public void setDestination(final String newDestination) {
         this.destination = prepareForAssignment(this.destination, newDestination);
     }
 
@@ -119,7 +119,7 @@ public abstract class RequestAbstractTypeImpl extends AbstractSignableSAMLObject
     }
 
     /** {@inheritDoc} */
-    public void setConsent(String newConsent) {
+    public void setConsent(final String newConsent) {
         this.consent = prepareForAssignment(this.consent, newConsent);
     }
 
@@ -129,7 +129,7 @@ public abstract class RequestAbstractTypeImpl extends AbstractSignableSAMLObject
     }
 
     /** {@inheritDoc} */
-    public void setIssuer(Issuer newIssuer) {
+    public void setIssuer(final Issuer newIssuer) {
         this.issuer = prepareForAssignment(this.issuer, newIssuer);
     }
 
@@ -139,7 +139,7 @@ public abstract class RequestAbstractTypeImpl extends AbstractSignableSAMLObject
     }
 
     /** {@inheritDoc} */
-    public void setExtensions(Extensions newExtensions) {
+    public void setExtensions(final Extensions newExtensions) {
         this.extensions = prepareForAssignment(this.extensions, newExtensions);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestAbstractTypeMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestAbstractTypeMarshaller.java
index 7cfc837..63eed4e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestAbstractTypeMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestAbstractTypeMarshaller.java
@@ -34,7 +34,7 @@ import org.w3c.dom.Element;
 public abstract class RequestAbstractTypeMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         RequestAbstractType req = (RequestAbstractType) samlObject;
 
         if (req.getVersion() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestAbstractTypeUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestAbstractTypeUnmarshaller.java
index f860210..89640ba 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestAbstractTypeUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestAbstractTypeUnmarshaller.java
@@ -40,7 +40,7 @@ import com.google.common.base.Strings;
 public abstract class RequestAbstractTypeUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         final RequestAbstractType req = (RequestAbstractType) parentSAMLObject;
     
@@ -56,7 +56,7 @@ public abstract class RequestAbstractTypeUnmarshaller extends AbstractSAMLObject
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final RequestAbstractType req = (RequestAbstractType) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextBuilder.java
index db423a5..6760fb6 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextBuilder.java
@@ -43,7 +43,7 @@ public class RequestedAuthnContextBuilder extends AbstractSAMLObjectBuilder<Requ
     }
 
     /** {@inheritDoc} */
-    public RequestedAuthnContext buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public RequestedAuthnContext buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new RequestedAuthnContextImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextImpl.java
index c4b62d8..c5a2b2d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextImpl.java
@@ -54,7 +54,7 @@ public class RequestedAuthnContextImpl extends AbstractSAMLObject implements Req
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected RequestedAuthnContextImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected RequestedAuthnContextImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         authnContextClassRefs = new XMLObjectChildrenList<>(this);
         authnContextDeclRefs = new XMLObjectChildrenList<>(this);
@@ -66,7 +66,7 @@ public class RequestedAuthnContextImpl extends AbstractSAMLObject implements Req
     }
 
     /** {@inheritDoc} */
-    public void setComparison(AuthnContextComparisonTypeEnumeration newComparison) {
+    public void setComparison(final AuthnContextComparisonTypeEnumeration newComparison) {
         this.comparison = prepareForAssignment(this.comparison, newComparison);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextMarshaller.java
index 37362fe..c10d5f1 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextMarshaller.java
@@ -33,7 +33,7 @@ import org.w3c.dom.Element;
 public class RequestedAuthnContextMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         RequestedAuthnContext rac = (RequestedAuthnContext) samlObject;
 
         if (rac.getComparison() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextUnmarshaller.java
index 4b8d586..e08c504 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequestedAuthnContextUnmarshaller.java
@@ -36,7 +36,7 @@ import org.w3c.dom.Attr;
 public class RequestedAuthnContextUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         final RequestedAuthnContext rac = (RequestedAuthnContext) parentSAMLObject;
         
@@ -50,7 +50,7 @@ public class RequestedAuthnContextUnmarshaller extends AbstractSAMLObjectUnmarsh
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final RequestedAuthnContext rac = (RequestedAuthnContext) samlObject;
 
         if (attribute.getLocalName().equals(RequestedAuthnContext.COMPARISON_ATTRIB_NAME)
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDBuilder.java
index f29c2b0..2f375b4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDBuilder.java
@@ -43,7 +43,7 @@ public class RequesterIDBuilder extends AbstractSAMLObjectBuilder<RequesterID> {
     }
 
     /** {@inheritDoc} */
-    public RequesterID buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public RequesterID buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new RequesterIDImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDImpl.java
index 09c5bb9..746f5b3 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDImpl.java
@@ -42,7 +42,7 @@ public class RequesterIDImpl extends AbstractSAMLObject implements RequesterID {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected RequesterIDImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected RequesterIDImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -52,7 +52,7 @@ public class RequesterIDImpl extends AbstractSAMLObject implements RequesterID {
     }
 
     /** {@inheritDoc} */
-    public void setRequesterID(String newRequesterID) {
+    public void setRequesterID(final String newRequesterID) {
         this.requesterID = prepareForAssignment(this.requesterID, newRequesterID);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDMarshaller.java
index ef997b6..da9afcd 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDMarshaller.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
 public class RequesterIDMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         RequesterID reqID = (RequesterID) samlObject;
 
         if (reqID.getRequesterID() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDUnmarshaller.java
index 1de0643..7abc41d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/RequesterIDUnmarshaller.java
@@ -31,7 +31,7 @@ import org.opensaml.saml.saml2.core.RequesterID;
 public class RequesterIDUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         RequesterID reqID = (RequesterID) samlObject;
 
         reqID.setRequesterID(elementContent);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ResponseBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ResponseBuilder.java
index 5713580..f260a2b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ResponseBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ResponseBuilder.java
@@ -43,7 +43,7 @@ public class ResponseBuilder extends AbstractSAMLObjectBuilder<Response> {
     }
 
     /** {@inheritDoc} */
-    public Response buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Response buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ResponseImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ResponseImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ResponseImpl.java
index 0a17c14..3f6c03e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ResponseImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ResponseImpl.java
@@ -46,7 +46,7 @@ public class ResponseImpl extends StatusResponseTypeImpl implements Response {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ResponseImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ResponseImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         indexedChildren = new IndexedXMLObjectChildrenList<>(this);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ResponseUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ResponseUnmarshaller.java
index c212072..d6a1a59 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ResponseUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ResponseUnmarshaller.java
@@ -33,7 +33,7 @@ import org.opensaml.saml.saml2.core.Response;
 public class ResponseUnmarshaller extends StatusResponseTypeUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         Response resp = (Response) parentSAMLObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ScopingBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ScopingBuilder.java
index a834787..82033f0 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ScopingBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ScopingBuilder.java
@@ -42,7 +42,7 @@ public class ScopingBuilder extends AbstractSAMLObjectBuilder<Scoping> {
     }
 
     /** {@inheritDoc} */
-    public Scoping buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Scoping buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ScopingImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ScopingImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ScopingImpl.java
index e7c7e1b..afe6b4c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ScopingImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ScopingImpl.java
@@ -53,7 +53,7 @@ public class ScopingImpl extends AbstractSAMLObject implements Scoping {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ScopingImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ScopingImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         requesterIDs = new XMLObjectChildrenList<>(this);
     }
@@ -64,7 +64,7 @@ public class ScopingImpl extends AbstractSAMLObject implements Scoping {
     }
 
     /** {@inheritDoc} */
-    public void setProxyCount(Integer newProxyCount) {
+    public void setProxyCount(final Integer newProxyCount) {
         this.proxyCount = prepareForAssignment(this.proxyCount, newProxyCount);
     }
 
@@ -74,7 +74,7 @@ public class ScopingImpl extends AbstractSAMLObject implements Scoping {
     }
 
     /** {@inheritDoc} */
-    public void setIDPList(IDPList newIDPList) {
+    public void setIDPList(final IDPList newIDPList) {
         this.idpList = prepareForAssignment(this.idpList, newIDPList);
 
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ScopingMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ScopingMarshaller.java
index 8e47c0f..dd9e2c9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ScopingMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ScopingMarshaller.java
@@ -33,7 +33,7 @@ import org.w3c.dom.Element;
 public class ScopingMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         Scoping scoping = (Scoping) samlObject;
 
         if (scoping.getProxyCount() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ScopingUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ScopingUnmarshaller.java
index dc6b897..e654673 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ScopingUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ScopingUnmarshaller.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Attr;
 public class ScopingUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         final Scoping scoping = (Scoping) parentSAMLObject;
         
@@ -49,7 +49,7 @@ public class ScopingUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final Scoping scoping = (Scoping) samlObject;
 
         if (attribute.getLocalName().equals(Scoping.PROXY_COUNT_ATTRIB_NAME) && attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexBuilder.java
index 6f0e457..0937c12 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexBuilder.java
@@ -43,7 +43,7 @@ public class SessionIndexBuilder extends AbstractSAMLObjectBuilder<SessionIndex>
     }
 
     /** {@inheritDoc} */
-    public SessionIndex buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public SessionIndex buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new SessionIndexImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexImpl.java
index 55975eb..ac99bd4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexImpl.java
@@ -42,7 +42,7 @@ public class SessionIndexImpl extends AbstractSAMLObject implements SessionIndex
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SessionIndexImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SessionIndexImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -52,7 +52,7 @@ public class SessionIndexImpl extends AbstractSAMLObject implements SessionIndex
     }
 
     /** {@inheritDoc} */
-    public void setSessionIndex(String newSessionIndex) {
+    public void setSessionIndex(final String newSessionIndex) {
         this.sessionIndex = prepareForAssignment(this.sessionIndex, newSessionIndex);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexMarshaller.java
index 452e879..a271556 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexMarshaller.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
 public class SessionIndexMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         SessionIndex si = (SessionIndex) samlObject;
 
         if (si.getSessionIndex() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexUnmarshaller.java
index 8d0716e..6d1f4ab 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SessionIndexUnmarshaller.java
@@ -31,7 +31,7 @@ import org.opensaml.saml.saml2.core.SessionIndex;
 public class SessionIndexUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         SessionIndex si = (SessionIndex) samlObject;
 
         si.setSessionIndex(elementContent);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusBuilder.java
index 398d4ab..23adf1a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusBuilder.java
@@ -43,7 +43,7 @@ public class StatusBuilder extends AbstractSAMLObjectBuilder<Status> {
     }
 
     /** {@inheritDoc} */
-    public Status buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Status buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new StatusImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusCodeBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusCodeBuilder.java
index 926c294..2fd7408 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusCodeBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusCodeBuilder.java
@@ -44,7 +44,7 @@ public class StatusCodeBuilder extends AbstractSAMLObjectBuilder<StatusCode> {
     }
 
     /** {@inheritDoc} */
-    public StatusCode buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public StatusCode buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new StatusCodeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusCodeImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusCodeImpl.java
index b56b96b..b004922 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusCodeImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusCodeImpl.java
@@ -47,7 +47,7 @@ public class StatusCodeImpl extends AbstractSAMLObject implements StatusCode {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected StatusCodeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected StatusCodeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -57,7 +57,7 @@ public class StatusCodeImpl extends AbstractSAMLObject implements StatusCode {
     }
 
     /** {@inheritDoc} */
-    public void setStatusCode(StatusCode newStatusCode) {
+    public void setStatusCode(final StatusCode newStatusCode) {
         this.childStatusCode = prepareForAssignment(this.childStatusCode, newStatusCode);
     }
 
@@ -67,7 +67,7 @@ public class StatusCodeImpl extends AbstractSAMLObject implements StatusCode {
     }
 
     /** {@inheritDoc} */
-    public void setValue(String newValue) {
+    public void setValue(final String newValue) {
         this.value = prepareForAssignment(this.value, newValue);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusCodeMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusCodeMarshaller.java
index 6e03a6e..e4651e4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusCodeMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusCodeMarshaller.java
@@ -33,7 +33,7 @@ import org.w3c.dom.Element;
 public class StatusCodeMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         StatusCode statusCode = (StatusCode) samlObject;
 
         if (statusCode.getValue() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusCodeUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusCodeUnmarshaller.java
index 0b75c59..ad47d34 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusCodeUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusCodeUnmarshaller.java
@@ -33,7 +33,7 @@ import org.w3c.dom.Attr;
 public class StatusCodeUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         final StatusCode statusCode = (StatusCode) parentSAMLObject;
     
@@ -45,7 +45,7 @@ public class StatusCodeUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final StatusCode statusCode = (StatusCode) samlObject;
 
         if (attribute.getLocalName().equals(StatusCode.VALUE_ATTRIB_NAME) && attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusDetailBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusDetailBuilder.java
index 974fe40..e2b205c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusDetailBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusDetailBuilder.java
@@ -44,7 +44,7 @@ public class StatusDetailBuilder extends AbstractSAMLObjectBuilder<StatusDetail>
     /**
      * {@inheritDoc}
      */
-    public StatusDetail buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public StatusDetail buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new StatusDetailImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusDetailImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusDetailImpl.java
index e5a5ba9..779e554 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusDetailImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusDetailImpl.java
@@ -42,7 +42,7 @@ public class StatusDetailImpl extends AbstractSAMLObject implements StatusDetail
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected StatusDetailImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected StatusDetailImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         unknownChildren = new IndexedXMLObjectChildrenList<>(this);
     }
@@ -55,7 +55,7 @@ public class StatusDetailImpl extends AbstractSAMLObject implements StatusDetail
     }
     
     /** {@inheritDoc} */
-    public List<XMLObject> getUnknownXMLObjects(QName typeOrName) {
+    public List<XMLObject> getUnknownXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) unknownChildren.subList(typeOrName);
     }
     
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusDetailUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusDetailUnmarshaller.java
index 1432abc..17e8432 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusDetailUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusDetailUnmarshaller.java
@@ -30,7 +30,7 @@ public class StatusDetailUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     /**
      * {@inheritDoc}
      */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         StatusDetail statusDetail = (StatusDetail) parentSAMLObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusImpl.java
index be51aee..ec1eacf 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusImpl.java
@@ -53,7 +53,7 @@ public class StatusImpl extends AbstractSAMLObject implements Status {
      * @param elementLocalName element name
      * @param namespacePrefix namespace prefix
      */
-    protected StatusImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected StatusImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -63,7 +63,7 @@ public class StatusImpl extends AbstractSAMLObject implements Status {
     }
 
     /** {@inheritDoc} */
-    public void setStatusCode(StatusCode newStatusCode) {
+    public void setStatusCode(final StatusCode newStatusCode) {
         this.statusCode = prepareForAssignment(this.statusCode, newStatusCode);
 
     }
@@ -74,7 +74,7 @@ public class StatusImpl extends AbstractSAMLObject implements Status {
     }
 
     /** {@inheritDoc} */
-    public void setStatusMessage(StatusMessage newStatusMessage) {
+    public void setStatusMessage(final StatusMessage newStatusMessage) {
         this.statusMessage = prepareForAssignment(this.getStatusMessage(), newStatusMessage);
     }
 
@@ -84,7 +84,7 @@ public class StatusImpl extends AbstractSAMLObject implements Status {
     }
 
     /** {@inheritDoc} */
-    public void setStatusDetail(StatusDetail newStatusDetail) {
+    public void setStatusDetail(final StatusDetail newStatusDetail) {
         this.statusDetail = prepareForAssignment(this.statusDetail, newStatusDetail);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageBuilder.java
index d5d5b73..224a579 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageBuilder.java
@@ -44,7 +44,7 @@ public class StatusMessageBuilder extends AbstractSAMLObjectBuilder<StatusMessag
     }
 
     /** {@inheritDoc} */
-    public StatusMessage buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public StatusMessage buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new StatusMessageImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageImpl.java
index 2a20f46..4caf5da 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageImpl.java
@@ -42,7 +42,7 @@ public class StatusMessageImpl extends AbstractSAMLObject implements StatusMessa
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected StatusMessageImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected StatusMessageImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -52,7 +52,7 @@ public class StatusMessageImpl extends AbstractSAMLObject implements StatusMessa
     }
 
     /** {@inheritDoc} */
-    public void setMessage(String newMessage) {
+    public void setMessage(final String newMessage) {
         this.message = prepareForAssignment(this.message, newMessage);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageMarshaller.java
index 06c702d..340487e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageMarshaller.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
 public class StatusMessageMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         StatusMessage message = (StatusMessage) samlObject;
 
         if (message.getMessage() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageUnmarshaller.java
index da59f93..cf82e4e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusMessageUnmarshaller.java
@@ -32,7 +32,7 @@ import org.opensaml.saml.saml2.core.StatusMessage;
 public class StatusMessageUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         StatusMessage message = (StatusMessage) samlObject;
 
         message.setMessage(elementContent);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusResponseTypeImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusResponseTypeImpl.java
index 896f536..90a6f6b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusResponseTypeImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusResponseTypeImpl.java
@@ -73,7 +73,7 @@ public abstract class StatusResponseTypeImpl extends AbstractSignableSAMLObject
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected StatusResponseTypeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected StatusResponseTypeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         version = SAMLVersion.VERSION_20;
     }
@@ -84,7 +84,7 @@ public abstract class StatusResponseTypeImpl extends AbstractSignableSAMLObject
     }
 
     /** {@inheritDoc} */
-    public void setVersion(SAMLVersion newVersion) {
+    public void setVersion(final SAMLVersion newVersion) {
         this.version = prepareForAssignment(this.version, newVersion);
     }
     
@@ -94,7 +94,7 @@ public abstract class StatusResponseTypeImpl extends AbstractSignableSAMLObject
     }
 
     /** {@inheritDoc} */
-    public void setID(String newID) {
+    public void setID(final String newID) {
         String oldID = this.id;
         this.id = prepareForAssignment(this.id, newID);
         registerOwnID(oldID, this.id);
@@ -106,7 +106,7 @@ public abstract class StatusResponseTypeImpl extends AbstractSignableSAMLObject
     }
 
     /** {@inheritDoc} */
-    public void setInResponseTo(String newInResponseTo) {
+    public void setInResponseTo(final String newInResponseTo) {
         this.inResponseTo = prepareForAssignment(this.inResponseTo, newInResponseTo);
     }
 
@@ -116,7 +116,7 @@ public abstract class StatusResponseTypeImpl extends AbstractSignableSAMLObject
     }
 
     /** {@inheritDoc} */
-    public void setIssueInstant(DateTime newIssueInstant) {
+    public void setIssueInstant(final DateTime newIssueInstant) {
         this.issueInstant = prepareForAssignment(this.issueInstant, newIssueInstant);
     }
 
@@ -126,7 +126,7 @@ public abstract class StatusResponseTypeImpl extends AbstractSignableSAMLObject
     }
 
     /** {@inheritDoc} */
-    public void setDestination(String newDestination) {
+    public void setDestination(final String newDestination) {
         this.destination = prepareForAssignment(this.destination, newDestination);
     }
 
@@ -136,7 +136,7 @@ public abstract class StatusResponseTypeImpl extends AbstractSignableSAMLObject
     }
 
     /** {@inheritDoc} */
-    public void setConsent(String newConsent) {
+    public void setConsent(final String newConsent) {
         this.consent = prepareForAssignment(this.consent, newConsent);
     }
 
@@ -146,7 +146,7 @@ public abstract class StatusResponseTypeImpl extends AbstractSignableSAMLObject
     }
 
     /** {@inheritDoc} */
-    public void setIssuer(Issuer newIssuer) {
+    public void setIssuer(final Issuer newIssuer) {
         this.issuer = prepareForAssignment(this.issuer, newIssuer);
     }
 
@@ -156,7 +156,7 @@ public abstract class StatusResponseTypeImpl extends AbstractSignableSAMLObject
     }
 
     /** {@inheritDoc} */
-    public void setExtensions(Extensions newExtensions) {
+    public void setExtensions(final Extensions newExtensions) {
         this.extensions = prepareForAssignment(this.extensions, newExtensions);
     }
 
@@ -166,7 +166,7 @@ public abstract class StatusResponseTypeImpl extends AbstractSignableSAMLObject
     }
 
     /** {@inheritDoc} */
-    public void setStatus(Status newStatus) {
+    public void setStatus(final Status newStatus) {
         this.status = prepareForAssignment(this.status, newStatus);
     }
     
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusResponseTypeMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusResponseTypeMarshaller.java
index c0f7bca..afb6b6e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusResponseTypeMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusResponseTypeMarshaller.java
@@ -34,7 +34,7 @@ import org.w3c.dom.Element;
 public abstract class StatusResponseTypeMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         StatusResponseType sr = (StatusResponseType) samlObject;
 
         if (sr.getVersion() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusResponseTypeUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusResponseTypeUnmarshaller.java
index 02433e2..90a6ebb 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusResponseTypeUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusResponseTypeUnmarshaller.java
@@ -41,7 +41,7 @@ import com.google.common.base.Strings;
 public abstract class StatusResponseTypeUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         final StatusResponseType sr = (StatusResponseType) parentSAMLObject;
     
@@ -59,7 +59,7 @@ public abstract class StatusResponseTypeUnmarshaller extends AbstractSAMLObjectU
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final StatusResponseType sr = (StatusResponseType) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusUnmarshaller.java
index 4c5b33d..484f076 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/StatusUnmarshaller.java
@@ -35,7 +35,7 @@ import org.opensaml.saml.saml2.core.StatusMessage;
 public class StatusUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         Status status = (Status) parentSAMLObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectBuilder.java
index 8eee435..c7d346f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectBuilder.java
@@ -41,7 +41,7 @@ public class SubjectBuilder extends AbstractSAMLObjectBuilder<Subject> {
     }
 
     /** {@inheritDoc} */
-    public Subject buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Subject buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new SubjectImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationBuilder.java
index 9481776..4bf853e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationBuilder.java
@@ -42,7 +42,7 @@ public class SubjectConfirmationBuilder extends AbstractSAMLObjectBuilder<Subjec
     }
 
     /** {@inheritDoc} */
-    public SubjectConfirmation buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public SubjectConfirmation buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new SubjectConfirmationImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataBuilder.java
index f74ab32..bb31398 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataBuilder.java
@@ -42,7 +42,7 @@ public class SubjectConfirmationDataBuilder extends AbstractSAMLObjectBuilder<Su
     }
 
     /** {@inheritDoc} */
-    public SubjectConfirmationData buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public SubjectConfirmationData buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new SubjectConfirmationDataImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataImpl.java
index 12631fc..06bdc28 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataImpl.java
@@ -66,7 +66,7 @@ public class SubjectConfirmationDataImpl extends AbstractSAMLObject implements S
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SubjectConfirmationDataImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SubjectConfirmationDataImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         unknownAttributes = new AttributeMap(this);
         unknownChildren = new IndexedXMLObjectChildrenList<>(this);
@@ -78,7 +78,7 @@ public class SubjectConfirmationDataImpl extends AbstractSAMLObject implements S
     }
 
     /** {@inheritDoc} */
-    public void setNotBefore(DateTime newNotBefore) {
+    public void setNotBefore(final DateTime newNotBefore) {
         this.notBefore = prepareForAssignment(this.notBefore, newNotBefore);
     }
 
@@ -88,7 +88,7 @@ public class SubjectConfirmationDataImpl extends AbstractSAMLObject implements S
     }
 
     /** {@inheritDoc} */
-    public void setNotOnOrAfter(DateTime newNotOnOrAfter) {
+    public void setNotOnOrAfter(final DateTime newNotOnOrAfter) {
         this.notOnOrAfter = prepareForAssignment(this.notOnOrAfter, newNotOnOrAfter);
     }
 
@@ -98,7 +98,7 @@ public class SubjectConfirmationDataImpl extends AbstractSAMLObject implements S
     }
 
     /** {@inheritDoc} */
-    public void setRecipient(String newRecipient) {
+    public void setRecipient(final String newRecipient) {
         this.recipient = prepareForAssignment(this.recipient, newRecipient);
     }
 
@@ -108,7 +108,7 @@ public class SubjectConfirmationDataImpl extends AbstractSAMLObject implements S
     }
 
     /** {@inheritDoc} */
-    public void setInResponseTo(String newInResponseTo) {
+    public void setInResponseTo(final String newInResponseTo) {
         this.inResponseTo = prepareForAssignment(this.inResponseTo, newInResponseTo);
     }
 
@@ -118,7 +118,7 @@ public class SubjectConfirmationDataImpl extends AbstractSAMLObject implements S
     }
 
     /** {@inheritDoc} */
-    public void setAddress(String newAddress) {
+    public void setAddress(final String newAddress) {
         this.address = prepareForAssignment(this.address, newAddress);
     }
     
@@ -137,7 +137,7 @@ public class SubjectConfirmationDataImpl extends AbstractSAMLObject implements S
     }
     
     /** {@inheritDoc} */
-    public List<XMLObject> getUnknownXMLObjects(QName typeOrName) {
+    public List<XMLObject> getUnknownXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) unknownChildren.subList(typeOrName);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataMarshaller.java
index 22c4bf0..9a0b83e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataMarshaller.java
@@ -34,7 +34,7 @@ import org.w3c.dom.Element;
 public class SubjectConfirmationDataMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         SubjectConfirmationData subjectCD = (SubjectConfirmationData) samlObject;
 
         if (subjectCD.getNotBefore() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataUnmarshaller.java
index b70919b..11db9b6 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationDataUnmarshaller.java
@@ -39,7 +39,7 @@ public class SubjectConfirmationDataUnmarshaller extends AbstractSAMLObjectUnmar
     /**
      * {@inheritDoc}
      */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         final SubjectConfirmationData subjectCD = (SubjectConfirmationData) parentSAMLObject;
 
@@ -47,7 +47,7 @@ public class SubjectConfirmationDataUnmarshaller extends AbstractSAMLObjectUnmar
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final SubjectConfirmationData subjectCD = (SubjectConfirmationData) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationImpl.java
index 50023cf..acb12d8 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationImpl.java
@@ -56,7 +56,7 @@ public class SubjectConfirmationImpl extends AbstractSAMLObject implements Subje
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SubjectConfirmationImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SubjectConfirmationImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -66,7 +66,7 @@ public class SubjectConfirmationImpl extends AbstractSAMLObject implements Subje
     }
 
     /** {@inheritDoc} */
-    public void setBaseID(BaseID newBaseID) {
+    public void setBaseID(final BaseID newBaseID) {
         baseID = prepareForAssignment(baseID, newBaseID);
     }
 
@@ -76,7 +76,7 @@ public class SubjectConfirmationImpl extends AbstractSAMLObject implements Subje
     }
 
     /** {@inheritDoc} */
-    public void setNameID(NameID newNameID) {
+    public void setNameID(final NameID newNameID) {
         nameID = prepareForAssignment(nameID, newNameID);
     }
 
@@ -86,7 +86,7 @@ public class SubjectConfirmationImpl extends AbstractSAMLObject implements Subje
     }
 
     /** {@inheritDoc} */
-    public void setEncryptedID(EncryptedID newEncryptedID) {
+    public void setEncryptedID(final EncryptedID newEncryptedID) {
         this.encryptedID = prepareForAssignment(this.encryptedID, newEncryptedID);
     }
 
@@ -96,7 +96,7 @@ public class SubjectConfirmationImpl extends AbstractSAMLObject implements Subje
     }
 
     /** {@inheritDoc} */
-    public void setSubjectConfirmationData(SubjectConfirmationData newSubjectConfirmationData) {
+    public void setSubjectConfirmationData(final SubjectConfirmationData newSubjectConfirmationData) {
         this.subjectConfirmationData = prepareForAssignment(this.subjectConfirmationData, newSubjectConfirmationData);
 
     }
@@ -107,7 +107,7 @@ public class SubjectConfirmationImpl extends AbstractSAMLObject implements Subje
     }
 
     /** {@inheritDoc} */
-    public void setMethod(String newMethod) {
+    public void setMethod(final String newMethod) {
         this.method = prepareForAssignment(this.method, newMethod);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationMarshaller.java
index 7be0d9b..9724b79 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationMarshaller.java
@@ -33,7 +33,7 @@ import org.w3c.dom.Element;
 public class SubjectConfirmationMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         SubjectConfirmation subjectConfirmation = (SubjectConfirmation) samlObject;
 
         if (subjectConfirmation.getMethod() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationUnmarshaller.java
index e546889..3d35cc9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectConfirmationUnmarshaller.java
@@ -33,7 +33,7 @@ import org.w3c.dom.Attr;
 public class SubjectConfirmationUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
         final SubjectConfirmation subjectConfirmation = (SubjectConfirmation) parentObject;
 
         if (childObject instanceof BaseID) {
@@ -50,7 +50,7 @@ public class SubjectConfirmationUnmarshaller extends AbstractSAMLObjectUnmarshal
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final SubjectConfirmation subjectConfirmation = (SubjectConfirmation) samlObject;
 
         if (attribute.getLocalName().equals(SubjectConfirmation.METHOD_ATTRIB_NAME)
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectImpl.java
index c8727b2..244cb33 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectImpl.java
@@ -54,7 +54,7 @@ public class SubjectImpl extends AbstractSAMLObject implements Subject {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SubjectImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SubjectImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         subjectConfirmations = new XMLObjectChildrenList<>(this);
     }
@@ -65,7 +65,7 @@ public class SubjectImpl extends AbstractSAMLObject implements Subject {
     }
 
     /** {@inheritDoc} */
-    public void setBaseID(BaseID newBaseID) {
+    public void setBaseID(final BaseID newBaseID) {
         baseID = prepareForAssignment(baseID, newBaseID);
     }
 
@@ -75,7 +75,7 @@ public class SubjectImpl extends AbstractSAMLObject implements Subject {
     }
 
     /** {@inheritDoc} */
-    public void setNameID(NameID newNameID) {
+    public void setNameID(final NameID newNameID) {
         nameID = prepareForAssignment(nameID, newNameID);
     }
 
@@ -85,7 +85,7 @@ public class SubjectImpl extends AbstractSAMLObject implements Subject {
     }
 
     /** {@inheritDoc} */
-    public void setEncryptedID(EncryptedID newEncryptedID) {
+    public void setEncryptedID(final EncryptedID newEncryptedID) {
         this.encryptedID = prepareForAssignment(this.encryptedID, newEncryptedID);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityBuilder.java
index aa5c422..d51ac74 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityBuilder.java
@@ -42,7 +42,7 @@ public class SubjectLocalityBuilder extends AbstractSAMLObjectBuilder<SubjectLoc
     }
 
     /** {@inheritDoc} */
-    public SubjectLocality buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public SubjectLocality buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new SubjectLocalityImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityImpl.java
index e24873e..952f176 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityImpl.java
@@ -45,7 +45,7 @@ public class SubjectLocalityImpl extends AbstractSAMLObject implements SubjectLo
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SubjectLocalityImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SubjectLocalityImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -55,7 +55,7 @@ public class SubjectLocalityImpl extends AbstractSAMLObject implements SubjectLo
     }
 
     /** {@inheritDoc} */
-    public void setAddress(String newAddress) {
+    public void setAddress(final String newAddress) {
         this.address = prepareForAssignment(this.address, newAddress);
     }
 
@@ -65,7 +65,7 @@ public class SubjectLocalityImpl extends AbstractSAMLObject implements SubjectLo
     }
 
     /** {@inheritDoc} */
-    public void setDNSName(String newDNSName) {
+    public void setDNSName(final String newDNSName) {
         this.dnsName = prepareForAssignment(this.dnsName, newDNSName);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityMarshaller.java
index 54724e1..f0af429 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityMarshaller.java
@@ -33,7 +33,7 @@ import org.w3c.dom.Element;
 public class SubjectLocalityMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         SubjectLocality subjectLocality = (SubjectLocality) samlObject;
         if (subjectLocality.getAddress() != null) {
             domElement.setAttributeNS(null, SubjectLocality.ADDRESS_ATTRIB_NAME, subjectLocality.getAddress());
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityUnmarshaller.java
index c0d1066..1be980e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectLocalityUnmarshaller.java
@@ -33,7 +33,7 @@ import org.w3c.dom.Attr;
 public class SubjectLocalityUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final SubjectLocality subjectLocality = (SubjectLocality) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectQueryImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectQueryImpl.java
index 8b4b2a7..e83c9b6 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectQueryImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectQueryImpl.java
@@ -44,7 +44,7 @@ public abstract class SubjectQueryImpl extends RequestAbstractTypeImpl implement
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SubjectQueryImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SubjectQueryImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -56,7 +56,7 @@ public abstract class SubjectQueryImpl extends RequestAbstractTypeImpl implement
     /**
      * {@inheritDoc}
      */
-    public void setSubject(Subject newSubject) {
+    public void setSubject(final Subject newSubject) {
         this.subject = prepareForAssignment(this.subject, newSubject);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectQueryUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectQueryUnmarshaller.java
index 3169e3d..b5f6e63 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectQueryUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectQueryUnmarshaller.java
@@ -32,7 +32,7 @@ import org.opensaml.saml.saml2.core.SubjectQuery;
 public abstract class SubjectQueryUnmarshaller extends RequestAbstractTypeUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         SubjectQuery sq = (SubjectQuery) parentSAMLObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectUnmarshaller.java
index 2c22234..b59054c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectUnmarshaller.java
@@ -32,7 +32,7 @@ import org.opensaml.saml.saml2.core.SubjectConfirmation;
 public class SubjectUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
         Subject subject = (Subject) parentObject;
 
         if (childObject instanceof BaseID) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/TerminateBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/TerminateBuilder.java
index f79a029..7024a57 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/TerminateBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/TerminateBuilder.java
@@ -43,7 +43,7 @@ public class TerminateBuilder extends AbstractSAMLObjectBuilder<Terminate> {
     }
 
     /** {@inheritDoc} */
-    public Terminate buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Terminate buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new TerminateImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/TerminateImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/TerminateImpl.java
index eaf4333..fe1502f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/TerminateImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/TerminateImpl.java
@@ -39,7 +39,7 @@ public class TerminateImpl extends AbstractSAMLObject implements Terminate {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected TerminateImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected TerminateImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RelayStateBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RelayStateBuilder.java
index e0645d4..7dc97f0 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RelayStateBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RelayStateBuilder.java
@@ -44,7 +44,7 @@ public class RelayStateBuilder extends AbstractSAMLObjectBuilder<RelayState> {
     }
 
     /** {@inheritDoc} */
-    public RelayState buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public RelayState buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new RelayStateImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RelayStateImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RelayStateImpl.java
index 798940a..f5b550f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RelayStateImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RelayStateImpl.java
@@ -44,7 +44,7 @@ public class RelayStateImpl extends XSStringImpl implements RelayState {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected RelayStateImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected RelayStateImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
     
@@ -62,7 +62,7 @@ public class RelayStateImpl extends XSStringImpl implements RelayState {
     }
 
     /** {@inheritDoc} */
-    public void setSOAP11MustUnderstand(Boolean newMustUnderstand) {
+    public void setSOAP11MustUnderstand(final Boolean newMustUnderstand) {
         if (newMustUnderstand != null) {
             soap11MustUnderstand = prepareForAssignment(soap11MustUnderstand, 
                     new XSBooleanValue(newMustUnderstand, true));
@@ -74,7 +74,7 @@ public class RelayStateImpl extends XSStringImpl implements RelayState {
     }
 
     /** {@inheritDoc} */
-    public void setSOAP11MustUnderstand(XSBooleanValue newMustUnderstand) {
+    public void setSOAP11MustUnderstand(final XSBooleanValue newMustUnderstand) {
             soap11MustUnderstand = prepareForAssignment(soap11MustUnderstand, newMustUnderstand);
             manageQualifiedAttributeNamespace(MustUnderstandBearing.SOAP11_MUST_UNDERSTAND_ATTR_NAME, 
                     soap11MustUnderstand != null);
@@ -86,7 +86,7 @@ public class RelayStateImpl extends XSStringImpl implements RelayState {
     }
 
     /** {@inheritDoc} */
-    public void setSOAP11Actor(String newActor) {
+    public void setSOAP11Actor(final String newActor) {
         soap11Actor = prepareForAssignment(soap11Actor, newActor);
         manageQualifiedAttributeNamespace(ActorBearing.SOAP11_ACTOR_ATTR_NAME, soap11Actor != null);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RelayStateMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RelayStateMarshaller.java
index 5c7773a..e9ba466 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RelayStateMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RelayStateMarshaller.java
@@ -30,7 +30,7 @@ import org.w3c.dom.Element;
 public class RelayStateMarshaller extends XSStringMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         RelayState relayState = (RelayState) xmlObject;
         
         if (relayState.isSOAP11MustUnderstandXSBoolean() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RelayStateUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RelayStateUnmarshaller.java
index 394f0bb..ec4a88f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RelayStateUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RelayStateUnmarshaller.java
@@ -34,7 +34,7 @@ import org.w3c.dom.Attr;
 public class RelayStateUnmarshaller extends XSStringUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         RelayState relayState = (RelayState) xmlObject;
         
         QName attrName = QNameSupport.getNodeQName(attribute);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestAuthenticatedBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestAuthenticatedBuilder.java
index 516a23a..85a0182 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestAuthenticatedBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestAuthenticatedBuilder.java
@@ -45,7 +45,7 @@ public class RequestAuthenticatedBuilder extends AbstractSAMLObjectBuilder<Reque
     }
 
     /** {@inheritDoc} */
-    public RequestAuthenticated buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public RequestAuthenticated buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new RequestAuthenticatedImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestAuthenticatedImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestAuthenticatedImpl.java
index 62dee79..9e89d36 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestAuthenticatedImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestAuthenticatedImpl.java
@@ -49,7 +49,7 @@ public class RequestAuthenticatedImpl extends AbstractSAMLObject implements Requ
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected RequestAuthenticatedImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected RequestAuthenticatedImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -67,7 +67,7 @@ public class RequestAuthenticatedImpl extends AbstractSAMLObject implements Requ
     }
 
     /** {@inheritDoc} */
-    public void setSOAP11MustUnderstand(Boolean newMustUnderstand) {
+    public void setSOAP11MustUnderstand(final Boolean newMustUnderstand) {
         if (newMustUnderstand != null) {
             soap11MustUnderstand = prepareForAssignment(soap11MustUnderstand, 
                     new XSBooleanValue(newMustUnderstand, true));
@@ -79,7 +79,7 @@ public class RequestAuthenticatedImpl extends AbstractSAMLObject implements Requ
     }
 
     /** {@inheritDoc} */
-    public void setSOAP11MustUnderstand(XSBooleanValue newMustUnderstand) {
+    public void setSOAP11MustUnderstand(final XSBooleanValue newMustUnderstand) {
             soap11MustUnderstand = prepareForAssignment(soap11MustUnderstand, newMustUnderstand);
             manageQualifiedAttributeNamespace(MustUnderstandBearing.SOAP11_MUST_UNDERSTAND_ATTR_NAME, 
                     soap11MustUnderstand != null);
@@ -91,7 +91,7 @@ public class RequestAuthenticatedImpl extends AbstractSAMLObject implements Requ
     }
 
     /** {@inheritDoc} */
-    public void setSOAP11Actor(String newActor) {
+    public void setSOAP11Actor(final String newActor) {
         soap11Actor = prepareForAssignment(soap11Actor, newActor);
         manageQualifiedAttributeNamespace(ActorBearing.SOAP11_ACTOR_ATTR_NAME, soap11Actor != null);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestAuthenticatedMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestAuthenticatedMarshaller.java
index e806547..5237303 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestAuthenticatedMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestAuthenticatedMarshaller.java
@@ -30,7 +30,7 @@ import org.w3c.dom.Element;
 public class RequestAuthenticatedMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         RequestAuthenticated ra = (RequestAuthenticated) xmlObject;
         
         if (ra.isSOAP11MustUnderstandXSBoolean() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestAuthenticatedUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestAuthenticatedUnmarshaller.java
index cad4997..5b0a0b9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestAuthenticatedUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestAuthenticatedUnmarshaller.java
@@ -34,7 +34,7 @@ import org.w3c.dom.Attr;
 public class RequestAuthenticatedUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         RequestAuthenticated ra = (RequestAuthenticated) xmlObject;
         
         QName attrName = QNameSupport.getNodeQName(attribute);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestBuilder.java
index 9511323..efb3adc 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestBuilder.java
@@ -44,7 +44,7 @@ public class RequestBuilder extends AbstractSAMLObjectBuilder<Request> {
     }
 
     /** {@inheritDoc} */
-    public Request buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Request buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new RequestImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestImpl.java
index 7078809..c836e1c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestImpl.java
@@ -60,7 +60,7 @@ public class RequestImpl extends AbstractSAMLObject implements Request {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected RequestImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected RequestImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -70,7 +70,7 @@ public class RequestImpl extends AbstractSAMLObject implements Request {
     }
     
     /** {@inheritDoc} */
-    public void setIDPList(IDPList newIDPList) {
+    public void setIDPList(final IDPList newIDPList) {
         idpList = prepareForAssignment(idpList, newIDPList);
     }
 
@@ -80,7 +80,7 @@ public class RequestImpl extends AbstractSAMLObject implements Request {
     }
     
     /** {@inheritDoc} */
-    public void setIssuer(Issuer newIssuer) {
+    public void setIssuer(final Issuer newIssuer) {
         issuer = prepareForAssignment(issuer, newIssuer);
     }
 
@@ -90,7 +90,7 @@ public class RequestImpl extends AbstractSAMLObject implements Request {
     }
 
     /** {@inheritDoc} */
-    public void setProviderName(String newProviderName) {
+    public void setProviderName(final String newProviderName) {
         providerName = prepareForAssignment(providerName, newProviderName);
     }
 
@@ -109,7 +109,7 @@ public class RequestImpl extends AbstractSAMLObject implements Request {
     }
 
     /** {@inheritDoc} */
-    public void setPassive(Boolean newIsPassive) {
+    public void setPassive(final Boolean newIsPassive) {
         if (newIsPassive != null) {
             isPassive = prepareForAssignment(isPassive, new XSBooleanValue(newIsPassive, false));
         } else {
@@ -118,7 +118,7 @@ public class RequestImpl extends AbstractSAMLObject implements Request {
     }
 
     /** {@inheritDoc} */
-    public void setPassive(XSBooleanValue newIsPassive) {
+    public void setPassive(final XSBooleanValue newIsPassive) {
         this.isPassive = prepareForAssignment(this.isPassive, newIsPassive);
     }
     
@@ -136,7 +136,7 @@ public class RequestImpl extends AbstractSAMLObject implements Request {
     }
 
     /** {@inheritDoc} */
-    public void setSOAP11MustUnderstand(Boolean newMustUnderstand) {
+    public void setSOAP11MustUnderstand(final Boolean newMustUnderstand) {
         if (newMustUnderstand != null) {
             soap11MustUnderstand = prepareForAssignment(soap11MustUnderstand, 
                     new XSBooleanValue(newMustUnderstand, true));
@@ -148,7 +148,7 @@ public class RequestImpl extends AbstractSAMLObject implements Request {
     }
 
     /** {@inheritDoc} */
-    public void setSOAP11MustUnderstand(XSBooleanValue newMustUnderstand) {
+    public void setSOAP11MustUnderstand(final XSBooleanValue newMustUnderstand) {
             soap11MustUnderstand = prepareForAssignment(soap11MustUnderstand, newMustUnderstand);
             manageQualifiedAttributeNamespace(MustUnderstandBearing.SOAP11_MUST_UNDERSTAND_ATTR_NAME, 
                     soap11MustUnderstand != null);
@@ -160,7 +160,7 @@ public class RequestImpl extends AbstractSAMLObject implements Request {
     }
 
     /** {@inheritDoc} */
-    public void setSOAP11Actor(String newActor) {
+    public void setSOAP11Actor(final String newActor) {
         soap11Actor = prepareForAssignment(soap11Actor, newActor);
         manageQualifiedAttributeNamespace(ActorBearing.SOAP11_ACTOR_ATTR_NAME, soap11Actor != null);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestMarshaller.java
index dfc2842..9165daf 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestMarshaller.java
@@ -30,7 +30,7 @@ import org.w3c.dom.Element;
 public class RequestMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         Request request = (Request) xmlObject;
         
         if (request.getProviderName() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestUnmarshaller.java
index 0622ef7..748f349 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/RequestUnmarshaller.java
@@ -36,7 +36,7 @@ import org.w3c.dom.Attr;
 public class RequestUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         Request request = (Request) samlObject;
         
         QName attrName = QNameSupport.getNodeQName(attribute);
@@ -54,7 +54,7 @@ public class RequestUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         Request request = (Request) parentSAMLObject;
         
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/ResponseBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/ResponseBuilder.java
index e04d294..71f6814 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/ResponseBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/ResponseBuilder.java
@@ -44,7 +44,7 @@ public class ResponseBuilder extends AbstractSAMLObjectBuilder<Response> {
     }
 
     /** {@inheritDoc} */
-    public Response buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Response buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ResponseImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/ResponseImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/ResponseImpl.java
index a476c82..210ee8a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/ResponseImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/ResponseImpl.java
@@ -47,7 +47,7 @@ public class ResponseImpl extends AbstractSAMLObject implements Response {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ResponseImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ResponseImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -57,7 +57,7 @@ public class ResponseImpl extends AbstractSAMLObject implements Response {
     }
 
     /** {@inheritDoc} */
-    public void setAssertionConsumerServiceURL(String newAssertionConsumerServiceURL) {
+    public void setAssertionConsumerServiceURL(final String newAssertionConsumerServiceURL) {
         acsURL = prepareForAssignment(acsURL, newAssertionConsumerServiceURL);
     }
     
@@ -75,7 +75,7 @@ public class ResponseImpl extends AbstractSAMLObject implements Response {
     }
 
     /** {@inheritDoc} */
-    public void setSOAP11MustUnderstand(Boolean newMustUnderstand) {
+    public void setSOAP11MustUnderstand(final Boolean newMustUnderstand) {
         if (newMustUnderstand != null) {
             soap11MustUnderstand = prepareForAssignment(soap11MustUnderstand, 
                     new XSBooleanValue(newMustUnderstand, true));
@@ -87,7 +87,7 @@ public class ResponseImpl extends AbstractSAMLObject implements Response {
     }
 
     /** {@inheritDoc} */
-    public void setSOAP11MustUnderstand(XSBooleanValue newMustUnderstand) {
+    public void setSOAP11MustUnderstand(final XSBooleanValue newMustUnderstand) {
             soap11MustUnderstand = prepareForAssignment(soap11MustUnderstand, newMustUnderstand);
             manageQualifiedAttributeNamespace(MustUnderstandBearing.SOAP11_MUST_UNDERSTAND_ATTR_NAME, 
                     soap11MustUnderstand != null);
@@ -99,7 +99,7 @@ public class ResponseImpl extends AbstractSAMLObject implements Response {
     }
 
     /** {@inheritDoc} */
-    public void setSOAP11Actor(String newActor) {
+    public void setSOAP11Actor(final String newActor) {
         soap11Actor = prepareForAssignment(soap11Actor, newActor);
         manageQualifiedAttributeNamespace(ActorBearing.SOAP11_ACTOR_ATTR_NAME, soap11Actor != null);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/ResponseMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/ResponseMarshaller.java
index faaf5ed..0e96094 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/ResponseMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/ResponseMarshaller.java
@@ -30,7 +30,7 @@ import org.w3c.dom.Element;
 public class ResponseMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         Response response = (Response) xmlObject;
         
         if (response.getAssertionConsumerServiceURL() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/ResponseUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/ResponseUnmarshaller.java
index fb1faf8..e035b32 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/ResponseUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/ResponseUnmarshaller.java
@@ -34,7 +34,7 @@ import org.w3c.dom.Attr;
 public class ResponseUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         Response response = (Response) samlObject;
         
         QName attrName = QNameSupport.getNodeQName(attribute);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/SubjectConfirmationBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/SubjectConfirmationBuilder.java
index 17cafd0..aa72209 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/SubjectConfirmationBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/SubjectConfirmationBuilder.java
@@ -45,7 +45,7 @@ public class SubjectConfirmationBuilder extends AbstractSAMLObjectBuilder<Subjec
     }
 
     /** {@inheritDoc} */
-    public SubjectConfirmation buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public SubjectConfirmation buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new SubjectConfirmationImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/SubjectConfirmationImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/SubjectConfirmationImpl.java
index e74fe18..8278cbd 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/SubjectConfirmationImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/SubjectConfirmationImpl.java
@@ -54,7 +54,7 @@ public class SubjectConfirmationImpl extends AbstractSAMLObject implements Subje
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SubjectConfirmationImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SubjectConfirmationImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -72,7 +72,7 @@ public class SubjectConfirmationImpl extends AbstractSAMLObject implements Subje
     }
 
     /** {@inheritDoc} */
-    public void setSOAP11MustUnderstand(Boolean newMustUnderstand) {
+    public void setSOAP11MustUnderstand(final Boolean newMustUnderstand) {
         if (newMustUnderstand != null) {
             soap11MustUnderstand = prepareForAssignment(soap11MustUnderstand, 
                     new XSBooleanValue(newMustUnderstand, true));
@@ -84,7 +84,7 @@ public class SubjectConfirmationImpl extends AbstractSAMLObject implements Subje
     }
 
     /** {@inheritDoc} */
-    public void setSOAP11MustUnderstand(XSBooleanValue newMustUnderstand) {
+    public void setSOAP11MustUnderstand(final XSBooleanValue newMustUnderstand) {
             soap11MustUnderstand = prepareForAssignment(soap11MustUnderstand, newMustUnderstand);
             manageQualifiedAttributeNamespace(MustUnderstandBearing.SOAP11_MUST_UNDERSTAND_ATTR_NAME, 
                     soap11MustUnderstand != null);
@@ -96,7 +96,7 @@ public class SubjectConfirmationImpl extends AbstractSAMLObject implements Subje
     }
 
     /** {@inheritDoc} */
-    public void setSOAP11Actor(String newActor) {
+    public void setSOAP11Actor(final String newActor) {
         soap11Actor = prepareForAssignment(soap11Actor, newActor);
         manageQualifiedAttributeNamespace(ActorBearing.SOAP11_ACTOR_ATTR_NAME, soap11Actor != null);
     }
@@ -107,7 +107,7 @@ public class SubjectConfirmationImpl extends AbstractSAMLObject implements Subje
     }
 
     /** {@inheritDoc} */
-    public void setMethod(String newMethod) {
+    public void setMethod(final String newMethod) {
         method = prepareForAssignment(method, newMethod);
     }
 
@@ -117,7 +117,7 @@ public class SubjectConfirmationImpl extends AbstractSAMLObject implements Subje
     }
 
     /** {@inheritDoc} */
-    public void setSubjectConfirmationData(SubjectConfirmationData newSubjectConfirmationData) {
+    public void setSubjectConfirmationData(final SubjectConfirmationData newSubjectConfirmationData) {
         subjectConfirmationData = prepareForAssignment(subjectConfirmationData, newSubjectConfirmationData);
 
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/SubjectConfirmationMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/SubjectConfirmationMarshaller.java
index ad5606f..aeec924 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/SubjectConfirmationMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/SubjectConfirmationMarshaller.java
@@ -34,7 +34,7 @@ import org.w3c.dom.Element;
 public class SubjectConfirmationMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         SubjectConfirmation sc = (SubjectConfirmation) samlObject;
 
         if (sc.isSOAP11MustUnderstandXSBoolean() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/SubjectConfirmationUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/SubjectConfirmationUnmarshaller.java
index 78a55cb..2ef7a98 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/SubjectConfirmationUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/ecp/impl/SubjectConfirmationUnmarshaller.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Attr;
 public class SubjectConfirmationUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
         SubjectConfirmation sc = (SubjectConfirmation) parentObject;
 
         if (childObject instanceof SubjectConfirmationData) {
@@ -46,7 +46,7 @@ public class SubjectConfirmationUnmarshaller extends AbstractSAMLObjectUnmarshal
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         SubjectConfirmation sc = (SubjectConfirmation) samlObject;
 
         QName attrName = QNameSupport.getNodeQName(attribute);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationBuilder.java
index e6c92f9..6d925e7 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationBuilder.java
@@ -40,7 +40,7 @@ public class AdditionalMetadataLocationBuilder extends AbstractSAMLObjectBuilder
     }
 
     /** {@inheritDoc} */
-    public AdditionalMetadataLocation buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AdditionalMetadataLocation buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AdditionalMetadataLocationImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationImpl.java
index 9dfa985..fd60fcb 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationImpl.java
@@ -41,7 +41,7 @@ public class AdditionalMetadataLocationImpl extends AbstractSAMLObject implement
      * @param elementLocalName the local name
      * @param namespacePrefix the prefix name space
      */
-    protected AdditionalMetadataLocationImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AdditionalMetadataLocationImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -51,7 +51,7 @@ public class AdditionalMetadataLocationImpl extends AbstractSAMLObject implement
     }
 
     /** {@inheritDoc} */
-    public void setLocationURI(String locationURI) {
+    public void setLocationURI(final String locationURI) {
         location = prepareForAssignment(location, locationURI);
     }
 
@@ -61,7 +61,7 @@ public class AdditionalMetadataLocationImpl extends AbstractSAMLObject implement
     }
 
     /** {@inheritDoc} */
-    public void setNamespaceURI(String namespaceURI) {
+    public void setNamespaceURI(final String namespaceURI) {
         namespace = prepareForAssignment(namespace, namespaceURI);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationMarshaller.java
index 72d9ab4..8ddebcf 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationMarshaller.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Element;
 public class AdditionalMetadataLocationMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlElement, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
         AdditionalMetadataLocation aml = (AdditionalMetadataLocation) samlElement;
 
         if (aml.getNamespaceURI() != null) {
@@ -38,7 +38,7 @@ public class AdditionalMetadataLocationMarshaller extends AbstractSAMLObjectMars
     }
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         super.marshallElementContent(samlObject, domElement);
 
         AdditionalMetadataLocation aml = (AdditionalMetadataLocation) samlObject;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationUnmarshaller.java
index 28091ee..909b8fb 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AdditionalMetadataLocationUnmarshaller.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Attr;
 public class AdditionalMetadataLocationUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final AdditionalMetadataLocation aml = (AdditionalMetadataLocation) samlObject;
         
         if (attribute.getLocalName().equals(AdditionalMetadataLocation.NAMESPACE_ATTRIB_NAME)
@@ -41,7 +41,7 @@ public class AdditionalMetadataLocationUnmarshaller extends AbstractSAMLObjectUn
     }
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         final AdditionalMetadataLocation aml = (AdditionalMetadataLocation) samlObject;
         aml.setLocationURI(elementContent);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberBuilder.java
index 2fd0564..a4833cc 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberBuilder.java
@@ -40,7 +40,7 @@ public class AffiliateMemberBuilder extends AbstractSAMLObjectBuilder<AffiliateM
     }
 
     /** {@inheritDoc} */
-    public AffiliateMember buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AffiliateMember buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AffiliateMemberImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberImpl.java
index 9f7a42e..240d01d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberImpl.java
@@ -38,7 +38,7 @@ public class AffiliateMemberImpl extends AbstractSAMLObject implements Affiliate
      * @param elementLocalName local name
      * @param namespacePrefix prefix
      */
-    protected AffiliateMemberImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AffiliateMemberImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -50,7 +50,7 @@ public class AffiliateMemberImpl extends AbstractSAMLObject implements Affiliate
 
     /** {@inheritDoc} */
     @Override
-    public void setID(String newID) {
+    public void setID(final String newID) {
         if (newID != null && newID.length() > 1024) {
             throw new IllegalArgumentException("Member ID can not exceed 1024 characters in length");
         }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberMarshaller.java
index bc386de..3f55f7f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberMarshaller.java
@@ -31,7 +31,7 @@ public class AffiliateMemberMarshaller extends AbstractSAMLObjectMarshaller {
     /**
      * {@inheritDoc}
      */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         super.marshallElementContent(samlObject, domElement);
 
         AffiliateMember member = (AffiliateMember) samlObject;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberUnmarshaller.java
index dfd0f81..d416f92 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberUnmarshaller.java
@@ -27,7 +27,7 @@ import org.opensaml.saml.saml2.metadata.AffiliateMember;
 public class AffiliateMemberUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         AffiliateMember member = (AffiliateMember) samlObject;
         member.setID(elementContent);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorBuilder.java
index a7000d6..1d9f40f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorBuilder.java
@@ -40,7 +40,7 @@ public class AffiliationDescriptorBuilder extends AbstractSAMLObjectBuilder<Affi
     }
 
     /** {@inheritDoc} */
-    public AffiliationDescriptor buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AffiliationDescriptor buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AffiliationDescriptorImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorImpl.java
index 1223d58..4fe6917 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorImpl.java
@@ -71,7 +71,7 @@ public class AffiliationDescriptorImpl extends AbstractSignableSAMLObject implem
      * @param elementLocalName localname
      * @param namespacePrefix prefix
      */
-    protected AffiliationDescriptorImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AffiliationDescriptorImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         unknownAttributes = new AttributeMap(this);
         members = new XMLObjectChildrenList<>(this);
@@ -86,7 +86,7 @@ public class AffiliationDescriptorImpl extends AbstractSignableSAMLObject implem
 
     /** {@inheritDoc} */
     @Override
-    public void setOwnerID(String newOwnerID) {
+    public void setOwnerID(final String newOwnerID) {
         if (newOwnerID != null && newOwnerID.length() > 1024) {
             throw new IllegalArgumentException("Owner ID can not exceed 1024 characters in length");
         }
@@ -101,7 +101,7 @@ public class AffiliationDescriptorImpl extends AbstractSignableSAMLObject implem
     
     /** {@inheritDoc} */
     @Override
-    public void setID(String newID) {
+    public void setID(final String newID) {
         String oldID = this.id;
         this.id = prepareForAssignment(this.id, newID);
         registerOwnID(oldID, this.id);
@@ -126,7 +126,7 @@ public class AffiliationDescriptorImpl extends AbstractSignableSAMLObject implem
 
     /** {@inheritDoc} */
     @Override
-    public void setValidUntil(DateTime theValidUntil) {
+    public void setValidUntil(final DateTime theValidUntil) {
         this.validUntil = prepareForAssignment(this.validUntil, theValidUntil);
     }
 
@@ -138,7 +138,7 @@ public class AffiliationDescriptorImpl extends AbstractSignableSAMLObject implem
 
     /** {@inheritDoc} */
     @Override
-    public void setCacheDuration(Long duration) {
+    public void setCacheDuration(final Long duration) {
         cacheDuration = prepareForAssignment(cacheDuration, duration);
     }
 
@@ -150,7 +150,7 @@ public class AffiliationDescriptorImpl extends AbstractSignableSAMLObject implem
 
     /** {@inheritDoc} */
     @Override
-    public void setExtensions(Extensions theExtensions) {
+    public void setExtensions(final Extensions theExtensions) {
         this.extensions = prepareForAssignment(this.extensions, theExtensions);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorMarshaller.java
index f45895b..cac006a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorMarshaller.java
@@ -43,7 +43,7 @@ public class AffiliationDescriptorMarshaller extends AbstractSAMLObjectMarshalle
     private final Logger log = LoggerFactory.getLogger(AffiliationDescriptorMarshaller.class);
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlElement, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
         AffiliationDescriptor descriptor = (AffiliationDescriptor) samlElement;
 
         // Set affiliationOwnerID
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorUnmarshaller.java
index 06fd1a9..9ebb10b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliationDescriptorUnmarshaller.java
@@ -41,7 +41,7 @@ import com.google.common.base.Strings;
 public class AffiliationDescriptorUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         final AffiliationDescriptor descriptor = (AffiliationDescriptor) parentSAMLObject;
 
@@ -59,7 +59,7 @@ public class AffiliationDescriptorUnmarshaller extends AbstractSAMLObjectUnmarsh
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final AffiliationDescriptor descriptor = (AffiliationDescriptor) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ArtifactResolutionServiceBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ArtifactResolutionServiceBuilder.java
index 48d5e2a..d6620c1 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ArtifactResolutionServiceBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ArtifactResolutionServiceBuilder.java
@@ -44,7 +44,7 @@ public class ArtifactResolutionServiceBuilder extends AbstractSAMLObjectBuilder<
     }
 
     /** {@inheritDoc} */
-    public ArtifactResolutionService buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ArtifactResolutionService buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ArtifactResolutionServiceImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ArtifactResolutionServiceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ArtifactResolutionServiceImpl.java
index 4d075c5..883b385 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ArtifactResolutionServiceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ArtifactResolutionServiceImpl.java
@@ -35,7 +35,7 @@ public class ArtifactResolutionServiceImpl extends IndexedEndpointImpl implement
      * @param elementLocalName local name
      * @param namespacePrefix prefix
      */
-    protected ArtifactResolutionServiceImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ArtifactResolutionServiceImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionConsumerServiceBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionConsumerServiceBuilder.java
index 2ca77d4..a61b704 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionConsumerServiceBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionConsumerServiceBuilder.java
@@ -44,7 +44,7 @@ public class AssertionConsumerServiceBuilder extends AbstractSAMLObjectBuilder<A
     }
 
     /** {@inheritDoc} */
-    public AssertionConsumerService buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AssertionConsumerService buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AssertionConsumerServiceImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionConsumerServiceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionConsumerServiceImpl.java
index f449062..6447df1 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionConsumerServiceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionConsumerServiceImpl.java
@@ -35,7 +35,7 @@ public class AssertionConsumerServiceImpl extends IndexedEndpointImpl implements
      * @param elementLocalName local name
      * @param namespacePrefix prefix
      */
-    protected AssertionConsumerServiceImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AssertionConsumerServiceImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceBuilder.java
index b59d202..7af6007 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceBuilder.java
@@ -44,7 +44,7 @@ public class AssertionIDRequestServiceBuilder extends AbstractSAMLObjectBuilder<
     }
 
     /** {@inheritDoc} */
-    public AssertionIDRequestService buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AssertionIDRequestService buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AssertionIDRequestServiceImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceImpl.java
index 4381af5..851d673 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AssertionIDRequestServiceImpl.java
@@ -35,7 +35,7 @@ public class AssertionIDRequestServiceImpl extends EndpointImpl implements Asser
      * @param elementLocalName local name
      * @param namespacePrefix prefix
      */
-    protected AssertionIDRequestServiceImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AssertionIDRequestServiceImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeAuthorityDescriptorBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeAuthorityDescriptorBuilder.java
index 3e77ac7..d519b3d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeAuthorityDescriptorBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeAuthorityDescriptorBuilder.java
@@ -44,7 +44,7 @@ public class AttributeAuthorityDescriptorBuilder extends AbstractSAMLObjectBuild
     }
 
     /** {@inheritDoc} */
-    public AttributeAuthorityDescriptor buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AttributeAuthorityDescriptor buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AttributeAuthorityDescriptorImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeAuthorityDescriptorImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeAuthorityDescriptorImpl.java
index a2a3d86..1233aa9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeAuthorityDescriptorImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeAuthorityDescriptorImpl.java
@@ -60,7 +60,7 @@ public class AttributeAuthorityDescriptorImpl extends RoleDescriptorImpl impleme
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AttributeAuthorityDescriptorImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AttributeAuthorityDescriptorImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         attributeServices = new XMLObjectChildrenList<>(this);
         assertionIDRequestServices = new XMLObjectChildrenList<>(this);
@@ -103,7 +103,7 @@ public class AttributeAuthorityDescriptorImpl extends RoleDescriptorImpl impleme
     }
     
     /** {@inheritDoc} */
-    public List<Endpoint> getEndpoints(QName type) {
+    public List<Endpoint> getEndpoints(final QName type) {
         if(type.equals(AttributeService.DEFAULT_ELEMENT_NAME)){
             return Collections.unmodifiableList(new ArrayList<Endpoint>(attributeServices));
         }else if(type.equals(AssertionIDRequestService.DEFAULT_ELEMENT_NAME)){
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeAuthorityDescriptorUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeAuthorityDescriptorUnmarshaller.java
index 1c9c36e..5f75668 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeAuthorityDescriptorUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeAuthorityDescriptorUnmarshaller.java
@@ -36,7 +36,7 @@ import org.opensaml.saml.saml2.metadata.NameIDFormat;
 public class AttributeAuthorityDescriptorUnmarshaller extends RoleDescriptorUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentElement, XMLObject childElement) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentElement, final XMLObject childElement) throws UnmarshallingException {
         AttributeAuthorityDescriptor descriptor = (AttributeAuthorityDescriptor) parentElement;
 
         if (childElement instanceof AttributeService) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceBuilder.java
index 37a4286..f1b4fc5 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceBuilder.java
@@ -44,7 +44,7 @@ public class AttributeConsumingServiceBuilder extends AbstractSAMLObjectBuilder<
     }
 
     /** {@inheritDoc} */
-    public AttributeConsumingService buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AttributeConsumingService buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AttributeConsumingServiceImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceImpl.java
index 7360add..cd243af 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceImpl.java
@@ -61,7 +61,7 @@ public class AttributeConsumingServiceImpl extends AbstractSAMLObject implements
      * @param elementLocalName local name
      * @param namespacePrefix prefix
      */
-    protected AttributeConsumingServiceImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AttributeConsumingServiceImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         serviceNames = new XMLObjectChildrenList<>(this);
         serviceDescriptions = new XMLObjectChildrenList<>(this);
@@ -74,7 +74,7 @@ public class AttributeConsumingServiceImpl extends AbstractSAMLObject implements
     }
 
     /** {@inheritDoc} */
-    public void setIndex(int theIndex) {
+    public void setIndex(final int theIndex) {
         if (this.index != theIndex) {
             releaseThisandParentDOM();
             this.index = theIndex;
@@ -96,7 +96,7 @@ public class AttributeConsumingServiceImpl extends AbstractSAMLObject implements
     }
     
     /** {@inheritDoc} */
-    public void setIsDefault(Boolean newIsDefault){
+    public void setIsDefault(final Boolean newIsDefault){
         if(newIsDefault != null){
             isDefault = prepareForAssignment(isDefault, new XSBooleanValue(newIsDefault, false));
         }else{
@@ -105,7 +105,7 @@ public class AttributeConsumingServiceImpl extends AbstractSAMLObject implements
     }
 
     /** {@inheritDoc} */
-    public void setIsDefault(XSBooleanValue newIsDefault) {
+    public void setIsDefault(final XSBooleanValue newIsDefault) {
         isDefault = prepareForAssignment(isDefault, newIsDefault);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceMarshaller.java
index fef27c9..6d11c54 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceMarshaller.java
@@ -33,7 +33,7 @@ import org.w3c.dom.Element;
 public class AttributeConsumingServiceMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         AttributeConsumingService service = (AttributeConsumingService) samlObject;
 
         domElement.setAttributeNS(null, AttributeConsumingService.INDEX_ATTRIB_NAME, Integer.toString(service
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceUnmarshaller.java
index 5c0e6e9..c0e1217 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeConsumingServiceUnmarshaller.java
@@ -37,7 +37,7 @@ import org.w3c.dom.Attr;
 public class AttributeConsumingServiceUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         final AttributeConsumingService service = (AttributeConsumingService) parentSAMLObject;
 
@@ -53,7 +53,7 @@ public class AttributeConsumingServiceUnmarshaller extends AbstractSAMLObjectUnm
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final AttributeConsumingService service = (AttributeConsumingService) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileBuilder.java
index 79be898..5372763 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileBuilder.java
@@ -44,7 +44,7 @@ public class AttributeProfileBuilder extends AbstractSAMLObjectBuilder<Attribute
     }
 
     /** {@inheritDoc} */
-    public AttributeProfile buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AttributeProfile buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AttributeProfileImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileImpl.java
index 553a9f1..2a5e171 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileImpl.java
@@ -42,7 +42,7 @@ public class AttributeProfileImpl extends AbstractSAMLObject implements Attribut
      * @param elementLocalName local name
      * @param namespacePrefix prefix
      */
-    protected AttributeProfileImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AttributeProfileImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -52,7 +52,7 @@ public class AttributeProfileImpl extends AbstractSAMLObject implements Attribut
     }
 
     /** {@inheritDoc} */
-    public void setProfileURI(String theProfileURI) {
+    public void setProfileURI(final String theProfileURI) {
         this.profileURI = prepareForAssignment(this.profileURI, theProfileURI);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileMarshaller.java
index 41b8369..c365811 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileMarshaller.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
 public class AttributeProfileMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         AttributeProfile profile = (AttributeProfile) samlObject;
         if (profile.getProfileURI() != null) {
             ElementSupport.appendTextContent(domElement, profile.getProfileURI());
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileUnmarshaller.java
index 7937d4c..322eae5 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeProfileUnmarshaller.java
@@ -31,7 +31,7 @@ import org.opensaml.saml.saml2.metadata.AttributeProfile;
 public class AttributeProfileUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         ((AttributeProfile) samlObject).setProfileURI(elementContent);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeServiceBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeServiceBuilder.java
index 9266c1a..61c0b3a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeServiceBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeServiceBuilder.java
@@ -44,7 +44,7 @@ public class AttributeServiceBuilder extends AbstractSAMLObjectBuilder<Attribute
     }
 
     /** {@inheritDoc} */
-    public AttributeService buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AttributeService buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AttributeServiceImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeServiceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeServiceImpl.java
index 9a3017f..c819823 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeServiceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AttributeServiceImpl.java
@@ -35,7 +35,7 @@ public class AttributeServiceImpl extends EndpointImpl implements AttributeServi
      * @param elementLocalName local name
      * @param namespacePrefix prefix
      */
-    protected AttributeServiceImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AttributeServiceImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnAuthorityDescriptorBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnAuthorityDescriptorBuilder.java
index 7789e05..2a138a4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnAuthorityDescriptorBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnAuthorityDescriptorBuilder.java
@@ -40,7 +40,7 @@ public class AuthnAuthorityDescriptorBuilder extends AbstractSAMLObjectBuilder<A
     }
 
     /** {@inheritDoc} */
-    public AuthnAuthorityDescriptor buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AuthnAuthorityDescriptor buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AuthnAuthorityDescriptorImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnAuthorityDescriptorImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnAuthorityDescriptorImpl.java
index 2fd03e5..c30d3b2 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnAuthorityDescriptorImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnAuthorityDescriptorImpl.java
@@ -52,7 +52,7 @@ public class AuthnAuthorityDescriptorImpl extends RoleDescriptorImpl implements
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected AuthnAuthorityDescriptorImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AuthnAuthorityDescriptorImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         authnQueryServices = new XMLObjectChildrenList<>(this);
         assertionIDRequestServices = new XMLObjectChildrenList<>(this);
@@ -83,7 +83,7 @@ public class AuthnAuthorityDescriptorImpl extends RoleDescriptorImpl implements
     }
     
     /** {@inheritDoc} */
-    public List<Endpoint> getEndpoints(QName type) {
+    public List<Endpoint> getEndpoints(final QName type) {
         if(type.equals(AuthnQueryService.DEFAULT_ELEMENT_NAME)){
             return Collections.unmodifiableList(new ArrayList<Endpoint>(authnQueryServices));
         }else if(type.equals(AssertionIDRequestService.DEFAULT_ELEMENT_NAME)){
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnAuthorityDescriptorUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnAuthorityDescriptorUnmarshaller.java
index d52fa3a..2eab297 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnAuthorityDescriptorUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnAuthorityDescriptorUnmarshaller.java
@@ -30,7 +30,7 @@ import org.opensaml.saml.saml2.metadata.NameIDFormat;
 public class AuthnAuthorityDescriptorUnmarshaller extends RoleDescriptorUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentElement, XMLObject childElement) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentElement, final XMLObject childElement) throws UnmarshallingException {
         AuthnAuthorityDescriptor descriptor = (AuthnAuthorityDescriptor) parentElement;
 
         if (childElement instanceof AuthnQueryService) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnQueryServiceBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnQueryServiceBuilder.java
index 040d533..f836301 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnQueryServiceBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnQueryServiceBuilder.java
@@ -44,7 +44,7 @@ public class AuthnQueryServiceBuilder extends AbstractSAMLObjectBuilder<AuthnQue
     }
 
     /** {@inheritDoc} */
-    public AuthnQueryService buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AuthnQueryService buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AuthnQueryServiceImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnQueryServiceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnQueryServiceImpl.java
index 798b35b..0ec7614 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnQueryServiceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnQueryServiceImpl.java
@@ -35,7 +35,7 @@ public class AuthnQueryServiceImpl extends EndpointImpl implements AuthnQuerySer
      * @param elementLocalName local name
      * @param namespacePrefix prefix
      */
-    protected AuthnQueryServiceImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AuthnQueryServiceImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthzServiceBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthzServiceBuilder.java
index 382eb83..f382c0d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthzServiceBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthzServiceBuilder.java
@@ -40,7 +40,7 @@ public class AuthzServiceBuilder extends AbstractSAMLObjectBuilder<AuthzService>
     }
 
     /** {@inheritDoc} */
-    public AuthzService buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public AuthzService buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new AuthzServiceImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthzServiceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthzServiceImpl.java
index 95b62c9..28e2971 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthzServiceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthzServiceImpl.java
@@ -35,7 +35,7 @@ public class AuthzServiceImpl extends EndpointImpl implements AuthzService {
      * @param elementLocalName local name
      * @param namespacePrefix prefix
      */
-    protected AuthzServiceImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected AuthzServiceImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyBuilder.java
index 366ea3e..c4c3378 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyBuilder.java
@@ -44,7 +44,7 @@ public class CompanyBuilder extends AbstractSAMLObjectBuilder<Company> {
     }
 
     /** {@inheritDoc} */
-    public Company buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Company buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new CompanyImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyImpl.java
index 60e72a3..7ac9f7f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyImpl.java
@@ -42,7 +42,7 @@ public class CompanyImpl extends AbstractSAMLObject implements Company {
      * @param elementLocalName local name
      * @param namespacePrefix prefix
      */
-    protected CompanyImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected CompanyImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -52,7 +52,7 @@ public class CompanyImpl extends AbstractSAMLObject implements Company {
     }
 
     /** {@inheritDoc} */
-    public void setName(String newName) {
+    public void setName(final String newName) {
         companyName = prepareForAssignment(companyName, newName);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyMarshaller.java
index 959f2aa..5bf5877 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyMarshaller.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
 public class CompanyMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         Company company = (Company) samlObject;
 
         if (company.getName() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyUnmarshaller.java
index 9573590..2bea40c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/CompanyUnmarshaller.java
@@ -31,7 +31,7 @@ import org.opensaml.saml.saml2.metadata.Company;
 public class CompanyUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         Company company = (Company) samlObject;
 
         company.setName(elementContent);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonBuilder.java
index 535c3db..42a924d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonBuilder.java
@@ -44,7 +44,7 @@ public class ContactPersonBuilder extends AbstractSAMLObjectBuilder<ContactPerso
     }
 
     /** {@inheritDoc} */
-    public ContactPerson buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ContactPerson buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ContactPersonImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonImpl.java
index 7e7c6ec..e80dfeb 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonImpl.java
@@ -73,7 +73,7 @@ public class ContactPersonImpl extends AbstractSAMLObject implements ContactPers
      * @param elementLocalName local name
      * @param namespacePrefix prefix
      */
-    protected ContactPersonImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ContactPersonImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         unknownAttributes = new AttributeMap(this);
         emailAddresses = new XMLObjectChildrenList<>(this);
@@ -88,7 +88,7 @@ public class ContactPersonImpl extends AbstractSAMLObject implements ContactPers
 
     /** {@inheritDoc} */
     @Override
-    public void setType(ContactPersonTypeEnumeration theType) {
+    public void setType(final ContactPersonTypeEnumeration theType) {
         this.type = prepareForAssignment(this.type, theType);
     }
 
@@ -100,7 +100,7 @@ public class ContactPersonImpl extends AbstractSAMLObject implements ContactPers
 
     /** {@inheritDoc} */
     @Override
-    public void setExtensions(Extensions theExtensions) {
+    public void setExtensions(final Extensions theExtensions) {
         this.extensions = prepareForAssignment(this.extensions, theExtensions);
     }
 
@@ -112,7 +112,7 @@ public class ContactPersonImpl extends AbstractSAMLObject implements ContactPers
 
     /** {@inheritDoc} */
     @Override
-    public void setCompany(Company theCompany) {
+    public void setCompany(final Company theCompany) {
         this.company = prepareForAssignment(this.company, theCompany);
     }
 
@@ -124,7 +124,7 @@ public class ContactPersonImpl extends AbstractSAMLObject implements ContactPers
 
     /** {@inheritDoc} */
     @Override
-    public void setGivenName(GivenName name) {
+    public void setGivenName(final GivenName name) {
         givenName = prepareForAssignment(givenName, name);
     }
 
@@ -136,7 +136,7 @@ public class ContactPersonImpl extends AbstractSAMLObject implements ContactPers
 
     /** {@inheritDoc} */
     @Override
-    public void setSurName(SurName name) {
+    public void setSurName(final SurName name) {
         surName = prepareForAssignment(surName, name);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonMarshaller.java
index 40fbaf1..b0c499b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonMarshaller.java
@@ -33,7 +33,7 @@ import org.w3c.dom.Element;
 public class ContactPersonMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         ContactPerson person = (ContactPerson) samlObject;
 
         if (person.getType() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonUnmarshaller.java
index 24805a4..e45cec3 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ContactPersonUnmarshaller.java
@@ -40,7 +40,7 @@ import org.w3c.dom.Attr;
 public class ContactPersonUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         ContactPerson person = (ContactPerson) parentSAMLObject;
 
@@ -62,7 +62,7 @@ public class ContactPersonUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         ContactPerson person = (ContactPerson) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressBuilder.java
index 5ad65df..5ee60f1 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressBuilder.java
@@ -44,7 +44,7 @@ public class EmailAddressBuilder extends AbstractSAMLObjectBuilder<EmailAddress>
     }
 
     /** {@inheritDoc} */
-    public EmailAddress buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public EmailAddress buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new EmailAddressImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressImpl.java
index 9a8b689..91dd1dd 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressImpl.java
@@ -42,7 +42,7 @@ public class EmailAddressImpl extends AbstractSAMLObject implements EmailAddress
      * @param elementLocalName local name
      * @param namespacePrefix prefix
      */
-    protected EmailAddressImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected EmailAddressImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -54,7 +54,7 @@ public class EmailAddressImpl extends AbstractSAMLObject implements EmailAddress
 
     /** {@inheritDoc} */
     @Override
-    public void setAddress(String addr) {
+    public void setAddress(final String addr) {
         address = prepareForAssignment(address, addr);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressMarshaller.java
index 4a468e1..bd032ed 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressMarshaller.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
 public class EmailAddressMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         EmailAddress address = (EmailAddress) samlObject;
 
         if (address.getAddress() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressUnmarshaller.java
index 65fe0ab..9b4e56e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EmailAddressUnmarshaller.java
@@ -31,7 +31,7 @@ import org.opensaml.saml.saml2.metadata.EmailAddress;
 public class EmailAddressUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         EmailAddress address = (EmailAddress) samlObject;
 
         address.setAddress(elementContent);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EncryptionMethodBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EncryptionMethodBuilder.java
index 9df2379..ca55589 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EncryptionMethodBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EncryptionMethodBuilder.java
@@ -36,7 +36,7 @@ public class EncryptionMethodBuilder extends AbstractSAMLObjectBuilder<Encryptio
     }
 
     /** {@inheritDoc} */
-    public EncryptionMethod buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public EncryptionMethod buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new EncryptionMethodImpl(namespaceURI, localName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EncryptionMethodImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EncryptionMethodImpl.java
index d2103c8..11ac7aa 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EncryptionMethodImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EncryptionMethodImpl.java
@@ -36,7 +36,7 @@ public class EncryptionMethodImpl extends org.opensaml.xmlsec.encryption.impl.En
      * @param elementLocalName local name
      * @param namespacePrefix prefix
      */
-    protected EncryptionMethodImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected EncryptionMethodImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EndpointImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EndpointImpl.java
index d174f40..f313815 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EndpointImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EndpointImpl.java
@@ -55,7 +55,7 @@ public abstract class EndpointImpl extends AbstractSAMLObject implements Endpoin
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected EndpointImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected EndpointImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         unknownAttributes = new AttributeMap(this);
         unknownChildren = new IndexedXMLObjectChildrenList<>(this);
@@ -67,7 +67,7 @@ public abstract class EndpointImpl extends AbstractSAMLObject implements Endpoin
     }
 
     /** {@inheritDoc} */
-    public void setBinding(String binding) {
+    public void setBinding(final String binding) {
         bindingId = prepareForAssignment(bindingId, binding);
     }
 
@@ -77,7 +77,7 @@ public abstract class EndpointImpl extends AbstractSAMLObject implements Endpoin
     }
 
     /** {@inheritDoc} */
-    public void setLocation(String theLocation) {
+    public void setLocation(final String theLocation) {
         this.location = prepareForAssignment(this.location, theLocation);
     }
 
@@ -87,7 +87,7 @@ public abstract class EndpointImpl extends AbstractSAMLObject implements Endpoin
     }
 
     /** {@inheritDoc} */
-    public void setResponseLocation(String theLocation) {
+    public void setResponseLocation(final String theLocation) {
         responseLocation = prepareForAssignment(responseLocation, theLocation);
     }
 
@@ -106,7 +106,7 @@ public abstract class EndpointImpl extends AbstractSAMLObject implements Endpoin
     }
 
     /** {@inheritDoc} */
-    public List<XMLObject> getUnknownXMLObjects(QName typeOrName) {
+    public List<XMLObject> getUnknownXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) unknownChildren.subList(typeOrName);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EndpointMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EndpointMarshaller.java
index cb43316..4712735 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EndpointMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EndpointMarshaller.java
@@ -28,7 +28,7 @@ import org.w3c.dom.Element;
 public class EndpointMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    public void marshallAttributes(XMLObject samlElement, Element domElement) {
+    public void marshallAttributes(final XMLObject samlElement, final Element domElement) {
         Endpoint endpoint = (Endpoint) samlElement;
 
         if (endpoint.getBinding() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EndpointUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EndpointUnmarshaller.java
index 65d4d6c..7d81608 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EndpointUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EndpointUnmarshaller.java
@@ -29,7 +29,7 @@ import org.w3c.dom.Attr;
 public class EndpointUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final Endpoint endpoint = (Endpoint) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
@@ -50,7 +50,7 @@ public class EndpointUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     /**
      * {@inheritDoc}
      */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         final Endpoint endpoint = (Endpoint) parentSAMLObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorBuilder.java
index 277b5d9..9ff4bcc 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorBuilder.java
@@ -40,7 +40,7 @@ public class EntitiesDescriptorBuilder extends AbstractSAMLObjectBuilder<Entitie
     }
 
     /** {@inheritDoc} */
-    public EntitiesDescriptor buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public EntitiesDescriptor buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new EntitiesDescriptorImpl(namespaceURI, localName, namespacePrefix);
     }
 }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorImpl.java
index d24c3d4..2591c72 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorImpl.java
@@ -60,7 +60,7 @@ public class EntitiesDescriptorImpl extends AbstractSignableSAMLObject implement
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected EntitiesDescriptorImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected EntitiesDescriptorImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         orderedDescriptors = new IndexedXMLObjectChildrenList<>(this);
     }
@@ -71,7 +71,7 @@ public class EntitiesDescriptorImpl extends AbstractSignableSAMLObject implement
     }
 
     /** {@inheritDoc} */
-    public void setName(String newName) {
+    public void setName(final String newName) {
         this.name = prepareForAssignment(this.name, newName);
     }
 
@@ -81,7 +81,7 @@ public class EntitiesDescriptorImpl extends AbstractSignableSAMLObject implement
     }
 
     /** {@inheritDoc} */
-    public void setID(String newID) {
+    public void setID(final String newID) {
         String oldID = this.id;
         this.id = prepareForAssignment(this.id, newID);
         registerOwnID(oldID, this.id);
@@ -103,7 +103,7 @@ public class EntitiesDescriptorImpl extends AbstractSignableSAMLObject implement
     }
 
     /** {@inheritDoc} */
-    public void setValidUntil(DateTime newValidUntil) {
+    public void setValidUntil(final DateTime newValidUntil) {
         validUntil = prepareForAssignment(validUntil, newValidUntil);
     }
 
@@ -113,7 +113,7 @@ public class EntitiesDescriptorImpl extends AbstractSignableSAMLObject implement
     }
 
     /** {@inheritDoc} */
-    public void setCacheDuration(Long duration) {
+    public void setCacheDuration(final Long duration) {
         cacheDuration = prepareForAssignment(cacheDuration, duration);
     }
 
@@ -123,7 +123,7 @@ public class EntitiesDescriptorImpl extends AbstractSignableSAMLObject implement
     }
 
     /** {@inheritDoc} */
-    public void setExtensions(Extensions newExtensions) {
+    public void setExtensions(final Extensions newExtensions) {
         extensions = prepareForAssignment(extensions, newExtensions);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorMarshaller.java
index 7abb886..7e4d665 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorMarshaller.java
@@ -38,7 +38,7 @@ public class EntitiesDescriptorMarshaller extends AbstractSAMLObjectMarshaller {
     private final Logger log = LoggerFactory.getLogger(EntitiesDescriptorMarshaller.class);
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlElement, Element domElement) {
+    protected void marshallAttributes(final XMLObject samlElement, final Element domElement) {
 
         EntitiesDescriptor entitiesDescriptor = (EntitiesDescriptor) samlElement;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorUnmarshaller.java
index 87a99f5..33ae690 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntitiesDescriptorUnmarshaller.java
@@ -40,7 +40,7 @@ import com.google.common.base.Strings;
 public class EntitiesDescriptorUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         final EntitiesDescriptor entitiesDescriptor = (EntitiesDescriptor) parentSAMLObject;
 
@@ -58,7 +58,7 @@ public class EntitiesDescriptorUnmarshaller extends AbstractSAMLObjectUnmarshall
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final EntitiesDescriptor entitiesDescriptor = (EntitiesDescriptor) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorBuilder.java
index 63c9e9d..aca469a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorBuilder.java
@@ -40,7 +40,7 @@ public class EntityDescriptorBuilder extends AbstractSAMLObjectBuilder<EntityDes
     }
 
     /** {@inheritDoc} */
-    public EntityDescriptor buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public EntityDescriptor buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new EntityDescriptorImpl(namespaceURI, localName, namespacePrefix);
     }
 }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorImpl.java
index 035d544..0f26aae 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorImpl.java
@@ -87,7 +87,7 @@ public class EntityDescriptorImpl extends AbstractSignableSAMLObject implements
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected EntityDescriptorImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected EntityDescriptorImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         roleDescriptors = new IndexedXMLObjectChildrenList<>(this);
         contactPersons = new XMLObjectChildrenList<>(this);
@@ -101,7 +101,7 @@ public class EntityDescriptorImpl extends AbstractSignableSAMLObject implements
     }
 
     /** {@inheritDoc} */
-    public void setEntityID(String newId) {
+    public void setEntityID(final String newId) {
         if (newId != null && newId.length() > 1024) {
             throw new IllegalArgumentException("Entity ID can not exceed 1024 characters in length");
         }
@@ -114,7 +114,7 @@ public class EntityDescriptorImpl extends AbstractSignableSAMLObject implements
     }
 
     /** {@inheritDoc} */
-    public void setID(String newID) {
+    public void setID(final String newID) {
         String oldID = this.id;
         this.id = prepareForAssignment(this.id, newID);
         registerOwnID(oldID, this.id);
@@ -136,7 +136,7 @@ public class EntityDescriptorImpl extends AbstractSignableSAMLObject implements
     }
 
     /** {@inheritDoc} */
-    public void setValidUntil(DateTime newValidUntil) {
+    public void setValidUntil(final DateTime newValidUntil) {
         validUntil = prepareForAssignment(validUntil, newValidUntil);
     }
 
@@ -146,7 +146,7 @@ public class EntityDescriptorImpl extends AbstractSignableSAMLObject implements
     }
 
     /** {@inheritDoc} */
-    public void setCacheDuration(Long duration) {
+    public void setCacheDuration(final Long duration) {
         cacheDuration = prepareForAssignment(cacheDuration, duration);
     }
 
@@ -156,7 +156,7 @@ public class EntityDescriptorImpl extends AbstractSignableSAMLObject implements
     }
 
     /** {@inheritDoc} */
-    public void setExtensions(Extensions newExtensions) {
+    public void setExtensions(final Extensions newExtensions) {
         extensions = prepareForAssignment(extensions, newExtensions);
     }
 
@@ -166,12 +166,12 @@ public class EntityDescriptorImpl extends AbstractSignableSAMLObject implements
     }
 
     /** {@inheritDoc} */
-    public List<RoleDescriptor> getRoleDescriptors(QName typeOrName) {
+    public List<RoleDescriptor> getRoleDescriptors(final QName typeOrName) {
         return (List<RoleDescriptor>) roleDescriptors.subList(typeOrName);
     }
 
     /** {@inheritDoc} */
-    public List<RoleDescriptor> getRoleDescriptors(QName type, String supportedProtocol) {
+    public List<RoleDescriptor> getRoleDescriptors(final QName type, final String supportedProtocol) {
         ArrayList<RoleDescriptor> supportingRoleDescriptors = new ArrayList<>();
         for (RoleDescriptor descriptor : roleDescriptors.subList(type)) {
             if (descriptor.isSupportedProtocol(supportedProtocol)) {
@@ -183,7 +183,7 @@ public class EntityDescriptorImpl extends AbstractSignableSAMLObject implements
     }
 
     /** {@inheritDoc} */
-    public IDPSSODescriptor getIDPSSODescriptor(String supportedProtocol) {
+    public IDPSSODescriptor getIDPSSODescriptor(final String supportedProtocol) {
         List<RoleDescriptor> descriptors = getRoleDescriptors(IDPSSODescriptor.DEFAULT_ELEMENT_NAME, supportedProtocol);
         if (descriptors.size() > 0) {
             return (IDPSSODescriptor) descriptors.get(0);
@@ -193,7 +193,7 @@ public class EntityDescriptorImpl extends AbstractSignableSAMLObject implements
     }
 
     /** {@inheritDoc} */
-    public SPSSODescriptor getSPSSODescriptor(String supportedProtocol) {
+    public SPSSODescriptor getSPSSODescriptor(final String supportedProtocol) {
         List<RoleDescriptor> descriptors = getRoleDescriptors(SPSSODescriptor.DEFAULT_ELEMENT_NAME, supportedProtocol);
         if (descriptors.size() > 0) {
             return (SPSSODescriptor) descriptors.get(0);
@@ -203,7 +203,7 @@ public class EntityDescriptorImpl extends AbstractSignableSAMLObject implements
     }
 
     /** {@inheritDoc} */
-    public AuthnAuthorityDescriptor getAuthnAuthorityDescriptor(String supportedProtocol) {
+    public AuthnAuthorityDescriptor getAuthnAuthorityDescriptor(final String supportedProtocol) {
         List<RoleDescriptor> descriptors = getRoleDescriptors(AuthnAuthorityDescriptor.DEFAULT_ELEMENT_NAME,
                 supportedProtocol);
         if (descriptors.size() > 0) {
@@ -214,7 +214,7 @@ public class EntityDescriptorImpl extends AbstractSignableSAMLObject implements
     }
 
     /** {@inheritDoc} */
-    public AttributeAuthorityDescriptor getAttributeAuthorityDescriptor(String supportedProtocol) {
+    public AttributeAuthorityDescriptor getAttributeAuthorityDescriptor(final String supportedProtocol) {
         List<RoleDescriptor> descriptors = getRoleDescriptors(AttributeAuthorityDescriptor.DEFAULT_ELEMENT_NAME,
                 supportedProtocol);
         if (descriptors.size() > 0) {
@@ -225,7 +225,7 @@ public class EntityDescriptorImpl extends AbstractSignableSAMLObject implements
     }
 
     /** {@inheritDoc} */
-    public PDPDescriptor getPDPDescriptor(String supportedProtocol) {
+    public PDPDescriptor getPDPDescriptor(final String supportedProtocol) {
         List<RoleDescriptor> descriptors = getRoleDescriptors(PDPDescriptor.DEFAULT_ELEMENT_NAME, supportedProtocol);
         if (descriptors.size() > 0) {
             return (PDPDescriptor) descriptors.get(0);
@@ -240,7 +240,7 @@ public class EntityDescriptorImpl extends AbstractSignableSAMLObject implements
     }
 
     /** {@inheritDoc} */
-    public void setAffiliationDescriptor(AffiliationDescriptor descriptor) {
+    public void setAffiliationDescriptor(final AffiliationDescriptor descriptor) {
         affiliationDescriptor = prepareForAssignment(affiliationDescriptor, descriptor);
     }
 
@@ -250,7 +250,7 @@ public class EntityDescriptorImpl extends AbstractSignableSAMLObject implements
     }
 
     /** {@inheritDoc} */
-    public void setOrganization(Organization newOrganization) {
+    public void setOrganization(final Organization newOrganization) {
         organization = prepareForAssignment(organization, newOrganization);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorMarshaller.java
index 7054864..f258045 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorMarshaller.java
@@ -38,7 +38,7 @@ public class EntityDescriptorMarshaller extends AbstractSAMLObjectMarshaller {
     private final Logger log = LoggerFactory.getLogger(EntityDescriptorMarshaller.class);
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlElement, Element domElement) {
+    protected void marshallAttributes(final XMLObject samlElement, final Element domElement) {
         EntityDescriptor entityDescriptor = (EntityDescriptor) samlElement;
 
         // Set the entityID attribute
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorUnmarshaller.java
index f343e6c..76ce9eb 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/EntityDescriptorUnmarshaller.java
@@ -44,7 +44,7 @@ import com.google.common.base.Strings;
 public class EntityDescriptorUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         final EntityDescriptor entityDescriptor = (EntityDescriptor) parentSAMLObject;
 
@@ -68,7 +68,7 @@ public class EntityDescriptorUnmarshaller extends AbstractSAMLObjectUnmarshaller
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final EntityDescriptor entityDescriptor = (EntityDescriptor) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsBuilder.java
index 5e37bfd..d650dfa 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsBuilder.java
@@ -37,7 +37,7 @@ public class ExtensionsBuilder extends AbstractSAMLObjectBuilder<Extensions> {
     /**
      * {@inheritDoc}
      */
-    public Extensions buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Extensions buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ExtensionsImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsImpl.java
index 5adcb54..9c11dea 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsImpl.java
@@ -42,7 +42,7 @@ public class ExtensionsImpl extends AbstractSAMLObject implements Extensions {
      * @param elementLocalName local name
      * @param namespacePrefix prefix
      */
-    protected ExtensionsImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ExtensionsImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         unknownChildren = new IndexedXMLObjectChildrenList<>(this);
     }
@@ -55,7 +55,7 @@ public class ExtensionsImpl extends AbstractSAMLObject implements Extensions {
     }
     
     /** {@inheritDoc} */
-    public List<XMLObject> getUnknownXMLObjects(QName typeOrName) {
+    public List<XMLObject> getUnknownXMLObjects(final QName typeOrName) {
         return (List<XMLObject>) unknownChildren.subList(typeOrName);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsMarshaller.java
index 06df3de..2e1227c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsMarshaller.java
@@ -37,14 +37,14 @@ public class ExtensionsMarshaller extends AbstractSAMLObjectMarshaller {
     /**
      * {@inheritDoc}
      */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         // no attributes
     }
 
     /**
      * {@inheritDoc}
      */
-    protected void marshallElementContent(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         // no content
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsUnmarshaller.java
index 4d94158..99822dd 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ExtensionsUnmarshaller.java
@@ -41,7 +41,7 @@ public class ExtensionsUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     /**
      * {@inheritDoc}
      */
-    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+    protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
         Extensions extensions = (Extensions) parentXMLObject;
 
@@ -51,14 +51,14 @@ public class ExtensionsUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     /**
      * {@inheritDoc}
      */
-    protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
         log.debug("Ignorning unknown attribute {}", attribute.getLocalName());
     }
 
     /**
      * {@inheritDoc}
      */
-    protected void processElementContent(XMLObject xmlObject, String elementContent) {
+    protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
         log.debug("Ignoring element content {}", elementContent);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameBuilder.java
index 5a06d37..8a61fdd 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameBuilder.java
@@ -44,7 +44,7 @@ public class GivenNameBuilder extends AbstractSAMLObjectBuilder<GivenName> {
     }
 
     /** {@inheritDoc} */
-    public GivenName buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public GivenName buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new GivenNameImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameImpl.java
index fc485c0..e525e91 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameImpl.java
@@ -42,7 +42,7 @@ public class GivenNameImpl extends AbstractSAMLObject implements GivenName {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected GivenNameImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected GivenNameImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -52,7 +52,7 @@ public class GivenNameImpl extends AbstractSAMLObject implements GivenName {
     }
 
     /** {@inheritDoc} */
-    public void setName(String newName) {
+    public void setName(final String newName) {
         name = prepareForAssignment(name, newName);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameMarshaller.java
index 58f744a..4153437 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameMarshaller.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
 public class GivenNameMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         GivenName name = (GivenName) samlObject;
 
         if (name.getName() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameUnmarshaller.java
index 4260199..e31e1e5 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/GivenNameUnmarshaller.java
@@ -31,7 +31,7 @@ import org.opensaml.saml.saml2.metadata.GivenName;
 public class GivenNameUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         GivenName name = (GivenName) samlObject;
 
         name.setName(elementContent);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IDPSSODescriptorBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IDPSSODescriptorBuilder.java
index 55704a3..1c6126c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IDPSSODescriptorBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IDPSSODescriptorBuilder.java
@@ -44,7 +44,7 @@ public class IDPSSODescriptorBuilder extends AbstractSAMLObjectBuilder<IDPSSODes
     }
 
     /** {@inheritDoc} */
-    public IDPSSODescriptor buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public IDPSSODescriptor buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new IDPSSODescriptorImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IDPSSODescriptorImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IDPSSODescriptorImpl.java
index 04252ec..fcf672b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IDPSSODescriptorImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IDPSSODescriptorImpl.java
@@ -68,7 +68,7 @@ public class IDPSSODescriptorImpl extends SSODescriptorImpl implements IDPSSODes
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected IDPSSODescriptorImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected IDPSSODescriptorImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         singleSignOnServices = new XMLObjectChildrenList<>(this);
         nameIDMappingServices = new XMLObjectChildrenList<>(this);
@@ -92,7 +92,7 @@ public class IDPSSODescriptorImpl extends SSODescriptorImpl implements IDPSSODes
     }
 
     /** {@inheritDoc} */
-    public void setWantAuthnRequestsSigned(Boolean newWantSigned) {
+    public void setWantAuthnRequestsSigned(final Boolean newWantSigned) {
         if (newWantSigned != null) {
             wantAuthnRequestsSigned =
                     prepareForAssignment(wantAuthnRequestsSigned, new XSBooleanValue(newWantSigned, false));
@@ -102,7 +102,7 @@ public class IDPSSODescriptorImpl extends SSODescriptorImpl implements IDPSSODes
     }
 
     /** {@inheritDoc} */
-    public void setWantAuthnRequestsSigned(XSBooleanValue wantSigned) {
+    public void setWantAuthnRequestsSigned(final XSBooleanValue wantSigned) {
         wantAuthnRequestsSigned = prepareForAssignment(wantAuthnRequestsSigned, wantSigned);
     }
 
@@ -142,7 +142,7 @@ public class IDPSSODescriptorImpl extends SSODescriptorImpl implements IDPSSODes
     }
 
     /** {@inheritDoc} */
-    public List<Endpoint> getEndpoints(QName type) {
+    public List<Endpoint> getEndpoints(final QName type) {
         if (type.equals(SingleSignOnService.DEFAULT_ELEMENT_NAME)) {
             return Collections.unmodifiableList(new ArrayList<Endpoint>(singleSignOnServices));
         } else if (type.equals(NameIDMappingService.DEFAULT_ELEMENT_NAME)) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IDPSSODescriptorMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IDPSSODescriptorMarshaller.java
index 0584278..32206b2 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IDPSSODescriptorMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IDPSSODescriptorMarshaller.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Element;
 public class IDPSSODescriptorMarshaller extends SSODescriptorMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         IDPSSODescriptor descriptor = (IDPSSODescriptor) samlObject;
 
         if (descriptor.getWantAuthnRequestsSignedXSBoolean() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IDPSSODescriptorUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IDPSSODescriptorUnmarshaller.java
index 8ba5d62..a5e7116 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IDPSSODescriptorUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IDPSSODescriptorUnmarshaller.java
@@ -38,7 +38,7 @@ import org.w3c.dom.Attr;
 public class IDPSSODescriptorUnmarshaller extends SSODescriptorUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentObject, XMLObject childObject) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
         final IDPSSODescriptor descriptor = (IDPSSODescriptor) parentObject;
 
         if (childObject instanceof SingleSignOnService) {
@@ -57,7 +57,7 @@ public class IDPSSODescriptorUnmarshaller extends SSODescriptorUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final IDPSSODescriptor descriptor = (IDPSSODescriptor) samlObject;
 
         if (attribute.getLocalName().equals(IDPSSODescriptor.WANT_AUTHN_REQ_SIGNED_ATTRIB_NAME)
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IndexedEndpointImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IndexedEndpointImpl.java
index f07e5f1..0756f5d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IndexedEndpointImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IndexedEndpointImpl.java
@@ -42,7 +42,7 @@ public abstract class IndexedEndpointImpl extends EndpointImpl implements Indexe
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected IndexedEndpointImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected IndexedEndpointImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -52,7 +52,7 @@ public abstract class IndexedEndpointImpl extends EndpointImpl implements Indexe
     }
 
     /** {@inheritDoc} */
-    public void setIndex(Integer theIndex) {
+    public void setIndex(final Integer theIndex) {
         this.index = prepareForAssignment(this.index, theIndex);
     }
     
@@ -70,7 +70,7 @@ public abstract class IndexedEndpointImpl extends EndpointImpl implements Indexe
     }
     
     /** {@inheritDoc} */
-    public void setIsDefault(Boolean newIsDefault){
+    public void setIsDefault(final Boolean newIsDefault){
         if(newIsDefault != null){
             isDefault = prepareForAssignment(isDefault, new XSBooleanValue(newIsDefault, false));
         }else{
@@ -79,7 +79,7 @@ public abstract class IndexedEndpointImpl extends EndpointImpl implements Indexe
     }
 
     /** {@inheritDoc} */
-    public void setIsDefault(XSBooleanValue theIsDefault) {
+    public void setIsDefault(final XSBooleanValue theIsDefault) {
         this.isDefault = prepareForAssignment(this.isDefault, theIsDefault);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IndexedEndpointMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IndexedEndpointMarshaller.java
index 55d29e3..92e6014 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IndexedEndpointMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IndexedEndpointMarshaller.java
@@ -31,7 +31,7 @@ import org.w3c.dom.Element;
 public class IndexedEndpointMarshaller extends EndpointMarshaller {
 
     /** {@inheritDoc} */
-    public void marshallAttributes(XMLObject samlObject, Element domElement) {
+    public void marshallAttributes(final XMLObject samlObject, final Element domElement) {
         IndexedEndpoint iEndpoint = (IndexedEndpoint) samlObject;
 
         if (iEndpoint.getIndex() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IndexedEndpointUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IndexedEndpointUnmarshaller.java
index b5f764b..632f53b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IndexedEndpointUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/IndexedEndpointUnmarshaller.java
@@ -33,7 +33,7 @@ import org.w3c.dom.Attr;
 public class IndexedEndpointUnmarshaller extends EndpointUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final IndexedEndpoint iEndpoint = (IndexedEndpoint) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorBuilder.java
index 741b0b8..a46e6a0 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorBuilder.java
@@ -33,7 +33,7 @@ public class KeyDescriptorBuilder extends AbstractSAMLObjectBuilder<KeyDescripto
     }
 
     /** {@inheritDoc} */
-    public KeyDescriptor buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public KeyDescriptor buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new KeyDescriptorImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorImpl.java
index 98d1a71..5b87932 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorImpl.java
@@ -50,7 +50,7 @@ public class KeyDescriptorImpl extends AbstractSAMLObject implements KeyDescript
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected KeyDescriptorImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected KeyDescriptorImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         encryptionMethods = new XMLObjectChildrenList<>(this);
         keyUseType = UsageType.UNSPECIFIED;
@@ -62,7 +62,7 @@ public class KeyDescriptorImpl extends AbstractSAMLObject implements KeyDescript
     }
 
     /** {@inheritDoc} */
-    public void setUse(UsageType newType) {
+    public void setUse(final UsageType newType) {
         if (newType != null) {
             keyUseType = prepareForAssignment(keyUseType, newType);
         } else {
@@ -76,7 +76,7 @@ public class KeyDescriptorImpl extends AbstractSAMLObject implements KeyDescript
     }
 
     /** {@inheritDoc} */
-    public void setKeyInfo(KeyInfo newKeyInfo) {
+    public void setKeyInfo(final KeyInfo newKeyInfo) {
         keyInfo = prepareForAssignment(keyInfo, newKeyInfo);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorMarshaller.java
index 64879d2..4e05a9f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorMarshaller.java
@@ -31,7 +31,7 @@ public class KeyDescriptorMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     @Override
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         KeyDescriptor keyDescriptor = (KeyDescriptor) xmlObject;
 
         if (keyDescriptor.getUse() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorUnmarshaller.java
index b62b7b2..8f2db8b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/KeyDescriptorUnmarshaller.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Attr;
 public class KeyDescriptorUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         final KeyDescriptor keyDescriptor = (KeyDescriptor) parentSAMLObject;
 
@@ -46,7 +46,7 @@ public class KeyDescriptorUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final KeyDescriptor keyDescriptor = (KeyDescriptor) samlObject;
 
         if (attribute.getName().equals(KeyDescriptor.USE_ATTRIB_NAME) && attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedNameImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedNameImpl.java
index 3e9d5e4..a6e676f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedNameImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedNameImpl.java
@@ -41,7 +41,7 @@ public class LocalizedNameImpl extends XSStringImpl implements LocalizedName {
      * @param elementLocalName the elementLocalName
      * @param namespacePrefix the namespacePrefix
      */
-    protected LocalizedNameImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected LocalizedNameImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -51,7 +51,7 @@ public class LocalizedNameImpl extends XSStringImpl implements LocalizedName {
     }
 
     /** {@inheritDoc} */
-    public void setXMLLang(String newLang) {
+    public void setXMLLang(final String newLang) {
         boolean hasValue = newLang != null && !Strings.isNullOrEmpty(newLang);
         language = prepareForAssignment(language, newLang);
         manageQualifiedAttributeNamespace(LangBearing.XML_LANG_ATTR_NAME, hasValue);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedNameMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedNameMarshaller.java
index e74080d..4c2a104 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedNameMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedNameMarshaller.java
@@ -37,7 +37,7 @@ public class LocalizedNameMarshaller extends AbstractSAMLObjectMarshaller {
     /**
      * {@inheritDoc}
      */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         LocalizedName name = (LocalizedName) samlObject;
 
         if (name.getXMLLang() != null) {
@@ -49,7 +49,7 @@ public class LocalizedNameMarshaller extends AbstractSAMLObjectMarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         LocalizedName name = (LocalizedName) samlObject;
 
         if (name.getValue() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedNameUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedNameUnmarshaller.java
index 1c45b7d..da5f348 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedNameUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedNameUnmarshaller.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Attr;
 public class LocalizedNameUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         final LocalizedName name = (LocalizedName) samlObject;
     
         name.setValue(elementContent);
@@ -41,7 +41,7 @@ public class LocalizedNameUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     /**
      * {@inheritDoc}
      */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         if (attribute.getLocalName().equals(LangBearing.XML_LANG_ATTR_LOCAL_NAME)
                 && XMLConstants.XML_NS.equals(attribute.getNamespaceURI())) {
             final LocalizedName name = (LocalizedName) samlObject;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedURIImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedURIImpl.java
index 6f28961..54f0d57 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedURIImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedURIImpl.java
@@ -41,7 +41,7 @@ public class LocalizedURIImpl extends XSURIImpl implements LocalizedURI {
      * @param elementLocalName the elementLocalName
      * @param namespacePrefix the namespacePrefix
      */
-    protected LocalizedURIImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected LocalizedURIImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -51,7 +51,7 @@ public class LocalizedURIImpl extends XSURIImpl implements LocalizedURI {
     }
 
     /** {@inheritDoc} */
-    public void setXMLLang(String newLang) {
+    public void setXMLLang(final String newLang) {
         boolean hasValue = newLang != null && !Strings.isNullOrEmpty(newLang);
         language = prepareForAssignment(language, newLang);
         manageQualifiedAttributeNamespace(LangBearing.XML_LANG_ATTR_NAME, hasValue);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedURIMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedURIMarshaller.java
index a1f95ac..ba0d38a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedURIMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedURIMarshaller.java
@@ -37,7 +37,7 @@ public class LocalizedURIMarshaller extends AbstractSAMLObjectMarshaller {
     /**
      * {@inheritDoc}
      */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         LocalizedURI name = (LocalizedURI) samlObject;
 
         if (name.getXMLLang() != null) {
@@ -49,7 +49,7 @@ public class LocalizedURIMarshaller extends AbstractSAMLObjectMarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         LocalizedURI name = (LocalizedURI) samlObject;
 
         if (name.getValue() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedURIUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedURIUnmarshaller.java
index b54d35f..7c00f1b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedURIUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/LocalizedURIUnmarshaller.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Attr;
 public class LocalizedURIUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         final LocalizedURI name = (LocalizedURI) samlObject;
     
         name.setValue(elementContent);
@@ -41,7 +41,7 @@ public class LocalizedURIUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     /**
      * {@inheritDoc}
      */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         if (attribute.getLocalName().equals(LangBearing.XML_LANG_ATTR_LOCAL_NAME)
                 && XMLConstants.XML_NS.equals(attribute.getNamespaceURI())) {
             final LocalizedURI name = (LocalizedURI) samlObject;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ManageNameIDServiceBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ManageNameIDServiceBuilder.java
index 9ff8dff..57e0e5b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ManageNameIDServiceBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ManageNameIDServiceBuilder.java
@@ -44,7 +44,7 @@ public class ManageNameIDServiceBuilder extends AbstractSAMLObjectBuilder<Manage
     }
 
     /** {@inheritDoc} */
-    public ManageNameIDService buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ManageNameIDService buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ManageNameIDServiceImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ManageNameIDServiceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ManageNameIDServiceImpl.java
index 05f4f7c..a9c58f4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ManageNameIDServiceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ManageNameIDServiceImpl.java
@@ -35,7 +35,7 @@ public class ManageNameIDServiceImpl extends EndpointImpl implements ManageNameI
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected ManageNameIDServiceImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ManageNameIDServiceImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatBuilder.java
index 8313251..5532701 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatBuilder.java
@@ -44,7 +44,7 @@ public class NameIDFormatBuilder extends AbstractSAMLObjectBuilder<NameIDFormat>
     }
 
     /** {@inheritDoc} */
-    public NameIDFormat buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public NameIDFormat buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new NameIDFormatImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatImpl.java
index d8e2f1b..b9bb415 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatImpl.java
@@ -43,7 +43,7 @@ public class NameIDFormatImpl extends AbstractSAMLObject implements NameIDFormat
      * @param namespacePrefix the prefix for the given namespace
 
      */
-    protected NameIDFormatImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected NameIDFormatImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -53,7 +53,7 @@ public class NameIDFormatImpl extends AbstractSAMLObject implements NameIDFormat
     }
 
     /** {@inheritDoc} */
-    public void setFormat(String newFormat) {
+    public void setFormat(final String newFormat) {
         this.format = prepareForAssignment(this.format, newFormat);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatMarshaller.java
index 3b3ad96..e6df7ba 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatMarshaller.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
 public class NameIDFormatMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         NameIDFormat format = (NameIDFormat) samlObject;
 
         if (format.getFormat() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatUnmarshaller.java
index bbc955e..61ddeb2 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDFormatUnmarshaller.java
@@ -31,7 +31,7 @@ import org.opensaml.saml.saml2.metadata.NameIDFormat;
 public class NameIDFormatUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         NameIDFormat format = (NameIDFormat) samlObject;
 
         format.setFormat(elementContent);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDMappingServiceBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDMappingServiceBuilder.java
index 4907e6f..c62241d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDMappingServiceBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDMappingServiceBuilder.java
@@ -44,7 +44,7 @@ public class NameIDMappingServiceBuilder extends AbstractSAMLObjectBuilder<NameI
     }
 
     /** {@inheritDoc} */
-    public NameIDMappingService buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public NameIDMappingService buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new NameIDMappingServiceImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDMappingServiceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDMappingServiceImpl.java
index 1500d3e..d1d63d9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDMappingServiceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/NameIDMappingServiceImpl.java
@@ -36,7 +36,7 @@ public class NameIDMappingServiceImpl extends EndpointImpl implements NameIDMapp
      * @param namespacePrefix the prefix for the given namespace
 
      */
-    protected NameIDMappingServiceImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected NameIDMappingServiceImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationBuilder.java
index 1646180..b193265 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationBuilder.java
@@ -44,7 +44,7 @@ public class OrganizationBuilder extends AbstractSAMLObjectBuilder<Organization>
     }
 
     /** {@inheritDoc} */
-    public Organization buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public Organization buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new OrganizationImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationDisplayNameBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationDisplayNameBuilder.java
index adb0dbc..f9daf91 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationDisplayNameBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationDisplayNameBuilder.java
@@ -44,7 +44,7 @@ public class OrganizationDisplayNameBuilder extends AbstractSAMLObjectBuilder<Or
     }
 
     /** {@inheritDoc} */
-    public OrganizationDisplayName buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public OrganizationDisplayName buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new OrganizationDisplayNameImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationDisplayNameImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationDisplayNameImpl.java
index ca5477f..b5ff42f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationDisplayNameImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationDisplayNameImpl.java
@@ -35,7 +35,7 @@ public class OrganizationDisplayNameImpl extends LocalizedNameImpl implements Or
      * @param elementLocalName the name
      * @param namespacePrefix the prefix
      */
-    protected OrganizationDisplayNameImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected OrganizationDisplayNameImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationImpl.java
index 94e4c3b..bfb2211 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationImpl.java
@@ -61,7 +61,7 @@ public class OrganizationImpl extends AbstractSAMLObject implements Organization
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected OrganizationImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected OrganizationImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         names = new XMLObjectChildrenList<>(this);
         displayNames = new XMLObjectChildrenList<>(this);
@@ -77,7 +77,7 @@ public class OrganizationImpl extends AbstractSAMLObject implements Organization
 
     /** {@inheritDoc} */
     @Override
-    public void setExtensions(Extensions newExtensions) {
+    public void setExtensions(final Extensions newExtensions) {
         this.extensions = prepareForAssignment(this.extensions, newExtensions);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationMarshaller.java
index 0fee668..ffb4276 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationMarshaller.java
@@ -35,7 +35,7 @@ public class OrganizationMarshaller extends AbstractSAMLObjectMarshaller {
     /**
      * {@inheritDoc}
      */
-    protected void marshallAttributes(XMLObject xmlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
         Organization org = (Organization) xmlObject;
 
         marshallUnknownAttributes(org, domElement);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationNameBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationNameBuilder.java
index 30104b3..e596986 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationNameBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationNameBuilder.java
@@ -44,7 +44,7 @@ public class OrganizationNameBuilder extends AbstractSAMLObjectBuilder<Organizat
     }
 
     /** {@inheritDoc} */
-    public OrganizationName buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public OrganizationName buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new OrganizationNameImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationNameImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationNameImpl.java
index 123467e..2aee4d2 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationNameImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationNameImpl.java
@@ -35,7 +35,7 @@ public class OrganizationNameImpl extends LocalizedNameImpl implements Organizat
      * @param elementLocalName local name
      * @param namespacePrefix prefix
      */
-    protected OrganizationNameImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected OrganizationNameImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationURLBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationURLBuilder.java
index 6c7f5f8..089eb52 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationURLBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationURLBuilder.java
@@ -44,7 +44,7 @@ public class OrganizationURLBuilder extends AbstractSAMLObjectBuilder<Organizati
     }
 
     /** {@inheritDoc} */
-    public OrganizationURL buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public OrganizationURL buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new OrganizationURLImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationURLImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationURLImpl.java
index 5ade24a..c9f8c34 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationURLImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationURLImpl.java
@@ -35,7 +35,7 @@ public class OrganizationURLImpl extends LocalizedURIImpl implements Organizatio
      * @param elementLocalName name
      * @param namespacePrefix prefix
      */
-    protected OrganizationURLImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected OrganizationURLImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationUnmarshaller.java
index 677bd0b..0bc32c4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/OrganizationUnmarshaller.java
@@ -37,7 +37,7 @@ import org.w3c.dom.Attr;
 public class OrganizationUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         final Organization org = (Organization) parentSAMLObject;
 
@@ -57,7 +57,7 @@ public class OrganizationUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     /**
      * {@inheritDoc}
      */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
 
         if (attribute.getNamespaceURI() == null) {
             super.processAttribute(samlObject, attribute);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/PDPDescriptorBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/PDPDescriptorBuilder.java
index 143ef92..8f43f89 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/PDPDescriptorBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/PDPDescriptorBuilder.java
@@ -44,7 +44,7 @@ public class PDPDescriptorBuilder extends AbstractSAMLObjectBuilder<PDPDescripto
     }
 
     /** {@inheritDoc} */
-    public PDPDescriptor buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public PDPDescriptor buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new PDPDescriptorImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/PDPDescriptorImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/PDPDescriptorImpl.java
index 704325e..61bc667 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/PDPDescriptorImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/PDPDescriptorImpl.java
@@ -56,7 +56,7 @@ public class PDPDescriptorImpl extends RoleDescriptorImpl implements PDPDescript
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected PDPDescriptorImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected PDPDescriptorImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         authzServices = new XMLObjectChildrenList<>(this);
         assertionIDRequestServices = new XMLObjectChildrenList<>(this);
@@ -87,7 +87,7 @@ public class PDPDescriptorImpl extends RoleDescriptorImpl implements PDPDescript
     }
     
     /** {@inheritDoc} */
-    public List<Endpoint> getEndpoints(QName type) {
+    public List<Endpoint> getEndpoints(final QName type) {
         if(type.equals(AuthzService.DEFAULT_ELEMENT_NAME)){
             return Collections.unmodifiableList(new ArrayList<Endpoint>(authzServices));
         }else if(type.equals(AssertionIDRequestService.DEFAULT_ELEMENT_NAME)){
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/PDPDescriptorUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/PDPDescriptorUnmarshaller.java
index 160a1a1..29f7b68 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/PDPDescriptorUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/PDPDescriptorUnmarshaller.java
@@ -34,7 +34,7 @@ import org.opensaml.saml.saml2.metadata.PDPDescriptor;
 public class PDPDescriptorUnmarshaller extends RoleDescriptorUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         PDPDescriptor descriptor = (PDPDescriptor) parentSAMLObject;
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RequestedAttributeBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RequestedAttributeBuilder.java
index 5b73d36..3961e12 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RequestedAttributeBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RequestedAttributeBuilder.java
@@ -42,7 +42,7 @@ public class RequestedAttributeBuilder extends AbstractSAMLObjectBuilder<Request
     }
 
     /** {@inheritDoc} */
-    public RequestedAttribute buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public RequestedAttribute buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new RequestedAttributeImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RequestedAttributeImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RequestedAttributeImpl.java
index 808dbde..c39ebc0 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RequestedAttributeImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RequestedAttributeImpl.java
@@ -40,7 +40,7 @@ public class RequestedAttributeImpl extends AttributeImpl implements RequestedAt
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected RequestedAttributeImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected RequestedAttributeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
     
@@ -59,7 +59,7 @@ public class RequestedAttributeImpl extends AttributeImpl implements RequestedAt
     }
     
     /** {@inheritDoc} */
-    public void setIsRequired(Boolean newIsRequired){
+    public void setIsRequired(final Boolean newIsRequired){
         if(newIsRequired != null){
             isRequired = prepareForAssignment(isRequired, new XSBooleanValue(newIsRequired, false));
         }else{
@@ -68,7 +68,7 @@ public class RequestedAttributeImpl extends AttributeImpl implements RequestedAt
     }
 
     /** {@inheritDoc} */
-    public void setIsRequired(XSBooleanValue newIsRequired) {
+    public void setIsRequired(final XSBooleanValue newIsRequired) {
         isRequired = prepareForAssignment(isRequired, newIsRequired);
 
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RequestedAttributeMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RequestedAttributeMarshaller.java
index deafb0d..2411e7c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RequestedAttributeMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RequestedAttributeMarshaller.java
@@ -33,7 +33,7 @@ import org.w3c.dom.Element;
 public class RequestedAttributeMarshaller extends AttributeMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         RequestedAttribute requestedAttribute = (RequestedAttribute) samlObject;
 
         if (requestedAttribute.isRequiredXSBoolean() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RequestedAttributeUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RequestedAttributeUnmarshaller.java
index 728dce7..411c0fb 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RequestedAttributeUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RequestedAttributeUnmarshaller.java
@@ -34,7 +34,7 @@ import org.w3c.dom.Attr;
 public class RequestedAttributeUnmarshaller extends AttributeUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final RequestedAttribute requestedAttribute = (RequestedAttribute) samlObject;
         
         if (attribute.getLocalName().equals(RequestedAttribute.IS_REQUIRED_ATTRIB_NAME)
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorImpl.java
index cf4c0b2..77d9f7e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorImpl.java
@@ -76,7 +76,7 @@ public abstract class RoleDescriptorImpl extends AbstractSignableSAMLObject impl
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected RoleDescriptorImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected RoleDescriptorImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         unknownAttributes = new AttributeMap(this);
         supportedProtocols = new LazyList<>();
@@ -92,7 +92,7 @@ public abstract class RoleDescriptorImpl extends AbstractSignableSAMLObject impl
 
     /** {@inheritDoc} */
     @Override
-    public void setID(String newID) {
+    public void setID(final String newID) {
         String oldID = this.id;
         this.id = prepareForAssignment(this.id, newID);
         registerOwnID(oldID, this.id);
@@ -117,7 +117,7 @@ public abstract class RoleDescriptorImpl extends AbstractSignableSAMLObject impl
 
     /** {@inheritDoc} */
     @Override
-    public void setValidUntil(DateTime dt) {
+    public void setValidUntil(final DateTime dt) {
         validUntil = prepareForAssignment(validUntil, dt);
     }
 
@@ -129,7 +129,7 @@ public abstract class RoleDescriptorImpl extends AbstractSignableSAMLObject impl
 
     /** {@inheritDoc} */
     @Override
-    public void setCacheDuration(Long duration) {
+    public void setCacheDuration(final Long duration) {
         cacheDuration = prepareForAssignment(cacheDuration, duration);
     }
 
@@ -141,7 +141,7 @@ public abstract class RoleDescriptorImpl extends AbstractSignableSAMLObject impl
 
     /** {@inheritDoc} */
     @Override
-    public boolean isSupportedProtocol(String protocol) {
+    public boolean isSupportedProtocol(final String protocol) {
         return supportedProtocols.contains(protocol);
     }
 
@@ -167,7 +167,7 @@ public abstract class RoleDescriptorImpl extends AbstractSignableSAMLObject impl
 
     /** {@inheritDoc} */
     @Override
-    public void removeSupportedProtocols(Collection<String> protocols) {
+    public void removeSupportedProtocols(final Collection<String> protocols) {
         for (String protocol : protocols) {
             removeSupportedProtocol(protocol);
         }
@@ -187,7 +187,7 @@ public abstract class RoleDescriptorImpl extends AbstractSignableSAMLObject impl
 
     /** {@inheritDoc} */
     @Override
-    public void setErrorURL(String url) {
+    public void setErrorURL(final String url) {
 
         errorURL = prepareForAssignment(errorURL, url);
     }
@@ -200,7 +200,7 @@ public abstract class RoleDescriptorImpl extends AbstractSignableSAMLObject impl
 
     /** {@inheritDoc} */
     @Override
-    public void setExtensions(Extensions ext) {
+    public void setExtensions(final Extensions ext) {
         extensions = prepareForAssignment(extensions, ext);
     }
 
@@ -212,7 +212,7 @@ public abstract class RoleDescriptorImpl extends AbstractSignableSAMLObject impl
 
     /** {@inheritDoc} */
     @Override
-    public void setOrganization(Organization org) {
+    public void setOrganization(final Organization org) {
         organization = prepareForAssignment(organization, org);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorMarshaller.java
index c524678..c11f4b9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorMarshaller.java
@@ -41,7 +41,7 @@ public abstract class RoleDescriptorMarshaller extends AbstractSAMLObjectMarshal
     private final Logger log = LoggerFactory.getLogger(RoleDescriptorMarshaller.class);
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlElement, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
         RoleDescriptor roleDescriptor = (RoleDescriptor) samlElement;
 
         // Set the ID attribute
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorUnmarshaller.java
index f5db319..aaab6d7 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorUnmarshaller.java
@@ -44,7 +44,7 @@ import com.google.common.base.Strings;
 public abstract class RoleDescriptorUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         final RoleDescriptor roleDescriptor = (RoleDescriptor) parentSAMLObject;
 
@@ -64,7 +64,7 @@ public abstract class RoleDescriptorUnmarshaller extends AbstractSAMLObjectUnmar
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final RoleDescriptor roleDescriptor = (RoleDescriptor) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SPSSODescriptorBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SPSSODescriptorBuilder.java
index c229ad1..ad3d768 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SPSSODescriptorBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SPSSODescriptorBuilder.java
@@ -44,7 +44,7 @@ public class SPSSODescriptorBuilder extends AbstractSAMLObjectBuilder<SPSSODescr
     }
 
     /** {@inheritDoc} */
-    public SPSSODescriptor buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public SPSSODescriptor buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new SPSSODescriptorImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SPSSODescriptorImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SPSSODescriptorImpl.java
index 8beef26..a911937 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SPSSODescriptorImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SPSSODescriptorImpl.java
@@ -61,7 +61,7 @@ public class SPSSODescriptorImpl extends SSODescriptorImpl implements SPSSODescr
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SPSSODescriptorImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SPSSODescriptorImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         assertionConsumerServices = new XMLObjectChildrenList<>(this);
         attributeConsumingServices = new XMLObjectChildrenList<>(this);
@@ -81,7 +81,7 @@ public class SPSSODescriptorImpl extends SSODescriptorImpl implements SPSSODescr
     }
     
     /** {@inheritDoc} */
-    public void setAuthnRequestsSigned(Boolean newIsSigned) {
+    public void setAuthnRequestsSigned(final Boolean newIsSigned) {
         if(newIsSigned != null){
             authnRequestSigned = prepareForAssignment(authnRequestSigned, new XSBooleanValue(newIsSigned, false));
         }else{
@@ -90,7 +90,7 @@ public class SPSSODescriptorImpl extends SSODescriptorImpl implements SPSSODescr
     }
 
     /** {@inheritDoc} */
-    public void setAuthnRequestsSigned(XSBooleanValue isSigned) {
+    public void setAuthnRequestsSigned(final XSBooleanValue isSigned) {
         authnRequestSigned = prepareForAssignment(authnRequestSigned, isSigned);
     }
     
@@ -108,7 +108,7 @@ public class SPSSODescriptorImpl extends SSODescriptorImpl implements SPSSODescr
     }
     
     /** {@inheritDoc} */
-    public void setWantAssertionsSigned(Boolean wantAssestionSigned) {
+    public void setWantAssertionsSigned(final Boolean wantAssestionSigned) {
         if(wantAssestionSigned != null){
             assertionSigned = prepareForAssignment(assertionSigned, new XSBooleanValue(wantAssestionSigned, false));
         }else{
@@ -117,7 +117,7 @@ public class SPSSODescriptorImpl extends SSODescriptorImpl implements SPSSODescr
     }
 
     /** {@inheritDoc} */
-    public void setWantAssertionsSigned(XSBooleanValue wantAssestionSigned) {
+    public void setWantAssertionsSigned(final XSBooleanValue wantAssestionSigned) {
         this.assertionSigned = prepareForAssignment(this.assertionSigned, wantAssestionSigned);
     }
 
@@ -152,7 +152,7 @@ public class SPSSODescriptorImpl extends SSODescriptorImpl implements SPSSODescr
     }
     
     /** {@inheritDoc} */
-    public List<Endpoint> getEndpoints(QName type) {
+    public List<Endpoint> getEndpoints(final QName type) {
         if(type.equals(AssertionConsumerService.DEFAULT_ELEMENT_NAME)){
             return Collections.unmodifiableList(new ArrayList<Endpoint>(assertionConsumerServices));
         }else{
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SPSSODescriptorMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SPSSODescriptorMarshaller.java
index 4b74eee..427bddb 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SPSSODescriptorMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SPSSODescriptorMarshaller.java
@@ -32,7 +32,7 @@ import org.w3c.dom.Element;
 public class SPSSODescriptorMarshaller extends SSODescriptorMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         SPSSODescriptor descriptor = (SPSSODescriptor) samlObject;
 
         if (descriptor.isAuthnRequestsSignedXSBoolean() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SPSSODescriptorUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SPSSODescriptorUnmarshaller.java
index 9e5656b..a32bc35 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SPSSODescriptorUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SPSSODescriptorUnmarshaller.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Attr;
 public class SPSSODescriptorUnmarshaller extends SSODescriptorUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
+    protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
         final SPSSODescriptor descriptor = (SPSSODescriptor) parentSAMLObject;
 
@@ -49,7 +49,7 @@ public class SPSSODescriptorUnmarshaller extends SSODescriptorUnmarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+    protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
         final SPSSODescriptor descriptor = (SPSSODescriptor) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SSODescriptorImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SSODescriptorImpl.java
index 64e7096..aca4286 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SSODescriptorImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SSODescriptorImpl.java
@@ -61,7 +61,7 @@ public abstract class SSODescriptorImpl extends RoleDescriptorImpl implements SS
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SSODescriptorImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SSODescriptorImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
         artifactResolutionServices = new XMLObjectChildrenList<>(this);
         singleLogoutServices = new XMLObjectChildrenList<>(this);
@@ -104,7 +104,7 @@ public abstract class SSODescriptorImpl extends RoleDescriptorImpl implements SS
     }
     
     /** {@inheritDoc} */
-    public List<Endpoint> getEndpoints(QName type) {
+    public List<Endpoint> getEndpoints(final QName type) {
         if(type.equals(ArtifactResolutionService.DEFAULT_ELEMENT_NAME)){
             return Collections.unmodifiableList(new ArrayList<Endpoint>(artifactResolutionServices));
         }else if(type.equals(SingleLogoutService.DEFAULT_ELEMENT_NAME)){
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SSODescriptorUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SSODescriptorUnmarshaller.java
index 7fc9a9a..47b5939 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SSODescriptorUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SSODescriptorUnmarshaller.java
@@ -31,7 +31,7 @@ import org.opensaml.saml.saml2.metadata.SingleLogoutService;
 public abstract class SSODescriptorUnmarshaller extends RoleDescriptorUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentElement, XMLObject childElement) throws UnmarshallingException {
+    protected void processChildElement(final XMLObject parentElement, final XMLObject childElement) throws UnmarshallingException {
         SSODescriptor descriptor = (SSODescriptor) parentElement;
         if (childElement instanceof ArtifactResolutionService) {
             descriptor.getArtifactResolutionServices().add((ArtifactResolutionService) childElement);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceDescriptionBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceDescriptionBuilder.java
index e85dcb2..b593533 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceDescriptionBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceDescriptionBuilder.java
@@ -44,7 +44,7 @@ public class ServiceDescriptionBuilder extends AbstractSAMLObjectBuilder<Service
     }
 
     /** {@inheritDoc} */
-    public ServiceDescription buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ServiceDescription buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ServiceDescriptionImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceDescriptionImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceDescriptionImpl.java
index 03d2773..c0410bb 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceDescriptionImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceDescriptionImpl.java
@@ -35,7 +35,7 @@ public class ServiceDescriptionImpl extends LocalizedNameImpl implements Service
      * @param elementLocalName Name
      * @param namespacePrefix prefix
      */
-    protected ServiceDescriptionImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ServiceDescriptionImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceNameBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceNameBuilder.java
index f33668b..42b5e2f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceNameBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceNameBuilder.java
@@ -44,7 +44,7 @@ public class ServiceNameBuilder extends AbstractSAMLObjectBuilder<ServiceName> {
     }
 
     /** {@inheritDoc} */
-    public ServiceName buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public ServiceName buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new ServiceNameImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceNameImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceNameImpl.java
index 71bdda7..d68193b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceNameImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/ServiceNameImpl.java
@@ -35,7 +35,7 @@ public class ServiceNameImpl extends LocalizedNameImpl implements ServiceName {
      * @param elementLocalName local name
      * @param namespacePrefix prefix
      */
-    protected ServiceNameImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected ServiceNameImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleLogoutServiceBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleLogoutServiceBuilder.java
index ba9e1ed..4d16fb5 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleLogoutServiceBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleLogoutServiceBuilder.java
@@ -44,7 +44,7 @@ public class SingleLogoutServiceBuilder extends AbstractSAMLObjectBuilder<Single
     }
 
     /** {@inheritDoc} */
-    public SingleLogoutService buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public SingleLogoutService buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new SingleLogoutServiceImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleLogoutServiceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleLogoutServiceImpl.java
index 93a6417..590fb88 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleLogoutServiceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleLogoutServiceImpl.java
@@ -35,7 +35,7 @@ public class SingleLogoutServiceImpl extends EndpointImpl implements SingleLogou
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SingleLogoutServiceImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SingleLogoutServiceImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleSignOnServiceBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleSignOnServiceBuilder.java
index 38aafa0..fa1d7ac 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleSignOnServiceBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleSignOnServiceBuilder.java
@@ -44,7 +44,7 @@ public class SingleSignOnServiceBuilder extends AbstractSAMLObjectBuilder<Single
     }
 
     /** {@inheritDoc} */
-    public SingleSignOnService buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public SingleSignOnService buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new SingleSignOnServiceImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleSignOnServiceImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleSignOnServiceImpl.java
index f64f5fd..c7a669f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleSignOnServiceImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SingleSignOnServiceImpl.java
@@ -35,7 +35,7 @@ public class SingleSignOnServiceImpl extends EndpointImpl implements SingleSignO
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SingleSignOnServiceImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SingleSignOnServiceImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameBuilder.java
index 6e48b91..584a97b 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameBuilder.java
@@ -44,7 +44,7 @@ public class SurNameBuilder extends AbstractSAMLObjectBuilder<SurName> {
     }
 
     /** {@inheritDoc} */
-    public SurName buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public SurName buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new SurNameImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameImpl.java
index 04ee28f..e699dfd 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameImpl.java
@@ -42,7 +42,7 @@ public class SurNameImpl extends AbstractSAMLObject implements SurName {
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected SurNameImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected SurNameImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -52,7 +52,7 @@ public class SurNameImpl extends AbstractSAMLObject implements SurName {
     }
 
     /** {@inheritDoc} */
-    public void setName(String newName) {
+    public void setName(final String newName) {
         name = prepareForAssignment(name, newName);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameMarshaller.java
index a62a512..e92422f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameMarshaller.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
 public class SurNameMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         SurName name = (SurName) samlObject;
 
         if (name.getName() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameUnmarshaller.java
index 8dd9fda..4164ca6 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/SurNameUnmarshaller.java
@@ -31,7 +31,7 @@ import org.opensaml.saml.saml2.metadata.SurName;
 public class SurNameUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         SurName name = (SurName) samlObject;
 
         name.setName(elementContent);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberBuilder.java
index 28cf457..cc3970c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberBuilder.java
@@ -44,7 +44,7 @@ public class TelephoneNumberBuilder extends AbstractSAMLObjectBuilder<TelephoneN
     }
 
     /** {@inheritDoc} */
-    public TelephoneNumber buildObject(String namespaceURI, String localName, String namespacePrefix) {
+    public TelephoneNumber buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
         return new TelephoneNumberImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberImpl.java
index fd1918c..07b24e0 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberImpl.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberImpl.java
@@ -42,7 +42,7 @@ public class TelephoneNumberImpl extends AbstractSAMLObject implements Telephone
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected TelephoneNumberImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+    protected TelephoneNumberImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 
@@ -52,7 +52,7 @@ public class TelephoneNumberImpl extends AbstractSAMLObject implements Telephone
     }
 
     /** {@inheritDoc} */
-    public void setNumber(String newNumber) {
+    public void setNumber(final String newNumber) {
         number = prepareForAssignment(number, newNumber);
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberMarshaller.java
index 18dcf0b..86750e6 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberMarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberMarshaller.java
@@ -35,7 +35,7 @@ import org.w3c.dom.Element;
 public class TelephoneNumberMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(XMLObject samlObject, Element domElement) throws MarshallingException {
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         TelephoneNumber number = (TelephoneNumber) samlObject;
 
         if (number.getNumber() != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberUnmarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberUnmarshaller.java
index 5b264dc..8f8c7aa 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberUnmarshaller.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/TelephoneNumberUnmarshaller.java
@@ -31,7 +31,7 @@ import org.opensaml.saml.saml2.metadata.TelephoneNumber;
 public class TelephoneNumberUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
-    protected void processElementContent(XMLObject samlObject, String elementContent) {
+    protected void processElementContent(final XMLObject samlObject, final String elementContent) {
         TelephoneNumber number = (TelephoneNumber) samlObject;
 
         number.setNumber(elementContent);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AbstractResponseShellAction.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AbstractResponseShellAction.java
index a9a0b52..2049eed 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AbstractResponseShellAction.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AbstractResponseShellAction.java
@@ -87,7 +87,7 @@ public abstract class AbstractResponseShellAction<MessageType extends StatusResp
     public AbstractResponseShellAction() {
         // Default strategy is a 16-byte secure random source.
         idGeneratorLookupStrategy = new Function<ProfileRequestContext,IdentifierGenerationStrategy>() {
-            public IdentifierGenerationStrategy apply(ProfileRequestContext input) {
+            public IdentifierGenerationStrategy apply(final ProfileRequestContext input) {
                 return new SecureRandomIdentifierGenerationStrategy();
             }
         };
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjects.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjects.java
index db3ce07..3fc0372 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjects.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjects.java
@@ -157,7 +157,7 @@ public class AddNameIDToSubjects extends AbstractProfileAction {
 
         // Default strategy is a 16-byte secure random source.
         idGeneratorLookupStrategy = new Function<ProfileRequestContext,IdentifierGenerationStrategy>() {
-            public IdentifierGenerationStrategy apply(ProfileRequestContext input) {
+            public IdentifierGenerationStrategy apply(final ProfileRequestContext input) {
                 return new SecureRandomIdentifierGenerationStrategy();
             }
         };
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddStatusResponseShell.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddStatusResponseShell.java
index 3d1441e..bb4ad03 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddStatusResponseShell.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddStatusResponseShell.java
@@ -90,7 +90,7 @@ public class AddStatusResponseShell extends AbstractProfileAction {
     public AddStatusResponseShell() {
         // Default strategy is a 16-byte secure random source.
         idGeneratorLookupStrategy = new Function<ProfileRequestContext,IdentifierGenerationStrategy>() {
-            public IdentifierGenerationStrategy apply(ProfileRequestContext input) {
+            public IdentifierGenerationStrategy apply(final ProfileRequestContext input) {
                 return new SecureRandomIdentifierGenerationStrategy();
             }
         };
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddStatusToResponse.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddStatusToResponse.java
index 4d41ccf..bc14948 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddStatusToResponse.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddStatusToResponse.java
@@ -159,7 +159,7 @@ public class AddStatusToResponse extends AbstractProfileAction {
      * 
      * @param codes list of status code values to insert
      */
-    public void setStatusCodes(@Nonnull @NonnullElements List<String> codes) {
+    public void setStatusCodes(@Nonnull @NonnullElements final List<String> codes) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         
         Constraint.isNotNull(codes, "Status code list cannot be null");
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjects.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjects.java
index 3886f37..1ba4acb 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjects.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjects.java
@@ -122,7 +122,7 @@ public class AddSubjectConfirmationToSubjects extends AbstractProfileAction {
         
         // Default pulls from servlet request.
         addressLookupStrategy = new Function<ProfileRequestContext,String>() {
-            public String apply(ProfileRequestContext input) {
+            public String apply(final ProfileRequestContext input) {
                 final String address = getHttpServletRequest() != null ? getHttpServletRequest().getRemoteAddr() : null;
                 log.debug("{} Setting confirmation data Address to {}", getLogPrefix(),
                         address != null ? address : "(none)");
@@ -132,7 +132,7 @@ public class AddSubjectConfirmationToSubjects extends AbstractProfileAction {
         
         // Default pulls from inbound message context and a SAMLMessageInfoContext child.
         inResponseToLookupStrategy = new Function<ProfileRequestContext,String>() {
-            public String apply(ProfileRequestContext input) {
+            public String apply(final ProfileRequestContext input) {
                 if (response != null && response.getInResponseTo() != null) {
                     log.debug("{} Setting confirmation data InResponseTo to {}", getLogPrefix(),
                             response.getInResponseTo());
@@ -145,7 +145,7 @@ public class AddSubjectConfirmationToSubjects extends AbstractProfileAction {
         
         // Default pulls from SAML endpoint on outbound message context.
         recipientLookupStrategy = new Function<ProfileRequestContext,String>() {
-            public String apply(ProfileRequestContext input) {
+            public String apply(final ProfileRequestContext input) {
                 if (input.getOutboundMessageContext() != null) {
                     try {
                         final URI uri = SAMLBindingSupport.getEndpointURL(input.getOutboundMessageContext());
@@ -154,7 +154,7 @@ public class AddSubjectConfirmationToSubjects extends AbstractProfileAction {
                             log.debug("{} Setting confirmation data Recipient to {}", getLogPrefix(), url);
                             return url;
                         }
-                    } catch (BindingException e) {
+                    } catch (final BindingException e) {
                         log.debug("{} Error getting response endpoint", getLogPrefix(), e);
                     }
                 }
@@ -165,7 +165,7 @@ public class AddSubjectConfirmationToSubjects extends AbstractProfileAction {
         
         // Default is 5 minutes.
         lifetimeLookupStrategy = new Function<ProfileRequestContext,Long>() {
-            public Long apply(ProfileRequestContext input) {
+            public Long apply(final ProfileRequestContext input) {
                 log.debug("{} Setting confirmation data NotOnOrAfter to 5 minutes from now", getLogPrefix());
                 return 5 * 60 * 1000L;
             }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/DefaultSAML20AssertionValidationContextBuilder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/DefaultSAML20AssertionValidationContextBuilder.java
index 0e846d0..9f55128 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/DefaultSAML20AssertionValidationContextBuilder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/DefaultSAML20AssertionValidationContextBuilder.java
@@ -97,7 +97,7 @@ public class DefaultSAML20AssertionValidationContextBuilder
      * 
      * @param flag true if required, false if not
      */
-    public void setSignatureRequired(boolean flag) {
+    public void setSignatureRequired(final boolean flag) {
         signatureRequired = flag;
     }
 
@@ -240,7 +240,7 @@ public class DefaultSAML20AssertionValidationContextBuilder
         try {
             X509Credential credential = new ServletRequestX509CredentialAdapter(input.getHttpServletRequest());
             return ((X509Credential)credential).getEntityCertificate();
-        } catch (SecurityException e) {
+        } catch (final SecurityException e) {
             log.warn("Peer TLS X.509 certificate was not present. " 
                     + "Holder-of-key proof-of-possession via client TLS cert will not be possible");
             return null;
@@ -325,7 +325,7 @@ public class DefaultSAML20AssertionValidationContextBuilder
                 log.warn("Could not determine attester IP address. Validation of Assertion may or may not succeed");
                 return Collections.emptySet();
             }
-        } catch (UnknownHostException e) {
+        } catch (final UnknownHostException e) {
             log.warn("Processing of attester IP address failed. Validation of Assertion may or may not succeed", e);
             return Collections.emptySet();
         }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandler.java
index a151b32..368f46f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandler.java
@@ -163,7 +163,7 @@ public class WSSecuritySAML20AssertionTokenSecurityHandler extends AbstractMessa
      * 
      * @param flag The invalidFatal to set.
      */
-    public void setInvalidFatal(boolean flag) {
+    public void setInvalidFatal(final boolean flag) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
         invalidFatal = flag;
@@ -270,7 +270,7 @@ public class WSSecuritySAML20AssertionTokenSecurityHandler extends AbstractMessa
                 SAML20AssertionToken token = new SAML20AssertionToken(assertion);
                 processResult(validationContext, validationResult, token, messageContext);
                 wsContext.getTokens().add(token);
-            } catch (AssertionValidationException e) {
+            } catch (final AssertionValidationException e) {
                 log.warn("There was a problem determining Assertion validity: {}", e.getMessage());
                 SOAPMessagingSupport.registerSOAP11Fault(messageContext, FaultCode.SERVER, 
                         "Internal security token processing error", null, null, null);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/InlineSelfEncryptionParametersStrategy.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/InlineSelfEncryptionParametersStrategy.java
index f04327e..cc8c580 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/InlineSelfEncryptionParametersStrategy.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/InlineSelfEncryptionParametersStrategy.java
@@ -92,7 +92,7 @@ public class InlineSelfEncryptionParametersStrategy
 
     /** {@inheritDoc} */
     @Nullable
-    public List<EncryptionParameters> apply(@Nullable Pair<ProfileRequestContext, EncryptionParameters> input) {
+    public List<EncryptionParameters> apply(@Nullable final Pair<ProfileRequestContext, EncryptionParameters> input) {
         if (input == null || input.getFirst() == null) {
             log.debug("Input Pair or ProfileRequestContext was null, skipping");
             return Collections.emptyList();
@@ -125,7 +125,7 @@ public class InlineSelfEncryptionParametersStrategy
             try {
                 Iterables.addAll(encParams, encParamsresolver.resolve(
                         new CriteriaSet(new EncryptionConfigurationCriterion(configs))));
-            } catch (ResolverException e) {
+            } catch (final ResolverException e) {
                 log.error("Error resolving self-encryption parameters for Credential '{}', " 
                         + "params from other Credentials may still succeed", cred, e);
             }
@@ -150,7 +150,7 @@ public class InlineSelfEncryptionParametersStrategy
             Iterables.addAll(credentials, credentialResolver.resolve(
                     new CriteriaSet(new UsageCriterion(UsageType.ENCRYPTION))));
             return credentials;
-        } catch (ResolverException e) {
+        } catch (final ResolverException e) {
             log.error("Error resolving IdP encryption credentials", e);
             return Collections.emptyList();
         }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMDCredentialContext.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMDCredentialContext.java
index 5e9cede..fc4c119 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMDCredentialContext.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLMDCredentialContext.java
@@ -44,7 +44,7 @@ public class SAMLMDCredentialContext implements CredentialContext {
      * 
      * @param descriptor the KeyDescriptor context from which a credential was resolved
      */
-    public SAMLMDCredentialContext(KeyDescriptor descriptor) {
+    public SAMLMDCredentialContext(final KeyDescriptor descriptor) {
         keyDescriptor = descriptor;
         if (descriptor != null) {
             // KeyDescriptor / EncryptionMethod
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLSignatureProfileValidator.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLSignatureProfileValidator.java
index 7b3aeb0..7ba19c9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLSignatureProfileValidator.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/impl/SAMLSignatureProfileValidator.java
@@ -71,7 +71,7 @@ public class SAMLSignatureProfileValidator implements SignaturePrevalidator {
      * @param sigImpl the signature implementation object to validate
      * @throws SignatureException thrown if the signature is not valid with respect to the profile
      */
-    protected void validateSignatureImpl(SignatureImpl sigImpl) throws SignatureException {
+    protected void validateSignatureImpl(final SignatureImpl sigImpl) throws SignatureException {
 
         if (sigImpl.getXMLSignature() == null) {
             log.error("SignatureImpl did not contain the an Apache XMLSignature child");
@@ -104,7 +104,7 @@ public class SAMLSignatureProfileValidator implements SignaturePrevalidator {
      * @throws SignatureException thrown if the Signature does not contain exactly 1 Reference, or if there is an error
      *             obtaining the Reference instance
      */
-    protected Reference validateReference(XMLSignature apacheSig) throws SignatureException {
+    protected Reference validateReference(final XMLSignature apacheSig) throws SignatureException {
         int numReferences = apacheSig.getSignedInfo().getLength();
         if (numReferences != 1) {
             log.error("Signature SignedInfo had invalid number of References: " + numReferences);
@@ -114,7 +114,7 @@ public class SAMLSignatureProfileValidator implements SignaturePrevalidator {
         Reference ref = null;
         try {
             ref = apacheSig.getSignedInfo().item(0);
-        } catch (XMLSecurityException e) {
+        } catch (final XMLSecurityException e) {
             log.error("Apache XML Security exception obtaining Reference", e);
             throw new SignatureException("Could not obtain Reference from Signature/SignedInfo", e);
         }
@@ -136,7 +136,7 @@ public class SAMLSignatureProfileValidator implements SignaturePrevalidator {
      * @param signableObject the SignableSAMLObject whose signature is being validated
      * @throws SignatureException  if the URI is invalid or doesn't resolve to the expected DOM node
      */
-    protected void validateReferenceURI(String uri, SignableSAMLObject signableObject) throws SignatureException {
+    protected void validateReferenceURI(final String uri, final SignableSAMLObject signableObject) throws SignatureException {
         String id = signableObject.getSignatureReferenceID();
         validateReferenceURI(uri, id);
         
@@ -176,7 +176,7 @@ public class SAMLSignatureProfileValidator implements SignaturePrevalidator {
      * @param id the Signature parents ID attribute value
      * @throws SignatureException thrown if the URI or ID attribute values are invalid
      */
-    protected void validateReferenceURI(String uri, String id) throws SignatureException {
+    protected void validateReferenceURI(final String uri, final String id) throws SignatureException {
         if (!Strings.isNullOrEmpty(uri)) {
             if (!uri.startsWith("#")) {
                 log.error("Signature Reference URI was not a document fragment reference: " + uri);
@@ -201,11 +201,11 @@ public class SAMLSignatureProfileValidator implements SignaturePrevalidator {
      * @param reference the Signature reference containing the transforms to evaluate
      * @throws SignatureException thrown if the set of transforms is invalid
      */
-    protected void validateTransforms(Reference reference) throws SignatureException {
+    protected void validateTransforms(final Reference reference) throws SignatureException {
         Transforms transforms = null;
         try {
             transforms = reference.getTransforms();
-        } catch (XMLSecurityException e) {
+        } catch (final XMLSecurityException e) {
             log.error("Apache XML Security error obtaining Transforms instance", e);
             throw new SignatureException("Apache XML Security error obtaining Transforms instance", e);
         }
@@ -226,7 +226,7 @@ public class SAMLSignatureProfileValidator implements SignaturePrevalidator {
             Transform transform = null;
             try {
                 transform = transforms.item(i);
-            } catch (TransformationException e) {
+            } catch (final TransformationException e) {
                 log.error("Error obtaining transform instance", e);
                 throw new SignatureException("Error obtaining transform instance", e);
             }
@@ -255,7 +255,7 @@ public class SAMLSignatureProfileValidator implements SignaturePrevalidator {
      * @param apacheSig the Apache XML Signature instance
      * @throws SignatureException if the signature contains ds:Object children
      */
-    protected void validateObjectChildren(XMLSignature apacheSig) throws SignatureException {
+    protected void validateObjectChildren(final XMLSignature apacheSig) throws SignatureException {
         if (apacheSig.getObjectLength() > 0) {
             log.error("Signature contained {} ds:Object child element(s)", apacheSig.getObjectLength());
             throw new SignatureException("Signature contained illegal ds:Object children");

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list