[java-opensaml] 02/03: JPAR-85 - Checkstyle, check final variables

Tom Zeller tzeller at dragonacea.biz
Wed Aug 9 22:31:02 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=6688adc1c4c09bc76c80be9dccdc99eeaa343d94

commit 6688adc1c4c09bc76c80be9dccdc99eeaa343d94
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Wed Aug 9 19:49:18 2017 -0500

    JPAR-85 - Checkstyle, check final variables
---
 .../StorageServiceSAMLArtifactMapEntryFactory.java |  2 +-
 .../impl/SAMLOutboundDestinationHandler.java       |  4 +-
 .../BaseSAMLSimpleSignatureSecurityHandler.java    |  4 +-
 .../impl/EndpointURLSchemeSecurityHandler.java     |  2 +-
 .../impl/ReceivedEndpointSecurityHandler.java      |  6 +--
 .../impl/SAMLMDClientCertAuthSecurityHandler.java  |  2 +-
 .../ext/saml2alg/impl/DigestMethodMarshaller.java  |  2 +-
 .../ext/saml2alg/impl/SigningMethodMarshaller.java |  2 +-
 .../saml2cb/impl/ChannelBindingsMarshaller.java    |  2 +-
 .../ext/saml2delrestrict/impl/DelegateImpl.java    |  2 +-
 .../saml2delrestrict/impl/DelegateMarshaller.java  |  4 +-
 .../impl/DelegateUnmarshaller.java                 |  4 +-
 .../impl/DelegationRestrictionTypeImpl.java        |  2 +-
 .../ext/saml2mdattr/impl/EntityAttributesImpl.java |  2 +-
 .../impl/EntityAttributesUnmarshaller.java         |  2 +-
 .../saml2mdquery/impl/ActionNamespaceBuilder.java  |  3 +-
 .../impl/ActionNamespaceMarshaller.java            |  2 +-
 .../impl/ActionNamespaceUnmarshaller.java          |  2 +-
 .../impl/AttributeQueryDescriptorTypeImpl.java     |  2 +-
 .../AttributeQueryDescriptorTypeUnmarshaller.java  |  2 +-
 .../impl/AuthzDecisionQueryDescriptorTypeImpl.java |  2 +-
 ...thzDecisionQueryDescriptorTypeUnmarshaller.java |  2 +-
 .../saml2mdquery/impl/QueryDescriptorTypeImpl.java |  2 +-
 .../impl/QueryDescriptorTypeMarshaller.java        |  2 +-
 .../ext/saml2mdrpi/impl/PublicationInfoImpl.java   |  2 +-
 .../saml2mdrpi/impl/PublicationInfoMarshaller.java |  4 +-
 .../ext/saml2mdrpi/impl/PublicationMarshaller.java |  4 +-
 .../ext/saml2mdrpi/impl/PublicationPathImpl.java   |  2 +-
 .../impl/PublicationPathUnmarshaller.java          |  2 +-
 .../ext/saml2mdrpi/impl/RegistrationInfoImpl.java  |  2 +-
 .../impl/RegistrationInfoMarshaller.java           |  4 +-
 .../saml/ext/saml2mdui/impl/DiscoHintsImpl.java    |  2 +-
 .../ext/saml2mdui/impl/DiscoHintsUnmarshaller.java |  2 +-
 .../ext/saml2mdui/impl/DomainHintMarshaller.java   |  2 +-
 .../ext/saml2mdui/impl/DomainHintUnmarshaller.java |  2 +-
 .../saml2mdui/impl/GeolocationHintMarshaller.java  |  2 +-
 .../impl/GeolocationHintUnmarshaller.java          |  2 +-
 .../saml/ext/saml2mdui/impl/IPHintMarshaller.java  |  2 +-
 .../ext/saml2mdui/impl/IPHintUnmarshaller.java     |  2 +-
 .../saml/ext/saml2mdui/impl/KeywordsImpl.java      |  4 +-
 .../ext/saml2mdui/impl/KeywordsMarshaller.java     | 10 ++--
 .../ext/saml2mdui/impl/KeywordsUnmarshaller.java   | 10 ++--
 .../opensaml/saml/ext/saml2mdui/impl/LogoImpl.java |  2 +-
 .../saml/ext/saml2mdui/impl/LogoMarshaller.java    |  6 +--
 .../saml/ext/saml2mdui/impl/UIInfoImpl.java        |  2 +-
 .../ext/saml2mdui/impl/UIInfoUnmarshaller.java     |  2 +-
 .../ext/samlec/impl/GeneratedKeyMarshaller.java    |  2 +-
 .../ext/samlec/impl/GeneratedKeyUnmarshaller.java  |  4 +-
 .../saml/ext/samlec/impl/SessionKeyImpl.java       |  2 +-
 .../saml/ext/samlec/impl/SessionKeyMarshaller.java |  2 +-
 .../ext/samlec/impl/SessionKeyUnmarshaller.java    |  2 +-
 .../EvaluableEntityRoleDescriptorCriterion.java    |  2 +-
 .../impl/BasicDynamicTrustedNamesStrategy.java     |  4 +-
 .../impl/EntitiesDescriptorNameProcessor.java      |  2 +-
 .../resolver/filter/impl/EntityRoleFilter.java     | 16 +++----
 .../resolver/filter/impl/PredicateFilter.java      |  2 +-
 .../impl/AbstractBatchMetadataResolver.java        |  6 +--
 .../impl/AbstractDynamicHTTPMetadataResolver.java  |  6 +--
 .../impl/AbstractDynamicMetadataResolver.java      |  8 ++--
 .../resolver/impl/AbstractMetadataResolver.java    |  2 +-
 .../impl/AbstractReloadingMetadataResolver.java    |  2 +-
 .../resolver/impl/EntityIDDigestGenerator.java     |  6 +--
 .../resolver/impl/IdentityEntityIDGenerator.java   |  2 +-
 .../impl/PredicateRoleDescriptorResolver.java      |  2 +-
 .../resolver/index/impl/EndpointMetadataIndex.java | 12 ++---
 .../resolver/index/impl/MetadataIndexManager.java  | 24 +++++-----
 .../resolver/index/impl/MetadataIndexStore.java    |  4 +-
 .../resolver/index/impl/MetadataIndexSupport.java  |  6 +--
 .../resolver/index/impl/RoleMetadataIndex.java     | 10 ++--
 .../index/impl/SAMLArtifactMetadataIndex.java      | 54 +++++++++++-----------
 .../binding/decoding/impl/HTTPArtifactDecoder.java | 10 ++--
 .../binding/decoding/impl/HTTPPostDecoder.java     | 14 +++---
 .../binding/decoding/impl/HTTPSOAP11Decoder.java   |  4 +-
 .../impl/HttpClientResponseSOAP11Decoder.java      |  4 +-
 .../binding/encoding/impl/HTTPArtifactEncoder.java |  2 +-
 .../binding/encoding/impl/HTTPPostEncoder.java     | 24 +++++-----
 .../saml/saml1/core/impl/ActionMarshaller.java     |  4 +-
 .../opensaml/saml/saml1/core/impl/AdviceImpl.java  |  6 +--
 .../saml/saml1/core/impl/AdviceUnmarshaller.java   |  2 +-
 .../core/impl/AssertionArtifactMarshaller.java     |  2 +-
 .../core/impl/AssertionArtifactUnmarshaller.java   |  2 +-
 .../core/impl/AssertionIDReferenceMarshaller.java  |  2 +-
 .../impl/AssertionIDReferenceUnmarshaller.java     |  2 +-
 .../saml/saml1/core/impl/AssertionImpl.java        | 12 ++---
 .../saml/saml1/core/impl/AssertionMarshaller.java  |  4 +-
 .../saml1/core/impl/AssertionUnmarshaller.java     |  4 +-
 .../core/impl/AttributeDesignatorMarshaller.java   |  2 +-
 .../saml/saml1/core/impl/AttributeQueryImpl.java   |  2 +-
 .../saml1/core/impl/AttributeQueryMarshaller.java  |  2 +-
 .../saml1/core/impl/AttributeStatementImpl.java    |  2 +-
 .../core/impl/AttributeStatementUnmarshaller.java  |  2 +-
 .../saml1/core/impl/AttributeUnmarshaller.java     |  4 +-
 .../saml/saml1/core/impl/AudienceMarshaller.java   |  2 +-
 .../impl/AudienceRestrictionConditionImpl.java     |  2 +-
 .../AudienceRestrictionConditionUnmarshaller.java  |  2 +-
 .../saml/saml1/core/impl/AudienceUnmarshaller.java |  2 +-
 .../saml1/core/impl/AuthenticationQueryImpl.java   |  2 +-
 .../core/impl/AuthenticationQueryMarshaller.java   |  2 +-
 .../core/impl/AuthenticationStatementImpl.java     |  2 +-
 .../impl/AuthenticationStatementMarshaller.java    |  4 +-
 .../impl/AuthenticationStatementUnmarshaller.java  |  2 +-
 .../core/impl/AuthorityBindingMarshaller.java      |  4 +-
 .../core/impl/AuthorizationDecisionQueryImpl.java  |  2 +-
 .../impl/AuthorizationDecisionQueryMarshaller.java |  2 +-
 .../impl/AuthorizationDecisionStatementImpl.java   |  2 +-
 .../AuthorizationDecisionStatementMarshaller.java  |  2 +-
 .../saml/saml1/core/impl/ConditionsImpl.java       |  6 +--
 .../saml/saml1/core/impl/ConditionsMarshaller.java |  6 +--
 .../core/impl/ConfirmationMethodMarshaller.java    |  2 +-
 .../core/impl/ConfirmationMethodUnmarshaller.java  |  2 +-
 .../saml/saml1/core/impl/EvidenceImpl.java         |  6 +--
 .../saml/saml1/core/impl/EvidenceUnmarshaller.java |  2 +-
 .../saml1/core/impl/NameIdentifierMarshaller.java  |  4 +-
 .../saml1/core/impl/RequestAbstractTypeImpl.java   |  4 +-
 .../core/impl/RequestAbstractTypeMarshaller.java   |  4 +-
 .../core/impl/RequestAbstractTypeUnmarshaller.java |  6 +--
 .../opensaml/saml/saml1/core/impl/RequestImpl.java |  2 +-
 .../saml/saml1/core/impl/RequestUnmarshaller.java  |  2 +-
 .../saml1/core/impl/ResponseAbstractTypeImpl.java  |  4 +-
 .../core/impl/ResponseAbstractTypeMarshaller.java  |  4 +-
 .../impl/ResponseAbstractTypeUnmarshaller.java     |  4 +-
 .../saml/saml1/core/impl/ResponseImpl.java         |  2 +-
 .../saml/saml1/core/impl/ResponseUnmarshaller.java |  2 +-
 .../saml/saml1/core/impl/StatusCodeImpl.java       |  2 +-
 .../saml/saml1/core/impl/StatusCodeMarshaller.java |  4 +-
 .../saml1/core/impl/StatusDetailUnmarshaller.java  |  2 +-
 .../opensaml/saml/saml1/core/impl/StatusImpl.java  |  2 +-
 .../saml1/core/impl/StatusMessageMarshaller.java   |  2 +-
 .../saml1/core/impl/StatusMessageUnmarshaller.java |  2 +-
 .../saml/saml1/core/impl/StatusUnmarshaller.java   |  2 +-
 .../saml1/core/impl/SubjectConfirmationImpl.java   |  2 +-
 .../core/impl/SubjectConfirmationUnmarshaller.java |  2 +-
 .../opensaml/saml/saml1/core/impl/SubjectImpl.java |  2 +-
 .../saml1/core/impl/SubjectLocalityMarshaller.java |  2 +-
 .../saml/saml1/core/impl/SubjectQueryImpl.java     |  2 +-
 .../saml1/core/impl/SubjectQueryUnmarshaller.java  |  2 +-
 .../saml/saml1/core/impl/SubjectStatementImpl.java |  2 +-
 .../core/impl/SubjectStatementUnmarshaller.java    |  2 +-
 .../saml/saml1/core/impl/SubjectUnmarshaller.java  |  2 +-
 .../impl/AddSubjectConfirmationToSubjects.java     |  2 +
 .../impl/AbstractSubjectConfirmationValidator.java | 20 ++++----
 .../AudienceRestrictionConditionValidator.java     | 12 ++---
 .../HolderOfKeySubjectConfirmationValidator.java   | 32 ++++++-------
 .../impl/OneTimeUseConditionValidator.java         |  4 +-
 .../binding/decoding/impl/HTTPArtifactDecoder.java | 42 ++++++++---------
 .../binding/decoding/impl/HTTPPostDecoder.java     | 14 +++---
 .../decoding/impl/HTTPPostSimpleSignDecoder.java   |  2 +-
 .../decoding/impl/HTTPRedirectDeflateDecoder.java  | 20 ++++----
 .../binding/decoding/impl/HTTPSOAP11Decoder.java   |  4 +-
 .../impl/HttpClientResponseSOAP11Decoder.java      |  4 +-
 .../binding/encoding/impl/HTTPPostEncoder.java     | 26 +++++------
 .../encoding/impl/HTTPPostSimpleSignEncoder.java   | 26 +++++------
 .../encoding/impl/HTTPRedirectDeflateEncoder.java  | 38 +++++++--------
 .../SAML2AuthnRequestsSignedSecurityHandler.java   | 10 ++--
 .../SAML2HTTPPostSimpleSignSecurityHandler.java    |  4 +-
 .../core/impl/AbstractNameIDTypeMarshaller.java    | 10 ++--
 .../saml/saml2/core/impl/ActionMarshaller.java     | 10 ++--
 .../opensaml/saml/saml2/core/impl/AdviceImpl.java  |  2 +-
 .../saml/saml2/core/impl/AdviceUnmarshaller.java   |  2 +-
 .../saml/saml2/core/impl/ArtifactMarshaller.java   |  2 +-
 .../saml2/core/impl/ArtifactResolveBuilder.java    |  3 +-
 .../saml/saml2/core/impl/ArtifactResolveImpl.java  |  2 +-
 .../core/impl/ArtifactResolveUnmarshaller.java     |  2 +-
 .../saml/saml2/core/impl/ArtifactResponseImpl.java |  2 +-
 .../core/impl/ArtifactResponseUnmarshaller.java    |  2 +-
 .../saml/saml2/core/impl/ArtifactUnmarshaller.java |  2 +-
 .../saml2/core/impl/AssertionIDRefMarshaller.java  |  2 +-
 .../core/impl/AssertionIDRefUnmarshaller.java      |  2 +-
 .../saml2/core/impl/AssertionIDRequestImpl.java    |  2 +-
 .../core/impl/AssertionIDRequestUnmarshaller.java  |  2 +-
 .../saml/saml2/core/impl/AssertionImpl.java        | 10 ++--
 .../saml/saml2/core/impl/AssertionMarshaller.java  |  7 +--
 .../saml2/core/impl/AssertionURIRefBuilder.java    |  3 +-
 .../saml2/core/impl/AssertionURIRefMarshaller.java |  2 +-
 .../core/impl/AssertionURIRefUnmarshaller.java     |  2 +-
 .../saml/saml2/core/impl/AttributeImpl.java        |  2 +-
 .../saml/saml2/core/impl/AttributeMarshaller.java  |  2 +-
 .../saml/saml2/core/impl/AttributeQueryImpl.java   |  2 +-
 .../core/impl/AttributeQueryUnmarshaller.java      |  2 +-
 .../saml2/core/impl/AttributeStatementImpl.java    |  2 +-
 .../core/impl/AttributeStatementUnmarshaller.java  |  2 +-
 .../saml2/core/impl/AttributeUnmarshaller.java     |  2 +-
 .../saml/saml2/core/impl/AudienceMarshaller.java   |  2 +-
 .../saml2/core/impl/AudienceRestrictionImpl.java   |  2 +-
 .../core/impl/AudienceRestrictionUnmarshaller.java |  2 +-
 .../saml/saml2/core/impl/AudienceUnmarshaller.java |  2 +-
 .../impl/AuthenticatingAuthorityMarshaller.java    |  2 +-
 .../impl/AuthenticatingAuthorityUnmarshaller.java  |  2 +-
 .../core/impl/AuthnContextClassRefMarshaller.java  |  2 +-
 .../impl/AuthnContextClassRefUnmarshaller.java     |  2 +-
 .../core/impl/AuthnContextDeclMarshaller.java      |  6 +--
 .../core/impl/AuthnContextDeclRefMarshaller.java   |  2 +-
 .../core/impl/AuthnContextDeclRefUnmarshaller.java |  2 +-
 .../core/impl/AuthnContextDeclUnmarshaller.java    |  8 ++--
 .../saml/saml2/core/impl/AuthnContextImpl.java     |  2 +-
 .../saml2/core/impl/AuthnContextUnmarshaller.java  |  2 +-
 .../saml/saml2/core/impl/AuthnQueryImpl.java       |  2 +-
 .../saml/saml2/core/impl/AuthnQueryMarshaller.java |  2 +-
 .../saml/saml2/core/impl/AuthnRequestImpl.java     |  2 +-
 .../saml2/core/impl/AuthnRequestMarshaller.java    |  2 +-
 .../saml/saml2/core/impl/AuthnStatementImpl.java   |  2 +-
 .../saml2/core/impl/AuthnStatementMarshaller.java  |  6 +--
 .../saml2/core/impl/AuthzDecisionQueryImpl.java    |  2 +-
 .../core/impl/AuthzDecisionQueryMarshaller.java    |  2 +-
 .../core/impl/AuthzDecisionStatementImpl.java      |  2 +-
 .../impl/AuthzDecisionStatementMarshaller.java     |  2 +-
 .../saml/saml2/core/impl/BaseIDMarshaller.java     |  2 +-
 .../saml/saml2/core/impl/ConditionsImpl.java       | 12 ++---
 .../saml/saml2/core/impl/ConditionsMarshaller.java |  6 +--
 .../saml2/core/impl/EncryptedElementTypeImpl.java  |  2 +-
 .../impl/EncryptedElementTypeUnmarshaller.java     |  2 +-
 .../saml/saml2/core/impl/EvidenceImpl.java         |  2 +-
 .../saml/saml2/core/impl/EvidenceUnmarshaller.java |  2 +-
 .../saml2/core/impl/ExtensionsUnmarshaller.java    |  2 +-
 .../saml2/core/impl/GetCompleteMarshaller.java     |  2 +-
 .../saml2/core/impl/GetCompleteUnmarshaller.java   |  2 +-
 .../saml/saml2/core/impl/IDPEntryMarshaller.java   |  2 +-
 .../opensaml/saml/saml2/core/impl/IDPListImpl.java |  2 +-
 .../saml/saml2/core/impl/IDPListUnmarshaller.java  |  2 +-
 .../saml/saml2/core/impl/LogoutRequestImpl.java    |  2 +-
 .../saml2/core/impl/LogoutRequestMarshaller.java   |  4 +-
 .../saml2/core/impl/ManageNameIDRequestImpl.java   |  2 +-
 .../core/impl/ManageNameIDRequestUnmarshaller.java |  2 +-
 .../saml2/core/impl/NameIDMappingRequestImpl.java  |  2 +-
 .../impl/NameIDMappingRequestUnmarshaller.java     |  2 +-
 .../saml2/core/impl/NameIDMappingResponseImpl.java |  2 +-
 .../impl/NameIDMappingResponseUnmarshaller.java    |  2 +-
 .../saml2/core/impl/NameIDPolicyMarshaller.java    |  2 +-
 .../saml/saml2/core/impl/NewIDMarshaller.java      |  2 +-
 .../saml/saml2/core/impl/NewIDUnmarshaller.java    |  2 +-
 .../saml/saml2/core/impl/ProxyRestrictionImpl.java |  2 +-
 .../core/impl/ProxyRestrictionMarshaller.java      |  2 +-
 .../saml2/core/impl/RequestAbstractTypeImpl.java   |  4 +-
 .../core/impl/RequestAbstractTypeMarshaller.java   |  4 +-
 .../saml2/core/impl/RequestedAuthnContextImpl.java |  2 +-
 .../core/impl/RequestedAuthnContextMarshaller.java |  2 +-
 .../saml2/core/impl/RequesterIDMarshaller.java     |  2 +-
 .../saml2/core/impl/RequesterIDUnmarshaller.java   |  2 +-
 .../saml/saml2/core/impl/ResponseImpl.java         |  2 +-
 .../saml/saml2/core/impl/ResponseUnmarshaller.java |  2 +-
 .../opensaml/saml/saml2/core/impl/ScopingImpl.java |  2 +-
 .../saml/saml2/core/impl/ScopingMarshaller.java    |  2 +-
 .../saml2/core/impl/SessionIndexMarshaller.java    |  2 +-
 .../saml2/core/impl/SessionIndexUnmarshaller.java  |  2 +-
 .../saml/saml2/core/impl/StatusCodeImpl.java       |  2 +-
 .../saml/saml2/core/impl/StatusCodeMarshaller.java |  2 +-
 .../saml2/core/impl/StatusDetailUnmarshaller.java  |  2 +-
 .../opensaml/saml/saml2/core/impl/StatusImpl.java  |  2 +-
 .../saml2/core/impl/StatusMessageMarshaller.java   |  2 +-
 .../saml2/core/impl/StatusMessageUnmarshaller.java |  2 +-
 .../saml2/core/impl/StatusResponseTypeImpl.java    |  4 +-
 .../core/impl/StatusResponseTypeMarshaller.java    |  4 +-
 .../saml/saml2/core/impl/StatusUnmarshaller.java   |  2 +-
 .../impl/SubjectConfirmationDataMarshaller.java    |  6 +--
 .../saml2/core/impl/SubjectConfirmationImpl.java   |  2 +-
 .../core/impl/SubjectConfirmationMarshaller.java   |  2 +-
 .../opensaml/saml/saml2/core/impl/SubjectImpl.java |  2 +-
 .../saml2/core/impl/SubjectLocalityMarshaller.java |  2 +-
 .../saml/saml2/core/impl/SubjectQueryImpl.java     |  2 +-
 .../saml2/core/impl/SubjectQueryUnmarshaller.java  |  2 +-
 .../saml/saml2/core/impl/SubjectUnmarshaller.java  |  2 +-
 .../saml/saml2/ecp/impl/RelayStateMarshaller.java  |  2 +-
 .../saml2/ecp/impl/RelayStateUnmarshaller.java     |  4 +-
 .../ecp/impl/RequestAuthenticatedMarshaller.java   |  2 +-
 .../ecp/impl/RequestAuthenticatedUnmarshaller.java |  4 +-
 .../opensaml/saml/saml2/ecp/impl/RequestImpl.java  |  2 +-
 .../saml/saml2/ecp/impl/RequestMarshaller.java     |  2 +-
 .../saml/saml2/ecp/impl/RequestUnmarshaller.java   |  6 +--
 .../saml/saml2/ecp/impl/ResponseMarshaller.java    |  2 +-
 .../saml/saml2/ecp/impl/ResponseUnmarshaller.java  |  4 +-
 .../saml2/ecp/impl/SubjectConfirmationImpl.java    |  2 +-
 .../ecp/impl/SubjectConfirmationMarshaller.java    |  2 +-
 .../ecp/impl/SubjectConfirmationUnmarshaller.java  |  6 +--
 .../impl/AdditionalMetadataLocationMarshaller.java |  4 +-
 .../metadata/impl/AffiliateMemberBuilder.java      |  3 +-
 .../metadata/impl/AffiliateMemberMarshaller.java   |  2 +-
 .../metadata/impl/AffiliateMemberUnmarshaller.java |  2 +-
 .../metadata/impl/AffiliationDescriptorImpl.java   |  6 +--
 .../impl/AffiliationDescriptorMarshaller.java      |  6 +--
 .../impl/AttributeAuthorityDescriptorImpl.java     |  4 +-
 .../AttributeAuthorityDescriptorUnmarshaller.java  |  2 +-
 .../impl/AttributeConsumingServiceImpl.java        |  2 +-
 .../impl/AttributeConsumingServiceMarshaller.java  |  5 +-
 .../metadata/impl/AttributeProfileMarshaller.java  |  2 +-
 .../impl/AuthnAuthorityDescriptorImpl.java         |  4 +-
 .../impl/AuthnAuthorityDescriptorUnmarshaller.java |  2 +-
 .../saml2/metadata/impl/CompanyMarshaller.java     |  2 +-
 .../saml2/metadata/impl/CompanyUnmarshaller.java   |  2 +-
 .../saml2/metadata/impl/ContactPersonImpl.java     |  2 +-
 .../metadata/impl/ContactPersonMarshaller.java     |  2 +-
 .../metadata/impl/ContactPersonUnmarshaller.java   |  4 +-
 .../metadata/impl/EmailAddressMarshaller.java      |  2 +-
 .../metadata/impl/EmailAddressUnmarshaller.java    |  2 +-
 .../saml2/metadata/impl/EndpointMarshaller.java    |  2 +-
 .../metadata/impl/EntitiesDescriptorImpl.java      |  6 +--
 .../impl/EntitiesDescriptorMarshaller.java         |  6 +--
 .../saml2/metadata/impl/EntityDescriptorImpl.java  | 20 ++++----
 .../metadata/impl/EntityDescriptorMarshaller.java  |  6 +--
 .../metadata/impl/ExtensionsUnmarshaller.java      |  2 +-
 .../saml2/metadata/impl/GivenNameMarshaller.java   |  2 +-
 .../saml2/metadata/impl/GivenNameUnmarshaller.java |  2 +-
 .../saml2/metadata/impl/IDPSSODescriptorImpl.java  |  4 +-
 .../metadata/impl/IDPSSODescriptorMarshaller.java  |  2 +-
 .../metadata/impl/IndexedEndpointMarshaller.java   |  2 +-
 .../saml2/metadata/impl/KeyDescriptorImpl.java     |  2 +-
 .../metadata/impl/KeyDescriptorMarshaller.java     |  4 +-
 .../saml2/metadata/impl/LocalizedNameImpl.java     |  2 +-
 .../metadata/impl/LocalizedNameMarshaller.java     |  6 +--
 .../saml/saml2/metadata/impl/LocalizedURIImpl.java |  2 +-
 .../metadata/impl/LocalizedURIMarshaller.java      |  6 +--
 .../metadata/impl/NameIDFormatMarshaller.java      |  2 +-
 .../metadata/impl/NameIDFormatUnmarshaller.java    |  2 +-
 .../saml/saml2/metadata/impl/OrganizationImpl.java |  2 +-
 .../metadata/impl/OrganizationMarshaller.java      |  2 +-
 .../saml2/metadata/impl/PDPDescriptorImpl.java     |  4 +-
 .../metadata/impl/PDPDescriptorUnmarshaller.java   |  2 +-
 .../impl/RequestedAttributeMarshaller.java         |  2 +-
 .../saml2/metadata/impl/RoleDescriptorImpl.java    |  8 ++--
 .../metadata/impl/RoleDescriptorMarshaller.java    | 12 ++---
 .../metadata/impl/RoleDescriptorUnmarshaller.java  |  2 +-
 .../saml2/metadata/impl/SPSSODescriptorImpl.java   |  6 +--
 .../metadata/impl/SPSSODescriptorMarshaller.java   |  2 +-
 .../saml2/metadata/impl/SSODescriptorImpl.java     |  4 +-
 .../metadata/impl/SSODescriptorUnmarshaller.java   |  2 +-
 .../saml2/metadata/impl/SurNameMarshaller.java     |  2 +-
 .../saml2/metadata/impl/SurNameUnmarshaller.java   |  2 +-
 .../metadata/impl/TelephoneNumberMarshaller.java   |  2 +-
 .../metadata/impl/TelephoneNumberUnmarshaller.java |  2 +-
 .../saml2/profile/impl/AbstractEncryptAction.java  |  4 +-
 .../saml2/profile/impl/AddStatusToResponse.java    |  2 +-
 ...ultSAML20AssertionValidationContextBuilder.java | 26 +++++------
 ...ecuritySAML20AssertionTokenSecurityHandler.java | 30 ++++++------
 .../InlineSelfEncryptionParametersStrategy.java    | 14 +++---
 .../impl/SAMLSignatureProfileValidator.java        | 22 ++++-----
 334 files changed, 722 insertions(+), 710 deletions(-)

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 0ef3bc7..ca60e08 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
@@ -164,7 +164,7 @@ public class StorageServiceSAMLArtifactMapEntryFactory extends AbstractInitializ
                         + QNameSupport.getNodeQName(rootElement.getFirstChild()));
             }
             
-            XMLObject message = unmarshaller.unmarshall((Element) rootElement.removeChild(messageElement));
+            final XMLObject message = unmarshaller.unmarshall((Element) rootElement.removeChild(messageElement));
             rootElement.getOwnerDocument().replaceChild(messageElement, rootElement);
             if (!(message instanceof SAMLObject)) {
                 throw new IOException("SAMLArtifactMapEntry's XMLObject was not a SAML message");
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLOutboundDestinationHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLOutboundDestinationHandler.java
index bd9fea6..ddf48d5 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLOutboundDestinationHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLOutboundDestinationHandler.java
@@ -51,8 +51,8 @@ public class SAMLOutboundDestinationHandler extends AbstractMessageHandler {
         final SAMLObject samlMessage = (SAMLObject) messageContext.getMessage();
         
         try {
-            URI endpointURI = SAMLBindingSupport.getEndpointURL(messageContext);
-            String endpointURL = endpointURI.toString();
+            final URI endpointURI = SAMLBindingSupport.getEndpointURL(messageContext);
+            final String endpointURL = endpointURI.toString();
             
             if (samlMessage instanceof org.opensaml.saml.saml1.core.ResponseAbstractType) {
                 log.debug("Adding recipient to outbound SAML 1 protocol message: {}", endpointURL);
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 c1f13b4..f73e940 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
@@ -279,7 +279,7 @@ public abstract class BaseSAMLSimpleSignatureSecurityHandler extends AbstractMes
                     return false;
                 }
             } else {
-                for (Credential cred : candidateCredentials) {
+                for (final Credential cred : candidateCredentials) {
                     if (engine.validate(signature, signedContent, algorithmURI, criteriaSet, cred)) {
                         log.debug("{} Simple signature validation succeeded with a request-derived credential",
                                 getLogPrefix());
@@ -320,7 +320,7 @@ public abstract class BaseSAMLSimpleSignatureSecurityHandler extends AbstractMes
      * @throws MessageHandlerException thrown if there is an error during request processing
      */
     @Nullable protected byte[] getSignature() throws MessageHandlerException {
-        String signature = getHttpServletRequest().getParameter("Signature");
+        final String signature = getHttpServletRequest().getParameter("Signature");
         if (Strings.isNullOrEmpty(signature)) {
             return null;
         }
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 75698f0..93d5920 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
@@ -42,7 +42,7 @@ public class EndpointURLSchemeSecurityHandler extends AbstractMessageHandler {
     /** {@inheritDoc} */
     @Override
     protected void doInvoke(@Nonnull final MessageContext messageContext) throws MessageHandlerException {
-        URI endpointUrl;
+        final URI endpointUrl;
         try {
             endpointUrl = SAMLBindingSupport.getEndpointURL(messageContext);
         } catch (final BindingException 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 055c497..0d40ab6 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
@@ -156,7 +156,7 @@ public class ReceivedEndpointSecurityHandler extends AbstractMessageHandler {
         Constraint.isNotNull(comparator, "URIComparator may not be null");
         log.debug("{} Checking SAML message intended destination endpoint against receiver endpoint", getLogPrefix());
         
-        String messageDestination;
+        final String messageDestination;
         try {
             messageDestination = StringSupport.trimOrNull(
                     SAMLBindingSupport.getIntendedDestinationEndpointURI(messageContext));
@@ -179,7 +179,7 @@ public class ReceivedEndpointSecurityHandler extends AbstractMessageHandler {
             }
         }
         
-        String receiverEndpoint;
+        final String receiverEndpoint;
         try {
             receiverEndpoint = StringSupport.trimOrNull(
                     SAMLBindingSupport.getActualReceiverEndpointURI(messageContext, getHttpServletRequest()));
@@ -190,7 +190,7 @@ public class ReceivedEndpointSecurityHandler extends AbstractMessageHandler {
         log.debug("{} Intended message destination endpoint: {}", getLogPrefix(), messageDestination);
         log.debug("{} Actual message receiver endpoint: {}", getLogPrefix(), receiverEndpoint);
         
-        boolean matched;
+        final boolean matched;
         try {
             matched = compareEndpointURIs(messageDestination, receiverEndpoint, comparator);
         } catch (final URIException e) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/SAMLMDClientCertAuthSecurityHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/SAMLMDClientCertAuthSecurityHandler.java
index 314399e..2aadf4f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/SAMLMDClientCertAuthSecurityHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/SAMLMDClientCertAuthSecurityHandler.java
@@ -116,7 +116,7 @@ public class SAMLMDClientCertAuthSecurityHandler extends BaseClientCertAuthSecur
     /** {@inheritDoc} */
     @Override
     @Nullable protected String getCertificatePresenterEntityID(@Nonnull final MessageContext messageContext) {
-        AbstractAuthenticatableSAMLEntityContext entityContext = messageContext.getSubcontext(entityContextClass);
+        final AbstractAuthenticatableSAMLEntityContext entityContext = messageContext.getSubcontext(entityContextClass);
         if (entityContext != null) {
             log.trace("Found authenticatable entityID '{}' from context: {}", 
                     entityContext.getEntityId(), entityContext.getClass().getName());
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 425e5d8..896fd2b 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
@@ -30,7 +30,7 @@ public class DigestMethodMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        DigestMethod digestMethod = (DigestMethod) xmlObject;
+        final DigestMethod digestMethod = (DigestMethod) xmlObject;
         
         if (digestMethod.getAlgorithm() != null) {
             domElement.setAttributeNS(null, DigestMethod.ALGORITHM_ATTRIB_NAME, digestMethod.getAlgorithm());
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 b14a0c0..6477ba8 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
@@ -30,7 +30,7 @@ public class SigningMethodMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        SigningMethod signingMethod = (SigningMethod) xmlObject;
+        final SigningMethod signingMethod = (SigningMethod) xmlObject;
         
         if (signingMethod.getAlgorithm() != null) {
             domElement.setAttributeNS(null, SigningMethod.ALGORITHM_ATTRIB_NAME, signingMethod.getAlgorithm());
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 c60b3ad..ca9ada4 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
@@ -31,7 +31,7 @@ public class ChannelBindingsMarshaller extends XSBase64BinaryMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        ChannelBindings cb = (ChannelBindings) xmlObject;
+        final ChannelBindings cb = (ChannelBindings) xmlObject;
 
         if (cb.getType() != null) {
             domElement.setAttributeNS(null, ChannelBindings.TYPE_ATTRIB_NAME, cb.getType());
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 3a8dc81..908e806 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
@@ -112,7 +112,7 @@ public class DelegateImpl extends AbstractSAMLObject implements Delegate {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (baseID != null) {
             children.add(baseID);
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 d6cb600..79f8356 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
@@ -33,10 +33,10 @@ public class DelegateMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        Delegate delegate = (Delegate) xmlObject;
+        final Delegate delegate = (Delegate) xmlObject;
         
         if (delegate.getDelegationInstant() != null) {
-            String delInstant = SAMLConfigurationSupport.getSAMLDateFormatter().print(delegate.getDelegationInstant());
+            final String delInstant = SAMLConfigurationSupport.getSAMLDateFormatter().print(delegate.getDelegationInstant());
             domElement.setAttributeNS(null, Delegate.DELEGATION_INSTANT_ATTRIB_NAME, delInstant);
         }
         if (!Strings.isNullOrEmpty(delegate.getConfirmationMethod())) {
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 a32bb60..cca496a 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
@@ -38,7 +38,7 @@ public class DelegateUnmarshaller extends AbstractSAMLObjectUnmarshaller {
         final Delegate delegate = (Delegate) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
-            String attrName = attribute.getLocalName();
+            final String attrName = attribute.getLocalName();
             if (Delegate.CONFIRMATION_METHOD_ATTRIB_NAME.equals(attrName)) {
                 delegate.setConfirmationMethod(attribute.getValue());
             } else if (Delegate.DELEGATION_INSTANT_ATTRIB_NAME.equals(attrName)) {
@@ -54,7 +54,7 @@ public class DelegateUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
-        Delegate delegate = (Delegate) parentSAMLObject;
+        final Delegate delegate = (Delegate) parentSAMLObject;
         
         if (childSAMLObject instanceof BaseID) {
             delegate.setBaseID((BaseID) childSAMLObject);
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 edf222d..b215014 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
@@ -54,7 +54,7 @@ public class DelegationRestrictionTypeImpl extends AbstractSAMLObject implements
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         children.addAll(delegates);
         return Collections.unmodifiableList(children);
     }
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 829830c..fb359f6 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
@@ -72,7 +72,7 @@ public class EntityAttributesImpl extends AbstractSAMLObject implements EntityAt
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (attributeInfo.size() == 0) {
             return null;
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 ef7ba1b..aeeca36 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
@@ -29,7 +29,7 @@ public class EntityAttributesUnmarshaller extends AbstractSAMLObjectUnmarshaller
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
-        EntityAttributes entityAttrs = (EntityAttributes) parentObject;
+        final EntityAttributes entityAttrs = (EntityAttributes) parentObject;
 
         if (childObject instanceof Attribute) {
             entityAttrs.getAttributes().add((Attribute) childObject);
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 47b2f76..045a853 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,8 @@ public class ActionNamespaceBuilder extends AbstractSAMLObjectBuilder<ActionName
 
     /** {@inheritDoc} */
     @Override
-    public ActionNamespace buildObject(final String namespaceURI, final String localName, final 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/ActionNamespaceMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/ext/saml2mdquery/impl/ActionNamespaceMarshaller.java
index 34c6e7f..e528d32 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
@@ -34,7 +34,7 @@ public class ActionNamespaceMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        ActionNamespace actionNamespace = (ActionNamespace) xmlObject;
+        final ActionNamespace actionNamespace = (ActionNamespace) xmlObject;
 
         if (!Strings.isNullOrEmpty(actionNamespace.getValue())) {
             ElementSupport.appendTextContent(domElement, 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 de4966b..4a63451 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
@@ -28,7 +28,7 @@ public class ActionNamespaceUnmarshaller extends AbstractSAMLObjectUnmarshaller
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        ActionNamespace actionNamespace = (ActionNamespace) samlObject;
+        final ActionNamespace actionNamespace = (ActionNamespace) samlObject;
 
         actionNamespace.setValue(elementContent);
     }
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 b30ea10..860da2e 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
@@ -67,7 +67,7 @@ public class AttributeQueryDescriptorTypeImpl extends QueryDescriptorTypeImpl im
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.addAll(super.getOrderedChildren());
         children.addAll(attributeConsumingServices);
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 4433e4c..e05c9e6 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
@@ -30,7 +30,7 @@ public class AttributeQueryDescriptorTypeUnmarshaller extends QueryDescriptorTyp
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
-        AttributeQueryDescriptorType descriptor = (AttributeQueryDescriptorType) parentSAMLObject;
+        final AttributeQueryDescriptorType descriptor = (AttributeQueryDescriptorType) parentSAMLObject;
 
         if (childSAMLObject instanceof AttributeConsumingService) {
             descriptor.getAttributeConsumingServices().add((AttributeConsumingService) childSAMLObject);
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 097c327..ab522ad 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
@@ -73,7 +73,7 @@ public class AuthzDecisionQueryDescriptorTypeImpl extends QueryDescriptorTypeImp
     /** {@inheritDoc} */
     @Override
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         
         children.addAll(super.getOrderedChildren());
         children.addAll(actionNamespaces);
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 e15e194..da592df 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
@@ -28,7 +28,7 @@ public class AuthzDecisionQueryDescriptorTypeUnmarshaller extends QueryDescripto
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
-        AuthzDecisionQueryDescriptorType descriptor = (AuthzDecisionQueryDescriptorType) parentSAMLObject;
+        final AuthzDecisionQueryDescriptorType descriptor = (AuthzDecisionQueryDescriptorType) parentSAMLObject;
 
         if (childSAMLObject instanceof ActionNamespace) {
             descriptor.getActionNamespaces().add((ActionNamespace) childSAMLObject);
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 cf991fb..2649693 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
@@ -93,7 +93,7 @@ public abstract class QueryDescriptorTypeImpl extends RoleDescriptorImpl impleme
     /** {@inheritDoc} */
     @Override
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         
         children.addAll(super.getOrderedChildren());
         children.addAll(nameIDFormats);
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 9be85d0..c5c052d 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
@@ -31,7 +31,7 @@ public abstract class QueryDescriptorTypeMarshaller extends RoleDescriptorMarsha
     /** {@inheritDoc} */
     @Override
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        QueryDescriptorType descriptor = (QueryDescriptorType) xmlObject;
+        final QueryDescriptorType descriptor = (QueryDescriptorType) xmlObject;
 
         if (descriptor.getWantAssertionsSignedXSBoolean() != null) {
             domElement.setAttributeNS(null, QueryDescriptorType.WANT_ASSERTIONS_SIGNED_ATTRIB_NAME, descriptor
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 0df1d84..b21012b 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
@@ -102,7 +102,7 @@ public class PublicationInfoImpl extends AbstractSAMLObject implements Publicati
     /** {@inheritDoc} */
     @Override
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         children.addAll(usagePolicies);
         return children;
     }
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 a9a9fb7..fe6253c 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
@@ -31,7 +31,7 @@ import org.w3c.dom.Element;
 public class PublicationInfoMarshaller extends AbstractSAMLObjectMarshaller {
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        PublicationInfo info = (PublicationInfo) samlObject;
+        final PublicationInfo info = (PublicationInfo) samlObject;
 
         if (info.getPublisher() != null) {
             domElement.setAttributeNS(null, PublicationInfo.PUBLISHER_ATTRIB_NAME,
@@ -45,7 +45,7 @@ public class PublicationInfoMarshaller extends AbstractSAMLObjectMarshaller {
 
 
         if (info.getCreationInstant() != null) {
-            String creationInstant = ISODateTimeFormat.dateTime().print(info.getCreationInstant());
+            final String creationInstant = ISODateTimeFormat.dateTime().print(info.getCreationInstant());
             domElement.setAttributeNS(null, PublicationInfo.CREATION_INSTANT_ATTRIB_NAME, creationInstant);
         }
     }
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 b8ef618..538e7b4 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
@@ -31,7 +31,7 @@ import org.w3c.dom.Element;
 public class PublicationMarshaller extends AbstractSAMLObjectMarshaller {
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        Publication info = (Publication) samlObject;
+        final Publication info = (Publication) samlObject;
 
         if (info.getPublisher() != null) {
             domElement.setAttributeNS(null, Publication.PUBLISHER_ATTRIB_NAME,
@@ -45,7 +45,7 @@ public class PublicationMarshaller extends AbstractSAMLObjectMarshaller {
 
 
         if (info.getCreationInstant() != null) {
-            String creationInstant = ISODateTimeFormat.dateTime().print(info.getCreationInstant());
+            final String creationInstant = ISODateTimeFormat.dateTime().print(info.getCreationInstant());
             domElement.setAttributeNS(null, Publication.CREATION_INSTANT_ATTRIB_NAME, creationInstant);
         }
     }
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 7c1448c..19c4450 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
@@ -57,7 +57,7 @@ public class PublicationPathImpl extends AbstractSAMLObject implements Publicati
     /** {@inheritDoc} */
     @Override
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         children.addAll(publications);
         return children;
     }
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 4177bbe..eaa3534 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
@@ -31,7 +31,7 @@ public class PublicationPathUnmarshaller extends AbstractSAMLObjectUnmarshaller
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
-        PublicationPath pPath = (PublicationPath) parentObject;
+        final PublicationPath pPath = (PublicationPath) parentObject;
 
         if (childObject instanceof Publication) {
             pPath.getPublications().add((Publication)childObject);
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 7565e71..6db56fe 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
@@ -87,7 +87,7 @@ public class RegistrationInfoImpl extends AbstractSAMLObject implements Registra
     /** {@inheritDoc} */
     @Override
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         children.addAll(registrationPolicies);
         return children;
     }
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 71db87c..ecc1d14 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
@@ -31,7 +31,7 @@ import org.w3c.dom.Element;
 public class RegistrationInfoMarshaller extends AbstractSAMLObjectMarshaller {
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        RegistrationInfo info = (RegistrationInfo) samlObject;
+        final RegistrationInfo info = (RegistrationInfo) samlObject;
 
         if (info.getRegistrationAuthority() != null) {
             domElement.setAttributeNS(null, RegistrationInfo.REGISTRATION_AUTHORITY_ATTRIB_NAME,
@@ -39,7 +39,7 @@ public class RegistrationInfoMarshaller extends AbstractSAMLObjectMarshaller {
         }
 
         if (info.getRegistrationInstant() != null) {
-            String registrationInstant = ISODateTimeFormat.dateTime().print(info.getRegistrationInstant());
+            final String registrationInstant = ISODateTimeFormat.dateTime().print(info.getRegistrationInstant());
             domElement.setAttributeNS(null, RegistrationInfo.REGISTRATION_INSTANT_ATTRIB_NAME, registrationInstant);
         }
     }
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 5f265f9..2c09900 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
@@ -81,7 +81,7 @@ public class DiscoHintsImpl extends AbstractSAMLObject implements DiscoHints {
     /** {@inheritDoc} */
     @Override
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.addAll(discoHintsChildren);
         return children;
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 c57dd46..791563d 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
@@ -30,7 +30,7 @@ public class DiscoHintsUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
-        DiscoHints info = (DiscoHints) parentSAMLObject;
+        final DiscoHints info = (DiscoHints) parentSAMLObject;
         info.getXMLObjects().add(childSAMLObject);
     }
 
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 edbd0ee..50ae501 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
@@ -32,7 +32,7 @@ public class DomainHintMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        DomainHint name = (DomainHint) samlObject;
+        final DomainHint name = (DomainHint) samlObject;
 
         if (name.getHint() != null) {
             ElementSupport.appendTextContent(domElement, name.getHint());
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 a020d62..a3a8eeb 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
@@ -28,7 +28,7 @@ public class DomainHintUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        DomainHint hint = (DomainHint) samlObject;
+        final DomainHint hint = (DomainHint) samlObject;
 
         hint.setHint(elementContent);
     }
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 0e14413..6f272d6 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
@@ -32,7 +32,7 @@ public class GeolocationHintMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        GeolocationHint name = (GeolocationHint) samlObject;
+        final GeolocationHint name = (GeolocationHint) samlObject;
 
         if (name.getHint() != null) {
             ElementSupport.appendTextContent(domElement, name.getHint());
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 95fe024..2d8de8d 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
@@ -28,7 +28,7 @@ public class GeolocationHintUnmarshaller extends AbstractSAMLObjectUnmarshaller
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        GeolocationHint hint = (GeolocationHint) samlObject;
+        final GeolocationHint hint = (GeolocationHint) samlObject;
 
         hint.setHint(elementContent);
     }
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 18c96b7..f0bbd9f 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
@@ -32,7 +32,7 @@ public class IPHintMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        IPHint name = (IPHint) samlObject;
+        final IPHint name = (IPHint) samlObject;
 
         if (name.getHint() != null) {
             ElementSupport.appendTextContent(domElement, name.getHint());
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 7d72dff..d7f63a9 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
@@ -28,7 +28,7 @@ public class IPHintUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        IPHint hint = (IPHint) samlObject;
+        final IPHint hint = (IPHint) samlObject;
 
         hint.setHint(elementContent);
     }
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 883b0ac..cce90c8 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
@@ -59,7 +59,7 @@ public class KeywordsImpl extends AbstractSAMLObject implements Keywords {
 
     /** {@inheritDoc} */
     public void setXMLLang(final String newLang) {
-        boolean hasValue = newLang != null && !Strings.isNullOrEmpty(newLang);
+        final boolean hasValue = newLang != null && !Strings.isNullOrEmpty(newLang);
         lang = prepareForAssignment(lang, newLang);
         manageQualifiedAttributeNamespace(LangBearing.XML_LANG_ATTR_NAME, hasValue);
     }
@@ -79,7 +79,7 @@ public class KeywordsImpl extends AbstractSAMLObject implements Keywords {
      */
     public int hashCode() {
         int hash = lang.hashCode();
-        for (String s: data) {
+        for (final String s: data) {
             hash = hash * 31 + s.hashCode();
         }
         return hash; 
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 b795d75..2850a1d 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
@@ -38,10 +38,10 @@ public class KeywordsMarshaller extends AbstractSAMLObjectMarshaller {
      * {@inheritDoc}
      */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        Keywords words = (Keywords) samlObject;
+        final Keywords words = (Keywords) samlObject;
 
         if (words.getXMLLang() != null) {
-            Attr attribute = AttributeSupport.constructAttribute(domElement.getOwnerDocument(), XMLConstants.XML_NS,
+            final Attr attribute = AttributeSupport.constructAttribute(domElement.getOwnerDocument(), XMLConstants.XML_NS,
                     LangBearing.XML_LANG_ATTR_LOCAL_NAME, XMLConstants.XML_PREFIX);
             attribute.setValue(words.getXMLLang());
             domElement.setAttributeNodeNS(attribute);
@@ -50,11 +50,11 @@ public class KeywordsMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        Keywords words = (Keywords) samlObject;
+        final Keywords words = (Keywords) samlObject;
 
         if (words.getKeywords() != null) {
-            StringBuilder sb = new StringBuilder();
-            for (String s : words.getKeywords()) {
+            final StringBuilder sb = new StringBuilder();
+            for (final String s : words.getKeywords()) {
                 sb.append(s);
                 sb.append(' ');
             }
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 dee3f53..2d97b89 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
@@ -40,7 +40,7 @@ public class KeywordsUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     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;
+            final Keywords keywords = (Keywords) samlObject;
 
             keywords.setXMLLang(attribute.getValue());
         }
@@ -49,11 +49,11 @@ public class KeywordsUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     /** {@inheritDoc} */
     @Override
     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);
+        final Keywords keywords = (Keywords) samlObject;
+        final String[] words = elementContent.split("\\s+");
+        final ArrayList<String> wordlist = new ArrayList<>(words.length);
         
-        for (String s : words) {
+        for (final String s : words) {
             wordlist.add(s);
         }
 
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 4ac6f81..6239509 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
@@ -93,7 +93,7 @@ public class LogoImpl extends AbstractSAMLObject implements Logo {
 
     /** {@inheritDoc} */
     public void setXMLLang(final String newLang) {
-        boolean hasValue = newLang != null && !Strings.isNullOrEmpty(newLang);
+        final 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 12eed7b..04d49bc 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
@@ -38,10 +38,10 @@ public class LogoMarshaller extends AbstractSAMLObjectMarshaller {
      * {@inheritDoc}
      */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        Logo logo = (Logo) samlObject;
+        final Logo logo = (Logo) samlObject;
 
         if (logo.getXMLLang() != null) {
-            Attr attribute = AttributeSupport.constructAttribute(domElement.getOwnerDocument(), XMLConstants.XML_NS,
+            final Attr attribute = AttributeSupport.constructAttribute(domElement.getOwnerDocument(), XMLConstants.XML_NS,
                     LangBearing.XML_LANG_ATTR_LOCAL_NAME, XMLConstants.XML_PREFIX);
             attribute.setValue(logo.getXMLLang());
             domElement.setAttributeNodeNS(attribute);
@@ -56,7 +56,7 @@ public class LogoMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        Logo logo = (Logo) samlObject;
+        final Logo logo = (Logo) samlObject;
 
         if (logo.getURL() != null) {
             ElementSupport.appendTextContent(domElement, logo.getURL());
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 7e45f5b..a895b38 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
@@ -105,7 +105,7 @@ public class UIInfoImpl extends AbstractSAMLObject implements UIInfo {
     /** {@inheritDoc} */
     @Override
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         
         children.addAll(uiInfoChildren);
         return children;
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 556524f..374ad97 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
@@ -30,7 +30,7 @@ public class UIInfoUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
-        UIInfo info = (UIInfo) parentSAMLObject;
+        final UIInfo info = (UIInfo) parentSAMLObject;
         info.getXMLObjects().add(childSAMLObject);
     }
 }
\ No newline at end of file
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 a1b0465..a1042fe 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
@@ -35,7 +35,7 @@ public class GeneratedKeyMarshaller extends XSBase64BinaryMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        GeneratedKey key = (GeneratedKey) samlObject;
+        final GeneratedKey key = (GeneratedKey) samlObject;
 
         if (key.isSOAP11MustUnderstandXSBoolean() != null) {
             XMLObjectSupport.marshallAttribute(GeneratedKey.SOAP11_MUST_UNDERSTAND_ATTR_NAME, 
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 af1463b..73d87f1 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
@@ -35,9 +35,9 @@ public class GeneratedKeyUnmarshaller extends XSBase64BinaryUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
-        GeneratedKey key = (GeneratedKey) samlObject;
+        final GeneratedKey key = (GeneratedKey) samlObject;
 
-        QName attrName = QNameSupport.getNodeQName(attribute);
+        final QName attrName = QNameSupport.getNodeQName(attribute);
         if (GeneratedKey.SOAP11_MUST_UNDERSTAND_ATTR_NAME.equals(attrName)) {
             key.setSOAP11MustUnderstand(XSBooleanValue.valueOf(attribute.getValue()));
         } else if (GeneratedKey.SOAP11_ACTOR_ATTR_NAME.equals(attrName)) {
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 71e6bbb..93a48a7 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
@@ -147,7 +147,7 @@ public class SessionKeyImpl extends AbstractSAMLObject implements SessionKey {
     /** {@inheritDoc} */
     @Override
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.addAll(encTypes);
         
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 2cd4842..7a6e47c 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
@@ -36,7 +36,7 @@ public class SessionKeyMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        SessionKey key = (SessionKey) samlObject;
+        final SessionKey key = (SessionKey) samlObject;
 
         if (key.isSOAP11MustUnderstandXSBoolean() != null) {
             XMLObjectSupport.marshallAttribute(SessionKey.SOAP11_MUST_UNDERSTAND_ATTR_NAME, 
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 376d820..8c02d18 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
@@ -37,7 +37,7 @@ public class SessionKeyUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
-        SessionKey key = (SessionKey) parentObject;
+        final SessionKey key = (SessionKey) parentObject;
 
         if (childObject instanceof EncType) {
             key.getEncTypes().add((EncType) childObject);
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 dd3e348..59ad39a 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
@@ -65,7 +65,7 @@ public class EvaluableEntityRoleDescriptorCriterion implements EvaluableRoleDesc
             return false;
         }
         
-        QName schemaType = input.getSchemaType();
+        final QName schemaType = input.getSchemaType();
         if (schemaType != null && Objects.equals(role, schemaType)) {
             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 047f9f8..b1ede4b 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
@@ -66,7 +66,7 @@ public class BasicDynamicTrustedNamesStrategy implements Function<XMLObject, Set
         } else if (input instanceof EntitiesDescriptor) {
             rawResult = Collections.singleton(((EntitiesDescriptor)input).getName());
         } else if (input instanceof RoleDescriptor) {
-            XMLObject parent = input.getParent();
+            final XMLObject parent = input.getParent();
             if (parent instanceof EntityDescriptor) {
                 rawResult = Collections.singleton(((EntityDescriptor)parent).getEntityID());
             }
@@ -75,7 +75,7 @@ public class BasicDynamicTrustedNamesStrategy implements Function<XMLObject, Set
             
             rawResult.add(((AffiliationDescriptor)input).getOwnerID());
             
-            XMLObject parent = input.getParent();
+            final XMLObject parent = input.getParent();
             if (parent instanceof EntityDescriptor) {
                 rawResult.add(((EntityDescriptor)parent).getEntityID());
             }
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 55403f8..9a8ebda 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
@@ -47,7 +47,7 @@ public class EntitiesDescriptorNameProcessor implements MetadataNodeProcessor {
             XMLObject currentParent = metadataNode.getParent();
             while (currentParent != null) {
                 if (currentParent instanceof EntitiesDescriptor) {
-                    String name = StringSupport.trimOrNull(((EntitiesDescriptor)currentParent).getName());
+                    final String name = StringSupport.trimOrNull(((EntitiesDescriptor)currentParent).getName());
                     if (name != null) {
                         if (log.isTraceEnabled()) {
                             log.trace("Attaching EntityGroupName '{}' to EntityDescriptor: {}", 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilter.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilter.java
index d36f313..122492c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilter.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityRoleFilter.java
@@ -164,10 +164,10 @@ public class EntityRoleFilter implements MetadataFilter {
      */
     protected void filterEntitiesDescriptor(@Nonnull final EntitiesDescriptor descriptor) throws FilterException {
         // First we filter out any contained EntityDescriptors
-        List<EntityDescriptor> entityDescriptors = descriptor.getEntityDescriptors();
+        final List<EntityDescriptor> entityDescriptors = descriptor.getEntityDescriptors();
         if (entityDescriptors != null && !entityDescriptors.isEmpty()) {
-            List<EntityDescriptor> emptyEntityDescriptors = new ArrayList<>();
-            Iterator<EntityDescriptor> entityDescriptorsItr = entityDescriptors.iterator();
+            final List<EntityDescriptor> emptyEntityDescriptors = new ArrayList<>();
+            final Iterator<EntityDescriptor> entityDescriptorsItr = entityDescriptors.iterator();
             EntityDescriptor entityDescriptor;
             List<RoleDescriptor> entityRoles;
             while (entityDescriptorsItr.hasNext()) {
@@ -186,10 +186,10 @@ public class EntityRoleFilter implements MetadataFilter {
         }
 
         // Next, contained EntityDescriptors
-        List<EntitiesDescriptor> entitiesDescriptors = descriptor.getEntitiesDescriptors();
+        final List<EntitiesDescriptor> entitiesDescriptors = descriptor.getEntitiesDescriptors();
         if (entitiesDescriptors != null && !entitiesDescriptors.isEmpty()) {
-            List<EntitiesDescriptor> emptyEntitiesDescriptors = new ArrayList<>();
-            Iterator<EntitiesDescriptor> entitiesDescriptorsItr = entitiesDescriptors.iterator();
+            final List<EntitiesDescriptor> emptyEntitiesDescriptors = new ArrayList<>();
+            final Iterator<EntitiesDescriptor> entitiesDescriptorsItr = entitiesDescriptors.iterator();
             EntitiesDescriptor entitiesDescriptor;
             while (entitiesDescriptorsItr.hasNext()) {
                 entitiesDescriptor = entitiesDescriptorsItr.next();
@@ -219,10 +219,10 @@ public class EntityRoleFilter implements MetadataFilter {
      * @throws FilterException thrown if an effective role name can not be determined
      */
     protected void filterEntityDescriptor(@Nonnull final EntityDescriptor descriptor) throws FilterException {
-        List<RoleDescriptor> roles = descriptor.getRoleDescriptors();
+        final List<RoleDescriptor> roles = descriptor.getRoleDescriptors();
 
         if (roles != null && !roles.isEmpty()) {
-            Iterator<RoleDescriptor> rolesItr = roles.iterator();
+            final Iterator<RoleDescriptor> rolesItr = roles.iterator();
             QName roleName;
             while (rolesItr.hasNext()) {
                 roleName = getRoleName(rolesItr.next());
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/PredicateFilter.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/PredicateFilter.java
index 55b7d63..906f3fa 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/PredicateFilter.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/PredicateFilter.java
@@ -125,7 +125,7 @@ public class PredicateFilter implements MetadataFilter {
             filterEntitiesDescriptor((EntitiesDescriptor) metadata);
             return metadata;
         } else if (metadata instanceof EntityDescriptor) {
-            EntityDescriptor entity = (EntityDescriptor) metadata;
+            final EntityDescriptor entity = (EntityDescriptor) metadata;
             
             if (Direction.EXCLUDE.equals(direction) == condition.apply(entity)) {
                 log.trace("Filtering out entity {} ", entity.getEntityID());
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java
index 055b614..1d7486d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractBatchMetadataResolver.java
@@ -155,7 +155,7 @@ public abstract class AbstractBatchMetadataResolver extends AbstractMetadataReso
 
     /** {@inheritDoc} */
     @Nullable public DateTime getRootValidUntil() {
-        XMLObject cached = getBackingStore().getCachedOriginalMetadata();
+        final XMLObject cached = getBackingStore().getCachedOriginalMetadata();
         if (cached != null && cached instanceof TimeBoundSAMLObject) {
             return ((TimeBoundSAMLObject)cached).getValidUntil();
         } else {
@@ -165,7 +165,7 @@ public abstract class AbstractBatchMetadataResolver extends AbstractMetadataReso
 
     /** {@inheritDoc} */
     @Nullable public Boolean isRootValid() {
-        XMLObject cached = getBackingStore().getCachedOriginalMetadata();
+        final XMLObject cached = getBackingStore().getCachedOriginalMetadata();
         if (cached == null) {
             return null;
         } else {
@@ -193,7 +193,7 @@ public abstract class AbstractBatchMetadataResolver extends AbstractMetadataReso
                 log.debug("{} Resolved {} candidates via secondary index lookup", 
                         getLogPrefix(), Iterables.size(indexedCandidates.get()));
             } else {
-                log.debug("{} Resolved no candidates via secondary index lookup (Optional indicated result was absent)", 
+                log.debug("{} Resolved no candidates via secondary index lookup (Optional indicated result was absent)",
                         getLogPrefix());
             }
         }
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 0713051..ffe0802 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
@@ -338,7 +338,7 @@ public abstract class AbstractDynamicHTTPMetadataResolver extends AbstractDynami
         if (! getSupportedContentTypes().isEmpty()) {
             supportedContentTypesValue = StringSupport.listToStringValue(getSupportedContentTypes(), ", ");
             supportedMediaTypes = new LazySet<>();
-            for (String contentType : getSupportedContentTypes()) {
+            for (final String contentType : getSupportedContentTypes()) {
                 supportedMediaTypes.add(MediaType.parse(contentType));
             }
         } else {
@@ -512,9 +512,9 @@ public abstract class AbstractDynamicHTTPMetadataResolver extends AbstractDynami
             
             try {
                 final InputStream ins = response.getEntity().getContent();
-                byte[] source = ByteStreams.toByteArray(ins);
+                final byte[] source = ByteStreams.toByteArray(ins);
                 try (ByteArrayInputStream bais = new ByteArrayInputStream(source)) {
-                    XMLObject xmlObject = unmarshallMetadata(bais);
+                    final XMLObject xmlObject = unmarshallMetadata(bais);
                     xmlObject.getObjectMetadata().put(new XMLObjectSource(source));
                     return xmlObject;
                 }
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 a20a7c4..68f8556 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
@@ -502,7 +502,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
         ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
         ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
         
-        Context contextResolve = MetricsSupport.startTimer(timerResolve);
+        final Context contextResolve = MetricsSupport.startTimer(timerResolve);
         try {
             final EntityIdCriterion entityIdCriterion = criteria.get(EntityIdCriterion.class);
             if (entityIdCriterion == null || Strings.isNullOrEmpty(entityIdCriterion.getEntityId())) {
@@ -576,7 +576,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
                 log.debug("{} Resolving metadata dynamically for entity ID: {}", getLogPrefix(), entityID);
             }
             
-            Context contextFetchFromOriginSource = MetricsSupport.startTimer(timerFetchFromOriginSource);
+            final Context contextFetchFromOriginSource = MetricsSupport.startTimer(timerFetchFromOriginSource);
             XMLObject root = null;
             try {
                 root = fetchFromOriginSource(criteria);
@@ -877,7 +877,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
                 if (isInitializeFromPersistentCacheInBackground()) {
                     log.debug("{} Initializing from the persistent cache in the background in {} ms", 
                             getLogPrefix(), getBackgroundInitializationFromCacheDelay());
-                    TimerTask initTask = new TimerTask() {
+                    final TimerTask initTask = new TimerTask() {
                         public void run() {
                             initializeFromPersistentCache();
                         }
@@ -953,7 +953,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
             log.trace("{} Attempting to load and process entities from the persistent cache", getLogPrefix());
         }
         
-        long start = System.nanoTime();
+        final long start = System.nanoTime();
         try {
             for (final Pair<String, EntityDescriptor> cacheEntry: getPersistentCacheManager().listAll()) {
                 persistentCacheInitMetrics.entriesTotal++;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java
index 89ec0d4..a1dd1bc 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractMetadataResolver.java
@@ -594,7 +594,7 @@ public abstract class AbstractMetadataResolver extends AbstractIdentifiableIniti
         
         log.trace("{} Resolved {} Predicates: {}", getLogPrefix(), predicates.size(), predicates);
         
-        boolean satisfyAny;
+        final boolean satisfyAny;
         final SatisfyAnyCriterion satisfyAnyCriterion = criteria.get(SatisfyAnyCriterion.class);
         if (satisfyAnyCriterion  != null) {
             log.trace("{} CriteriaSet contained SatisfyAnyCriterion", getLogPrefix());
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java
index 1318031..54693d8 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractReloadingMetadataResolver.java
@@ -544,7 +544,7 @@ public abstract class AbstractReloadingMetadataResolver extends AbstractBatchMet
         lastUpdate = refreshStart;
         trackRefreshSuccess = true;
         
-        long nextRefreshDelay;
+        final long nextRefreshDelay;
         if (metadataExpirationTime.isBeforeNow()) {
             expirationTime = new DateTime(ISOChronology.getInstanceUTC()).plus(getMinRefreshDelay());
             nextRefreshDelay = getMaxRefreshDelay();
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/EntityIDDigestGenerator.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/EntityIDDigestGenerator.java
index 560291f..e273a9e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/EntityIDDigestGenerator.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/EntityIDDigestGenerator.java
@@ -92,7 +92,7 @@ public class EntityIDDigestGenerator implements Function<CriteriaSet, String> {
             return null;
         }
         
-        EntityIdCriterion entityIDCrit = input.get(EntityIdCriterion.class);
+        final EntityIdCriterion entityIDCrit = input.get(EntityIdCriterion.class);
         if (entityIDCrit == null) { 
             return null;
         }
@@ -102,12 +102,12 @@ public class EntityIDDigestGenerator implements Function<CriteriaSet, String> {
             return null;
         }
         
-        String digested = digester.apply(entityID);
+        final String digested = digester.apply(entityID);
         
         if (prefix == null && suffix == null) {
             return digested;
         } else {
-            StringBuffer buffer = new StringBuffer();
+            final StringBuffer buffer = new StringBuffer();
             if (prefix != null) {
                 buffer.append(prefix);
                 if (separator != null) {
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 0534ef6..b6a346d 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
@@ -34,7 +34,7 @@ public class IdentityEntityIDGenerator implements Function<CriteriaSet, String>
             return null;
         }
         
-        EntityIdCriterion entityIDCrit = input.get(EntityIdCriterion.class);
+        final EntityIdCriterion entityIDCrit = input.get(EntityIdCriterion.class);
         if (entityIDCrit == null) {
             return null;
         }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/PredicateRoleDescriptorResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/PredicateRoleDescriptorResolver.java
index cb068c6..969841f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/PredicateRoleDescriptorResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/PredicateRoleDescriptorResolver.java
@@ -380,7 +380,7 @@ public class PredicateRoleDescriptorResolver extends AbstractIdentifiedInitializ
         
         log.trace("Resolved {} Predicates: {}", predicates.size(), predicates);
         
-        boolean satisfyAny;
+        final boolean satisfyAny;
         final SatisfyAnyCriterion satisfyAnyCriterion = criteria.get(SatisfyAnyCriterion.class);
         if (satisfyAnyCriterion  != null) {
             log.trace("CriteriaSet contained SatisfyAnyCriterion");
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 13b308f..5f66f74 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
@@ -130,10 +130,10 @@ public class EndpointMetadataIndex implements MetadataIndex {
     @Nullable @NonnullElements @Unmodifiable @NotLive
     public Set<MetadataIndexKey> generateKeys(@Nonnull final CriteriaSet criteriaSet) {
         Constraint.isNotNull(criteriaSet, "CriteriaSet was null");
-        EntityRoleCriterion roleCrit = criteriaSet.get(EntityRoleCriterion.class);
-        EndpointCriterion<Endpoint> endpointCrit = criteriaSet.get(EndpointCriterion.class);
+        final EntityRoleCriterion roleCrit = criteriaSet.get(EntityRoleCriterion.class);
+        final EndpointCriterion<Endpoint> endpointCrit = criteriaSet.get(EndpointCriterion.class);
         if (roleCrit != null && endpointCrit != null) {
-            HashSet<MetadataIndexKey> result = new HashSet<>();
+            final HashSet<MetadataIndexKey> result = new HashSet<>();
             result.addAll(processCriteria(criteriaSet, roleCrit.getRole(), endpointCrit.getEndpoint()));
             return result;
         } else {
@@ -184,18 +184,18 @@ public class EndpointMetadataIndex implements MetadataIndex {
      */
     @Nonnull private Set<String> processLocation(@Nonnull final CriteriaSet criteriaSet, @Nonnull final String location) {
         boolean generateStartsWithVariants = false;
-        StartsWithLocationCriterion startsWithCrit = criteriaSet.get(StartsWithLocationCriterion.class);
+        final StartsWithLocationCriterion startsWithCrit = criteriaSet.get(StartsWithLocationCriterion.class);
         if (startsWithCrit != null) {
             generateStartsWithVariants = startsWithCrit.isMatchStartsWith();
         }
         if (generateStartsWithVariants) {
             log.trace("Saw indication to produce path-trimmed key variants for startsWith eval from '{}'", location);
-            HashSet<String> result = new HashSet<>();
+            final HashSet<String> result = new HashSet<>();
             result.add(location);
             log.trace("Produced value '{}'", location);
             try {
                 String currentURL = null;
-                URLBuilder urlBuilder = new URLBuilder(location);
+                final URLBuilder urlBuilder = new URLBuilder(location);
                 String currentPath = MetadataIndexSupport.trimURLPathSegment(urlBuilder.getPath());
                 while (currentPath != null) {
                     urlBuilder.setPath(currentPath);
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 7a3029e..dd09b31 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
@@ -78,7 +78,7 @@ public class MetadataIndexManager<T> {
         
         indexes = new ConcurrentHashMap<>();
         if (initIndexes != null) {
-            for (MetadataIndex index : initIndexes) {
+            for (final MetadataIndex index : initIndexes) {
                 log.trace("Initializing manager for index: {}", index);
                 indexes.put(index, new MetadataIndexStore());
             }
@@ -120,13 +120,13 @@ public class MetadataIndexManager<T> {
      */
     @Nonnull @NonnullElements
     public Optional<Set<T>> lookupIndexedItems(@Nonnull final CriteriaSet criteria) {
-        Set<T> items = new HashSet<>();
-        for (MetadataIndex index : indexes.keySet()) {
-            Set<MetadataIndexKey> keys = index.generateKeys(criteria);
+        final Set<T> items = new HashSet<>();
+        for (final MetadataIndex index : indexes.keySet()) {
+            final Set<MetadataIndexKey> keys = index.generateKeys(criteria);
             if (keys != null && !keys.isEmpty()) {
-                LazySet<T> indexResult = new LazySet<>();
-                MetadataIndexStore<T> indexStore = getStore(index);
-                for (MetadataIndexKey key : keys) {
+                final LazySet<T> indexResult = new LazySet<>();
+                final MetadataIndexStore<T> indexStore = getStore(index);
+                for (final MetadataIndexKey key : keys) {
                     indexResult.addAll(indexStore.lookup(key));
                 }
                 log.trace("MetadataIndex '{}' produced results: {}", index, indexResult);
@@ -163,13 +163,13 @@ public class MetadataIndexManager<T> {
      * @param descriptor the entity descriptor to index
      */
     public void indexEntityDescriptor(@Nonnull final EntityDescriptor descriptor) {
-        T item = entityDescriptorFunction.apply(descriptor);
+        final T item = entityDescriptorFunction.apply(descriptor);
         if (item != null) {
-            for (MetadataIndex index : indexes.keySet()) {
-                Set<MetadataIndexKey> keys = index.generateKeys(descriptor);
+            for (final MetadataIndex index : indexes.keySet()) {
+                final Set<MetadataIndexKey> keys = index.generateKeys(descriptor);
                 if (keys != null && !keys.isEmpty()) {
-                    MetadataIndexStore<T> store = getStore(index);
-                    for (MetadataIndexKey key : keys) {
+                    final MetadataIndexStore<T> store = getStore(index);
+                    for (final MetadataIndexKey key : keys) {
                         log.trace("Indexing metadata: index '{}', key '{}', data item '{}'", 
                                 index, key, item);
                         store.add(key, item);
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 1873bf9..79e1e86 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
@@ -72,7 +72,7 @@ public class MetadataIndexStore<T> {
     @Nonnull @NonnullElements @Unmodifiable @NotLive 
     public Set<T> lookup(@Nonnull final MetadataIndexKey key) {
         Constraint.isNotNull(key, "IndexKey was null");
-        Set<T> items = index.get(key);
+        final Set<T> items = index.get(key);
         if (items == null) {
             return Collections.emptySet();
         } else {
@@ -106,7 +106,7 @@ public class MetadataIndexStore<T> {
     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);
+        final Set<T> items = index.get(key);
         if (items == null) {
             return;
         }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexSupport.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexSupport.java
index e4a0405..0c5df75 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexSupport.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/index/impl/MetadataIndexSupport.java
@@ -47,7 +47,7 @@ public final class MetadataIndexSupport {
      * @throws MalformedURLException if URL can not be canonicalized
      */
     @Nonnull public static String canonicalizeLocationURI(@Nonnull final String input) throws MalformedURLException {
-        String uri = StringSupport.trimOrNull(input);
+        final String uri = StringSupport.trimOrNull(input);
         if (uri == null) {
             throw new MalformedURLException("URL input was null or empty");
         }
@@ -77,11 +77,11 @@ public final class MetadataIndexSupport {
      * @return the trimmed path, or null
      */
     @Nullable public static String trimURLPathSegment(@Nullable final String input) {
-        String path = StringSupport.trimOrNull(input);
+        final String path = StringSupport.trimOrNull(input);
         if (path == null || "/".equals(path)) {
             return null;
         } else {
-            int idx = path.lastIndexOf("/");
+            final int idx = path.lastIndexOf("/");
             if (idx > 0) {
                 if (path.endsWith("/")) {
                     return path.substring(0, idx);
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 6b878b9..db1b93c 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
@@ -47,9 +47,9 @@ public class RoleMetadataIndex implements MetadataIndex {
     @Nullable @NonnullElements @Unmodifiable @NotLive 
     public Set<MetadataIndexKey> generateKeys(@Nonnull final CriteriaSet criteriaSet) {
         Constraint.isNotNull(criteriaSet, "CriteriaSet was null");
-        EntityRoleCriterion roleCrit = criteriaSet.get(EntityRoleCriterion.class);
+        final EntityRoleCriterion roleCrit = criteriaSet.get(EntityRoleCriterion.class);
         if (roleCrit != null) {
-            HashSet<MetadataIndexKey> result = new HashSet<>();
+            final HashSet<MetadataIndexKey> result = new HashSet<>();
             result.add(new RoleMetadataIndexKey(roleCrit.getRole()));
             return result;
         } else {
@@ -61,9 +61,9 @@ public class RoleMetadataIndex implements MetadataIndex {
     @Nullable @NonnullElements @Unmodifiable @NotLive 
     public Set<MetadataIndexKey> generateKeys(@Nonnull final EntityDescriptor descriptor) {
         Constraint.isNotNull(descriptor, "EntityDescriptor was null");
-        HashSet<MetadataIndexKey> result = new HashSet<>();
-        for (RoleDescriptor role : descriptor.getRoleDescriptors()) {
-            QName type = role.getSchemaType();
+        final HashSet<MetadataIndexKey> result = new HashSet<>();
+        for (final RoleDescriptor role : descriptor.getRoleDescriptors()) {
+            final QName type = role.getSchemaType();
             if (type != null) {
                 result.add(new RoleMetadataIndexKey(type));
             } else {
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 fbb859b..6ecd88a 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
@@ -108,9 +108,9 @@ public class SAMLArtifactMetadataIndex implements MetadataIndex {
     /** {@inheritDoc} */
     @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) {
-            Set<MetadataIndexKey> result = indexingFunction.apply(descriptor);
+        final HashSet<MetadataIndexKey> results = new HashSet<>();
+        for (final Function<EntityDescriptor, Set<MetadataIndexKey>> indexingFunction : indexingFunctions) {
+            final Set<MetadataIndexKey> result = indexingFunction.apply(descriptor);
             if (result != null) {
                 results.addAll(result);
             }
@@ -121,11 +121,11 @@ public class SAMLArtifactMetadataIndex implements MetadataIndex {
     /** {@inheritDoc} */
     @Nullable public Set<MetadataIndexKey> generateKeys(@Nonnull final CriteriaSet criteriaSet) {
         Constraint.isNotNull(criteriaSet, "CriteriaSet was null");
-        ArtifactCriterion artifactCrit = criteriaSet.get(ArtifactCriterion.class);
+        final ArtifactCriterion artifactCrit = criteriaSet.get(ArtifactCriterion.class);
         if (artifactCrit != null) {
-            LazySet<MetadataIndexKey> results = new LazySet<>();
+            final LazySet<MetadataIndexKey> results = new LazySet<>();
             
-            SAMLArtifact artifact = artifactCrit.getArtifact();
+            final SAMLArtifact artifact = artifactCrit.getArtifact();
             
             if (artifact instanceof SAMLSourceIDArtifact) {
                 results.add(new ArtifactSourceIDMetadataIndexKey(((SAMLSourceIDArtifact)artifact).getSourceID()));
@@ -158,15 +158,15 @@ public class SAMLArtifactMetadataIndex implements MetadataIndex {
             if (descriptor == null) {
                 return null;
             }
-            String entityID = StringSupport.trimOrNull(descriptor.getEntityID());
+            final String entityID = StringSupport.trimOrNull(descriptor.getEntityID());
             if (entityID == null) {
                 return null;
             }
             
             try {
-                MessageDigest sha1Digester = MessageDigest.getInstance(JCAConstants.DIGEST_SHA1);
-                byte[] sourceID = sha1Digester.digest(entityID.getBytes("UTF-8"));
-                ArtifactSourceIDMetadataIndexKey key = new ArtifactSourceIDMetadataIndexKey(sourceID);
+                final MessageDigest sha1Digester = MessageDigest.getInstance(JCAConstants.DIGEST_SHA1);
+                final byte[] sourceID = sha1Digester.digest(entityID.getBytes("UTF-8"));
+                final ArtifactSourceIDMetadataIndexKey key = new ArtifactSourceIDMetadataIndexKey(sourceID);
                 log.trace("For entityID '{}' produced artifact SourceID index key: {}", entityID, key);
                 return Collections.<MetadataIndexKey>singleton(key);
             } catch (final NoSuchAlgorithmException e) {
@@ -200,25 +200,25 @@ public class SAMLArtifactMetadataIndex implements MetadataIndex {
                 return null;
             }
             
-            LazySet<MetadataIndexKey> results = new LazySet<>();
+            final LazySet<MetadataIndexKey> results = new LazySet<>();
             
-            for (RoleDescriptor roleDescriptor : descriptor.getRoleDescriptors()) {
-                Extensions extensions = roleDescriptor.getExtensions();
+            for (final RoleDescriptor roleDescriptor : descriptor.getRoleDescriptors()) {
+                final Extensions extensions = roleDescriptor.getExtensions();
                 if (extensions != null) {
-                    List<XMLObject> children = extensions.getUnknownXMLObjects(SourceID.DEFAULT_ELEMENT_NAME);
+                    final List<XMLObject> children = extensions.getUnknownXMLObjects(SourceID.DEFAULT_ELEMENT_NAME);
                     if (children != null && !children.isEmpty()) {
-                        QName role = descriptor.getSchemaType() != null ? roleDescriptor.getSchemaType() 
+                        final QName role = descriptor.getSchemaType() != null ? roleDescriptor.getSchemaType() 
                                 : roleDescriptor.getElementQName();
                         log.trace("Processing SourceID extensions for entityID '{}' with role '{}'", 
                                 descriptor.getEntityID(), role);
                         
-                        for (XMLObject child : children) {
-                            SourceID extSourceID = (SourceID) child;
-                            String extSourceIDHex = StringSupport.trimOrNull(extSourceID.getValue());
+                        for (final XMLObject child : children) {
+                            final SourceID extSourceID = (SourceID) child;
+                            final String extSourceIDHex = StringSupport.trimOrNull(extSourceID.getValue());
                             if (extSourceIDHex != null) {
                                 try {
-                                    byte[] sourceID = Hex.decodeHex(extSourceIDHex.toCharArray());
-                                    ArtifactSourceIDMetadataIndexKey key = 
+                                    final byte[] sourceID = Hex.decodeHex(extSourceIDHex.toCharArray());
+                                    final ArtifactSourceIDMetadataIndexKey key = 
                                             new ArtifactSourceIDMetadataIndexKey(sourceID);
                                     log.trace("For SourceID extension value '{}' produced index key: {}", 
                                             extSourceIDHex, key);
@@ -255,20 +255,20 @@ public class SAMLArtifactMetadataIndex implements MetadataIndex {
                 return null;
             }
             
-            LazySet<MetadataIndexKey> results = new LazySet<>();
+            final LazySet<MetadataIndexKey> results = new LazySet<>();
             
-            for (RoleDescriptor roleDescriptor : descriptor.getRoleDescriptors()) {
+            for (final RoleDescriptor roleDescriptor : descriptor.getRoleDescriptors()) {
                 if (roleDescriptor instanceof SSODescriptor) {
-                    List<ArtifactResolutionService> arsList = 
+                    final List<ArtifactResolutionService> arsList = 
                             ((SSODescriptor)roleDescriptor).getArtifactResolutionServices();
                     if (arsList != null && !arsList.isEmpty()) {
-                        QName role = descriptor.getSchemaType() != null ? roleDescriptor.getSchemaType() 
+                        final QName role = descriptor.getSchemaType() != null ? roleDescriptor.getSchemaType() 
                                 : roleDescriptor.getElementQName();
                         log.trace("Processing ArtifactResolutionService locations for entityID '{}' with role '{}'", 
                                 descriptor.getEntityID(), role);
                         
-                        for (ArtifactResolutionService ars : arsList) {
-                            ArtifactSourceLocationMetadataIndexKey key = 
+                        for (final ArtifactResolutionService ars : arsList) {
+                            final ArtifactSourceLocationMetadataIndexKey key = 
                                     new ArtifactSourceLocationMetadataIndexKey(ars.getLocation());
                             log.trace("For entityID '{}' produced artifact source location index key: {}",
                                     descriptor.getEntityID(), key);
@@ -420,7 +420,7 @@ public class SAMLArtifactMetadataIndex implements MetadataIndex {
             }
 
             if (obj instanceof ArtifactSourceLocationMetadataIndexKey) {
-                ArtifactSourceLocationMetadataIndexKey other = (ArtifactSourceLocationMetadataIndexKey) obj;
+                final ArtifactSourceLocationMetadataIndexKey other = (ArtifactSourceLocationMetadataIndexKey) obj;
                 if (this.isCanonicalizedLowerCase == other.isCanonicalizedLowerCase) {
                     return this.canonicalizedLocation.equals(other.canonicalizedLocation);
                 } else {
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 0fd630a..2a7276f 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
@@ -75,8 +75,8 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
 
     /** {@inheritDoc} */
     protected void doDecode() throws MessageDecodingException {
-        MessageContext<SAMLObject> messageContext = new MessageContext<>();
-        HttpServletRequest request = getHttpServletRequest();
+        final MessageContext<SAMLObject> messageContext = new MessageContext<>();
+        final HttpServletRequest request = getHttpServletRequest();
         
         decodeTarget(messageContext, request);
         processArtifacts(messageContext, request);
@@ -96,7 +96,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      */
     protected void decodeTarget(final MessageContext messageContext, final HttpServletRequest request) 
             throws MessageDecodingException {
-        String target = StringSupport.trim(request.getParameter("TARGET"));
+        final String target = StringSupport.trim(request.getParameter("TARGET"));
         if (target == null) {
             log.error("URL TARGET parameter was missing or did not contain a value.");
             throw new MessageDecodingException("URL TARGET parameter was missing or did not contain a value.");
@@ -115,7 +115,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      */
     protected void processArtifacts(final MessageContext messageContext, final HttpServletRequest request) 
             throws MessageDecodingException {
-        String[] encodedArtifacts = request.getParameterValues("SAMLart");
+        final String[] encodedArtifacts = request.getParameterValues("SAMLart");
         if (encodedArtifacts == null || encodedArtifacts.length == 0) {
             log.error("URL SAMLart parameter was missing or did not contain a value.");
             throw new MessageDecodingException("URL SAMLart parameter was missing or did not contain a value.");
@@ -132,7 +132,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      * @param messageContext the current message context
      */
     protected void populateBindingContext(final MessageContext<SAMLObject> messageContext) {
-        SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
+        final SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
         bindingContext.setBindingUri(getBindingURI());
         bindingContext.setBindingDescriptor(bindingDescriptor);
         bindingContext.setHasBindingSignature(false);
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 abb3ea3..4e78cf0 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
@@ -75,25 +75,25 @@ public class HTTPPostDecoder extends BaseHttpServletRequestXMLMessageDecoder<SAM
     
     /** {@inheritDoc} */
     protected void doDecode() throws MessageDecodingException {
-        MessageContext<SAMLObject> messageContext = new MessageContext<>();
-        HttpServletRequest request = getHttpServletRequest();
+        final MessageContext<SAMLObject> messageContext = new MessageContext<>();
+        final HttpServletRequest request = getHttpServletRequest();
 
         if (!"POST".equalsIgnoreCase(request.getMethod())) {
             throw new MessageDecodingException("This message decoder only supports the HTTP POST method");
         }
 
-        String relayState = request.getParameter("TARGET");
+        final String relayState = request.getParameter("TARGET");
         log.debug("Decoded SAML relay state (TARGET parameter) of: {}", relayState);
         SAMLBindingSupport.setRelayState(messageContext, relayState);
 
-        String base64Message = request.getParameter("SAMLResponse");
-        byte[] decodedBytes = Base64Support.decode(base64Message);
+        final String base64Message = request.getParameter("SAMLResponse");
+        final byte[] decodedBytes = Base64Support.decode(base64Message);
         if (decodedBytes == null) {
             log.error("Unable to Base64 decode SAML message");
             throw new MessageDecodingException("Unable to Base64 decode SAML message");
         }
 
-        SAMLObject inboundMessage = (SAMLObject) unmarshallMessage(new ByteArrayInputStream(decodedBytes));
+        final SAMLObject inboundMessage = (SAMLObject) unmarshallMessage(new ByteArrayInputStream(decodedBytes));
         messageContext.setMessage(inboundMessage);
         log.debug("Decoded SAML message");
 
@@ -108,7 +108,7 @@ public class HTTPPostDecoder extends BaseHttpServletRequestXMLMessageDecoder<SAM
      * @param messageContext the current message context
      */
     protected void populateBindingContext(final MessageContext<SAMLObject> messageContext) {
-        SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
+        final SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
         bindingContext.setBindingUri(getBindingURI());
         bindingContext.setBindingDescriptor(bindingDescriptor);
         bindingContext.setHasBindingSignature(false);
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 290710f..3c38fc8 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
@@ -81,7 +81,7 @@ public class HTTPSOAP11Decoder extends org.opensaml.soap.soap11.decoder.http.imp
         
         populateBindingContext(getMessageContext());
         
-        SAMLObject samlMessage = getMessageContext().getMessage();
+        final SAMLObject samlMessage = getMessageContext().getMessage();
         log.debug("Decoded SOAP messaged which included SAML message of type {}", samlMessage.getElementQName());
     }
     
@@ -91,7 +91,7 @@ public class HTTPSOAP11Decoder extends org.opensaml.soap.soap11.decoder.http.imp
      * @param messageContext the current message context
      */
     protected void populateBindingContext(final MessageContext<SAMLObject> messageContext) {
-        SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
+        final SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
         bindingContext.setBindingUri(getBindingURI());
         bindingContext.setBindingDescriptor(bindingDescriptor);
         bindingContext.setHasBindingSignature(false);
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 6a21486..ae593b4 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
@@ -82,7 +82,7 @@ public class HttpClientResponseSOAP11Decoder
         
         populateBindingContext(getMessageContext());
         
-        SAMLObject samlMessage = getMessageContext().getMessage();
+        final SAMLObject samlMessage = getMessageContext().getMessage();
         log.debug("Decoded SOAP message which included SAML message of type {}", samlMessage.getElementQName());
     }
     
@@ -92,7 +92,7 @@ public class HttpClientResponseSOAP11Decoder
      * @param messageContext the current message context
      */
     protected void populateBindingContext(final MessageContext<SAMLObject> messageContext) {
-        SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
+        final SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
         bindingContext.setBindingUri(getBindingURI());
         bindingContext.setBindingDescriptor(bindingDescriptor);
         bindingContext.setHasBindingSignature(false);
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 80bdef4..58cab5c 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
@@ -160,7 +160,7 @@ public class HTTPArtifactEncoder extends BaseSAML1MessageEncoder {
             throw new MessageEncodingException("Outbound message was not a SAML 1 Response");
         }
         final Response samlResponse = (Response) outboundMessage;
-        for (Assertion assertion : samlResponse.getAssertions()) {
+        for (final Assertion assertion : samlResponse.getAssertions()) {
             final AbstractSAML1Artifact artifact = artifactBuilder.buildArtifact(messageContext, assertion);
             if (artifact == null) {
                 log.error("Unable to build artifact for message to relying party {}", requester);
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 6d74c8f..c221b17 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
@@ -132,13 +132,13 @@ public class HTTPPostEncoder extends BaseSAML1MessageEncoder {
 
     /** {@inheritDoc} */
     protected void doEncode() throws MessageEncodingException {
-        MessageContext<SAMLObject> messageContext = getMessageContext();
+        final MessageContext<SAMLObject> messageContext = getMessageContext();
 
-        SAMLObject outboundMessage = messageContext.getMessage();
+        final SAMLObject outboundMessage = messageContext.getMessage();
         if (outboundMessage == null) {
             throw new MessageEncodingException("No outbound SAML message contained in message context");
         }
-        String endpointURL = getEndpointURL(messageContext).toString();
+        final String endpointURL = getEndpointURL(messageContext).toString();
         
         postEncode(messageContext, endpointURL);
     }
@@ -156,33 +156,33 @@ public class HTTPPostEncoder extends BaseSAML1MessageEncoder {
         log.debug("Invoking velocity template to create POST body");
 
         try {
-            VelocityContext context = new VelocityContext();
-            SAMLObject message = messageContext.getMessage();
+            final VelocityContext context = new VelocityContext();
+            final SAMLObject message = messageContext.getMessage();
 
-            String encodedEndpointURL = HTMLEncoder.encodeForHTMLAttribute(endpointURL);
+            final String encodedEndpointURL = HTMLEncoder.encodeForHTMLAttribute(endpointURL);
             log.debug("Encoding action url of '{}' with encoded value '{}'", endpointURL, encodedEndpointURL);
             context.put("action", encodedEndpointURL);
             context.put("binding", getBindingURI());
 
             log.debug("Marshalling and Base64 encoding SAML message");
-            String messageXML = SerializeSupport.nodeToString(marshallMessage(message));
-            String encodedMessage = Base64Support.encode(messageXML.getBytes("UTF-8"), Base64Support.UNCHUNKED);
+            final String messageXML = SerializeSupport.nodeToString(marshallMessage(message));
+            final String encodedMessage = Base64Support.encode(messageXML.getBytes("UTF-8"), Base64Support.UNCHUNKED);
             context.put("SAMLResponse", encodedMessage);
 
-            String relayState = SAMLBindingSupport.getRelayState(messageContext);
+            final String relayState = SAMLBindingSupport.getRelayState(messageContext);
             if (relayState != null) {
-                String encodedRelayState = HTMLEncoder.encodeForHTMLAttribute(relayState);
+                final String encodedRelayState = HTMLEncoder.encodeForHTMLAttribute(relayState);
                 log.debug("Setting TARGET parameter to: '{}', encoded as '{}'", relayState, encodedRelayState);
                 context.put("TARGET", encodedRelayState);
             }
             
-            HttpServletResponse response = getHttpServletResponse();
+            final HttpServletResponse response = getHttpServletResponse();
 
             HttpServletSupport.addNoCacheHeaders(response);
             HttpServletSupport.setUTF8Encoding(response);
             HttpServletSupport.setContentType(response, "text/html");
 
-            Writer out = new OutputStreamWriter(response.getOutputStream(), "UTF-8");
+            final Writer out = new OutputStreamWriter(response.getOutputStream(), "UTF-8");
             velocityEngine.mergeTemplate(velocityTemplateId, "UTF-8", context, out);
             out.flush();
         } catch (final UnsupportedEncodingException e) {
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 cdc3dae..adaa09a 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
@@ -33,7 +33,7 @@ public class ActionMarshaller extends AbstractSAMLObjectMarshaller {
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
 
-        Action action = (Action) samlElement;
+        final Action action = (Action) samlElement;
 
         if (action.getNamespace() != null) {
             domElement.setAttributeNS(null, Action.NAMESPACE_ATTRIB_NAME, action.getNamespace());
@@ -42,7 +42,7 @@ public class ActionMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        Action action = (Action) samlObject;
+        final Action action = (Action) samlObject;
 
         if (action.getContents() != null) {
             ElementSupport.appendTextContent(domElement, action.getContents());
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 461de49..00f5a1c 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
@@ -64,7 +64,7 @@ public class AdviceImpl extends AbstractSAMLObject implements Advice {
         // will only contain <AssertionIDReferences> explicit code in IndexedXMLObjectChildrenList$ListView.indexCheck
         // helps us be sure.
 
-        QName assertionIDRefQName = new QName(SAMLConstants.SAML1_NS, AssertionIDReference.DEFAULT_ELEMENT_LOCAL_NAME);
+        final QName assertionIDRefQName = new QName(SAMLConstants.SAML1_NS, AssertionIDReference.DEFAULT_ELEMENT_LOCAL_NAME);
         return (List<AssertionIDReference>) assertionChildren.subList(assertionIDRefQName);
     }
 
@@ -72,7 +72,7 @@ public class AdviceImpl extends AbstractSAMLObject implements Advice {
     @Override
     public List<Assertion> getAssertions() {
         // See Comment for getAssertionIDReference as to why this unsafe casting is OK
-        QName assertionQname = new QName(SAMLConstants.SAML1_NS, Assertion.DEFAULT_ELEMENT_LOCAL_NAME);
+        final QName assertionQname = new QName(SAMLConstants.SAML1_NS, Assertion.DEFAULT_ELEMENT_LOCAL_NAME);
         return (List<Assertion>) assertionChildren.subList(assertionQname);
     }
     
@@ -91,7 +91,7 @@ public class AdviceImpl extends AbstractSAMLObject implements Advice {
     /** {@inheritDoc} */
     @Override
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         
         children.addAll(assertionChildren);
         children.addAll(unknownChildren);
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 c0684d2..608bf0f 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
@@ -33,7 +33,7 @@ public class AdviceUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
 
-        Advice advice = (Advice) parentSAMLObject;
+        final Advice advice = (Advice) parentSAMLObject;
 
         if (childSAMLObject instanceof Assertion) {
             advice.getAssertions().add((Assertion) childSAMLObject);
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 b6f1576..238ca8c 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
@@ -32,7 +32,7 @@ public class AssertionArtifactMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        AssertionArtifact assertionArtifact = (AssertionArtifact) samlObject;
+        final 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 01c6b3f..e9c7729 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
@@ -28,7 +28,7 @@ public class AssertionArtifactUnmarshaller extends AbstractSAMLObjectUnmarshalle
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        AssertionArtifact assertionArtifact = (AssertionArtifact) samlObject;
+        final AssertionArtifact assertionArtifact = (AssertionArtifact) samlObject;
 
         assertionArtifact.setAssertionArtifact(elementContent);
     }
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 f219e70..66fd40a 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
@@ -32,7 +32,7 @@ public class AssertionIDReferenceMarshaller extends AbstractSAMLObjectMarshaller
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        AssertionIDReference assertionIDReference = (AssertionIDReference) samlObject;
+        final 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 2fa17f0..dc349d8 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
@@ -26,7 +26,7 @@ public class AssertionIDReferenceUnmarshaller extends AbstractSAMLObjectUnmarsha
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        AssertionIDReference assertionIDReference = (AssertionIDReference) samlObject;
+        final 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 0da01ad..fe93866 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
@@ -99,7 +99,7 @@ public class AssertionImpl extends AbstractSignableSAMLObject implements Asserti
 
     /** {@inheritDoc} */
     public void setID(final String newID) {
-        String oldID = id;
+        final String oldID = id;
         id = prepareForAssignment(id, newID);   
         registerOwnID(oldID, id);
     }
@@ -156,26 +156,26 @@ public class AssertionImpl extends AbstractSignableSAMLObject implements Asserti
 
     /** {@inheritDoc} */
     public List<SubjectStatement> getSubjectStatements() {
-        QName statementQName = new QName(SAMLConstants.SAML1_NS, SubjectStatement.DEFAULT_ELEMENT_LOCAL_NAME);
+        final QName statementQName = new QName(SAMLConstants.SAML1_NS, SubjectStatement.DEFAULT_ELEMENT_LOCAL_NAME);
         return (List<SubjectStatement>) statements.subList(statementQName);
     }
 
     /** {@inheritDoc} */
     public List<AuthenticationStatement> getAuthenticationStatements() {
-        QName statementQName = new QName(SAMLConstants.SAML1_NS, AuthenticationStatement.DEFAULT_ELEMENT_LOCAL_NAME);
+        final QName statementQName = new QName(SAMLConstants.SAML1_NS, AuthenticationStatement.DEFAULT_ELEMENT_LOCAL_NAME);
         return (List<AuthenticationStatement>) statements.subList(statementQName);
     }
 
     /** {@inheritDoc} */
     public List<AuthorizationDecisionStatement> getAuthorizationDecisionStatements() {
-        QName statementQName =
+        final QName statementQName =
                 new QName(SAMLConstants.SAML1_NS, AuthorizationDecisionStatement.DEFAULT_ELEMENT_LOCAL_NAME);
         return (List<AuthorizationDecisionStatement>) statements.subList(statementQName);
     }
 
     /** {@inheritDoc} */
     public List<AttributeStatement> getAttributeStatements() {
-        QName statementQName = new QName(SAMLConstants.SAML1_NS, AttributeStatement.DEFAULT_ELEMENT_LOCAL_NAME);
+        final QName statementQName = new QName(SAMLConstants.SAML1_NS, AttributeStatement.DEFAULT_ELEMENT_LOCAL_NAME);
         return (List<AttributeStatement>) statements.subList(statementQName);
     }
     
@@ -187,7 +187,7 @@ public class AssertionImpl extends AbstractSignableSAMLObject implements Asserti
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
 
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (conditions != null) {
             children.add(conditions);
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 393950a..3862396 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
@@ -32,7 +32,7 @@ public class AssertionMarshaller extends AbstractSAMLObjectMarshaller {
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
 
-        Assertion assertion = (Assertion) samlElement;
+        final Assertion assertion = (Assertion) samlElement;
 
         if (assertion.getID() != null) {
             domElement.setAttributeNS(null, Assertion.ID_ATTRIB_NAME, assertion.getID());
@@ -46,7 +46,7 @@ public class AssertionMarshaller extends AbstractSAMLObjectMarshaller {
         }
 
         if (assertion.getIssueInstant() != null) {
-            String date = ISODateTimeFormat.dateTime().print(assertion.getIssueInstant());
+            final String date = ISODateTimeFormat.dateTime().print(assertion.getIssueInstant());
             domElement.setAttributeNS(null, Assertion.ISSUEINSTANT_ATTRIB_NAME, date);
         }
 
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 ea2a238..4a715cc 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
@@ -82,7 +82,7 @@ public class AssertionUnmarshaller extends AbstractSAMLObjectUnmarshaller {
                     && !Strings.isNullOrEmpty(attribute.getValue())) {
                 assertion.setIssueInstant(new DateTime(attribute.getValue(), ISOChronology.getInstanceUTC()));
             } else if (Assertion.MAJORVERSION_ATTRIB_NAME.equals(attribute.getLocalName())) {
-                int major;
+                final int major;
                 try {
                     major = Integer.parseInt(attribute.getValue());
                     if (major != 1) {
@@ -92,7 +92,7 @@ public class AssertionUnmarshaller extends AbstractSAMLObjectUnmarshaller {
                     throw new UnmarshallingException(n);
                 }
             } else if (Assertion.MINORVERSION_ATTRIB_NAME.equals(attribute.getLocalName())) {
-                int minor;
+                final int minor;
                 try {
                     minor = Integer.parseInt(attribute.getValue());
                 } catch (final NumberFormatException n) {
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 ac7c459..ec0dd03 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
@@ -28,7 +28,7 @@ public class AttributeDesignatorMarshaller extends AbstractSAMLObjectMarshaller
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
-        AttributeDesignator designator = (AttributeDesignator) samlElement;
+        final AttributeDesignator designator = (AttributeDesignator) samlElement;
 
         if (designator.getAttributeName() != null) {
             domElement.setAttributeNS(null, AttributeDesignator.ATTRIBUTENAME_ATTRIB_NAME, designator
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 2388b94..aa3a38a 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
@@ -66,7 +66,7 @@ public class AttributeQueryImpl extends SubjectQueryImpl implements AttributeQue
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        List<XMLObject> list = new ArrayList<>(attributeDesignators.size() + 1);
+        final List<XMLObject> list = new ArrayList<>(attributeDesignators.size() + 1);
         
         if (super.getOrderedChildren() != null) {
             list.addAll(super.getOrderedChildren());
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 91d7d1e..e50382e 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
@@ -30,7 +30,7 @@ public class AttributeQueryMarshaller extends SubjectQueryMarshaller {
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
 
-        AttributeQuery attributeQuery = (AttributeQuery) samlElement;
+        final AttributeQuery attributeQuery = (AttributeQuery) samlElement;
 
         if (attributeQuery.getResource() != null) {
             domElement.setAttributeNS(null, AttributeQuery.RESOURCE_ATTRIB_NAME, attributeQuery.getResource());
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 99668f8..58429b3 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
@@ -53,7 +53,7 @@ public class AttributeStatementImpl extends SubjectStatementImpl implements Attr
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        List<XMLObject> list = new ArrayList<>(attributes.size() + 1);
+        final List<XMLObject> list = new ArrayList<>(attributes.size() + 1);
 
         if (super.getOrderedChildren() != null) {
             list.addAll(super.getOrderedChildren());
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 a7c03d8..06e3950 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
@@ -31,7 +31,7 @@ public class AttributeStatementUnmarshaller extends SubjectStatementUnmarshaller
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
 
-        AttributeStatement attributeStatement = (AttributeStatement) parentSAMLObject;
+        final AttributeStatement attributeStatement = (AttributeStatement) parentSAMLObject;
 
         if (childSAMLObject instanceof Attribute) {
             attributeStatement.getAttributes().add((Attribute) childSAMLObject);
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 a6ef4f0..6c32f27 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
@@ -33,9 +33,9 @@ public class AttributeUnmarshaller extends AttributeDesignatorUnmarshaller {
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
 
-        Attribute attribute = (Attribute) parentSAMLObject;
+        final Attribute attribute = (Attribute) parentSAMLObject;
 
-        QName childQName = childSAMLObject.getElementQName();
+        final QName childQName = childSAMLObject.getElementQName();
         if ("AttributeValue".equals(childQName.getLocalPart())
                 && childQName.getNamespaceURI().equals(SAMLConstants.SAML1_NS)) {
             attribute.getAttributeValues().add(childSAMLObject);
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 837241f..d6c1254 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
@@ -32,7 +32,7 @@ public class AudienceMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        Audience audience = (Audience) samlObject;
+        final Audience audience = (Audience) samlObject;
 
         ElementSupport.appendTextContent(domElement, audience.getUri());
     }
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 d8a78f1..5e5db1d 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
@@ -58,7 +58,7 @@ public class AudienceRestrictionConditionImpl extends AbstractSAMLObject impleme
         if (audiences.size() == 0) {
             return null;
         }
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         children.addAll(audiences);
         return Collections.unmodifiableList(children);
     }
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 ece48bb..5336cc6 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
@@ -32,7 +32,7 @@ public class AudienceRestrictionConditionUnmarshaller extends AbstractSAMLObject
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
 
-        AudienceRestrictionCondition audienceRestrictionCondition = (AudienceRestrictionCondition) parentSAMLObject;
+        final AudienceRestrictionCondition audienceRestrictionCondition = (AudienceRestrictionCondition) parentSAMLObject;
 
         if (childSAMLObject instanceof Audience) {
             audienceRestrictionCondition.getAudiences().add((Audience) childSAMLObject);
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 88566f0..c5e9797 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
@@ -28,7 +28,7 @@ public class AudienceUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        Audience audience = (Audience) samlObject;
+        final Audience audience = (Audience) samlObject;
         audience.setUri(elementContent);
     }
 }
\ 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 d5a55ae..a86f9bb 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
@@ -55,7 +55,7 @@ public class AuthenticationQueryImpl extends SubjectQueryImpl implements Authent
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        List<XMLObject> list = new ArrayList<>();
+        final List<XMLObject> list = new ArrayList<>();
 
         if (super.getOrderedChildren() != null) {
             list.addAll(super.getOrderedChildren());
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 e971f3f..866444d 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
@@ -29,7 +29,7 @@ public class AuthenticationQueryMarshaller extends SubjectQueryMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        AuthenticationQuery authenticationQuery = (AuthenticationQuery) samlObject;
+        final AuthenticationQuery authenticationQuery = (AuthenticationQuery) samlObject;
 
         if (authenticationQuery.getAuthenticationMethod() != null) {
             domElement.setAttributeNS(null, AuthenticationQuery.AUTHENTICATIONMETHOD_ATTRIB_NAME, authenticationQuery
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 0584702..9d26b80 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
@@ -98,7 +98,7 @@ public class AuthenticationStatementImpl extends SubjectStatementImpl implements
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        List<XMLObject> list = new ArrayList<>(authorityBindings.size() + 2);
+        final List<XMLObject> list = new ArrayList<>(authorityBindings.size() + 2);
 
         if (super.getOrderedChildren() != null) {
             list.addAll(super.getOrderedChildren());
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 e1ba30a..079b38d 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
@@ -30,7 +30,7 @@ public class AuthenticationStatementMarshaller extends SubjectStatementMarshalle
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
-        AuthenticationStatement authenticationStatement = (AuthenticationStatement) samlElement;
+        final AuthenticationStatement authenticationStatement = (AuthenticationStatement) samlElement;
 
         if (authenticationStatement.getAuthenticationMethod() != null) {
             domElement.setAttributeNS(null, AuthenticationStatement.AUTHENTICATIONMETHOD_ATTRIB_NAME,
@@ -38,7 +38,7 @@ public class AuthenticationStatementMarshaller extends SubjectStatementMarshalle
         }
 
         if (authenticationStatement.getAuthenticationInstant() != null) {
-            String value = SAMLConfigurationSupport.getSAMLDateFormatter().print(
+            final String value = SAMLConfigurationSupport.getSAMLDateFormatter().print(
                     authenticationStatement.getAuthenticationInstant());
             domElement.setAttributeNS(null, AuthenticationStatement.AUTHENTICATIONINSTANT_ATTRIB_NAME, value);
         }
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 da47bee9..25005d2 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
@@ -55,7 +55,7 @@ public class AuthenticationStatementUnmarshaller extends SubjectStatementUnmarsh
         if (attribute.getNamespaceURI() == null) {
             if (AuthenticationStatement.AUTHENTICATIONINSTANT_ATTRIB_NAME.equals(attribute.getLocalName())
                     && !Strings.isNullOrEmpty(attribute.getValue())) {
-                DateTime value = new DateTime(attribute.getValue(), ISOChronology.getInstanceUTC());
+                final DateTime value = new DateTime(attribute.getValue(), ISOChronology.getInstanceUTC());
                 authenticationStatement.setAuthenticationInstant(value);
             } else if (AuthenticationStatement.AUTHENTICATIONMETHOD_ATTRIB_NAME.equals(attribute.getLocalName())) {
                 authenticationStatement.setAuthenticationMethod(attribute.getValue());
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 2501d32..89ac0ff 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
@@ -34,10 +34,10 @@ public class AuthorityBindingMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     public void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
-        AuthorityBinding authorityBinding = (AuthorityBinding) samlElement;
+        final AuthorityBinding authorityBinding = (AuthorityBinding) samlElement;
 
         if (authorityBinding.getAuthorityKind() != null) {
-            QName authKind = authorityBinding.getAuthorityKind();
+            final QName authKind = authorityBinding.getAuthorityKind();
             domElement.setAttributeNS(null, AuthorityBinding.AUTHORITYKIND_ATTRIB_NAME, QNameSupport
                     .qnameToContentString(authKind));
         }
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 3fc762f..ccea4b7 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
@@ -82,7 +82,7 @@ public class AuthorizationDecisionQueryImpl extends SubjectQueryImpl implements
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        List<XMLObject> list = new ArrayList<>(actions.size() + 2);
+        final List<XMLObject> list = new ArrayList<>(actions.size() + 2);
         
         if (super.getOrderedChildren() != null) {
             list.addAll(super.getOrderedChildren());
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 0ba7068..5544c96 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
@@ -29,7 +29,7 @@ public class AuthorizationDecisionQueryMarshaller extends SubjectQueryMarshaller
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
-        AuthorizationDecisionQuery authorizationDecisionQuery = (AuthorizationDecisionQuery) samlElement;
+        final AuthorizationDecisionQuery authorizationDecisionQuery = (AuthorizationDecisionQuery) samlElement;
 
         if (authorizationDecisionQuery.getResource() != null) {
             domElement.setAttributeNS(null, AuthorizationDecisionQuery.RESOURCE_ATTRIB_NAME, authorizationDecisionQuery
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 903398f..4326c1c 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
@@ -94,7 +94,7 @@ public class AuthorizationDecisionStatementImpl extends SubjectStatementImpl imp
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        List<XMLObject> list = new ArrayList<>(actions.size() + 2);
+        final List<XMLObject> list = new ArrayList<>(actions.size() + 2);
 
         if (super.getOrderedChildren() != null) {
             list.addAll(super.getOrderedChildren());
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 b22c7e2..a5b2dd0 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
@@ -29,7 +29,7 @@ public class AuthorizationDecisionStatementMarshaller extends SubjectStatementMa
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
-        AuthorizationDecisionStatement authorizationDecisionStatement;
+        final AuthorizationDecisionStatement authorizationDecisionStatement;
 
         authorizationDecisionStatement = (AuthorizationDecisionStatement) samlElement;
 
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 c866f5f..d1206db 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
@@ -91,13 +91,13 @@ public class ConditionsImpl extends AbstractSAMLObject implements Conditions {
 
     /** {@inheritDoc} */
     public List<AudienceRestrictionCondition> getAudienceRestrictionConditions() {
-        QName qname = new QName(SAMLConstants.SAML1_NS, AudienceRestrictionCondition.DEFAULT_ELEMENT_LOCAL_NAME);
+        final QName qname = new QName(SAMLConstants.SAML1_NS, AudienceRestrictionCondition.DEFAULT_ELEMENT_LOCAL_NAME);
         return (List<AudienceRestrictionCondition>) conditions.subList(qname);
     }
 
     /** {@inheritDoc} */
     public List<DoNotCacheCondition> getDoNotCacheConditions() {
-        QName qname = new QName(SAMLConstants.SAML1_NS, DoNotCacheCondition.DEFAULT_ELEMENT_LOCAL_NAME);
+        final QName qname = new QName(SAMLConstants.SAML1_NS, DoNotCacheCondition.DEFAULT_ELEMENT_LOCAL_NAME);
         return (List<DoNotCacheCondition>) conditions.subList(qname);
     }
 
@@ -106,7 +106,7 @@ public class ConditionsImpl extends AbstractSAMLObject implements Conditions {
         if (conditions.size() == 0) {
             return null;
         }
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         children.addAll(conditions);
         return Collections.unmodifiableList(children);
     }
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 8137157..d17e510 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
@@ -32,15 +32,15 @@ public class ConditionsMarshaller extends AbstractSAMLObjectMarshaller {
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
 
-        Conditions conditions = (Conditions) samlElement;
+        final Conditions conditions = (Conditions) samlElement;
 
         if (conditions.getNotBefore() != null) {
-            String date = SAMLConfigurationSupport.getSAMLDateFormatter().print(conditions.getNotBefore());
+            final String date = SAMLConfigurationSupport.getSAMLDateFormatter().print(conditions.getNotBefore());
             domElement.setAttributeNS(null, Conditions.NOTBEFORE_ATTRIB_NAME, date);
         }
 
         if (conditions.getNotOnOrAfter() != null) {
-            String date = SAMLConfigurationSupport.getSAMLDateFormatter().print(conditions.getNotOnOrAfter());
+            final String date = SAMLConfigurationSupport.getSAMLDateFormatter().print(conditions.getNotOnOrAfter());
             domElement.setAttributeNS(null, Conditions.NOTONORAFTER_ATTRIB_NAME, date);
         }
     }
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 bba8f5e..0bfb7b7 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
@@ -32,7 +32,7 @@ public class ConfirmationMethodMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        ConfirmationMethod confirmationMethod = (ConfirmationMethod) samlObject;
+        final 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 4a5ad8d..f516dc4 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
@@ -28,7 +28,7 @@ public class ConfirmationMethodUnmarshaller extends AbstractSAMLObjectUnmarshall
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        ConfirmationMethod confirmationMethod = (ConfirmationMethod) samlObject;
+        final ConfirmationMethod confirmationMethod = (ConfirmationMethod) samlObject;
 
         confirmationMethod.setConfirmationMethod(elementContent);
     }
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 52a143c..69a3b29 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
@@ -54,13 +54,13 @@ public class EvidenceImpl extends AbstractSAMLObject implements Evidence {
 
     /** {@inheritDoc} */
     public List<AssertionIDReference> getAssertionIDReferences() {
-        QName qname = new QName(SAMLConstants.SAML1_NS, AssertionIDReference.DEFAULT_ELEMENT_LOCAL_NAME);
+        final QName qname = new QName(SAMLConstants.SAML1_NS, AssertionIDReference.DEFAULT_ELEMENT_LOCAL_NAME);
         return (List<AssertionIDReference>) evidence.subList(qname);
     }
 
     /** {@inheritDoc} */
     public List<Assertion> getAssertions() {
-        QName qname = new QName(SAMLConstants.SAML1_NS, Assertion.DEFAULT_ELEMENT_LOCAL_NAME);
+        final QName qname = new QName(SAMLConstants.SAML1_NS, Assertion.DEFAULT_ELEMENT_LOCAL_NAME);
         return (List<Assertion>) evidence.subList(qname);
     }
 
@@ -75,7 +75,7 @@ public class EvidenceImpl extends AbstractSAMLObject implements Evidence {
             return null;
         }
 
-        ArrayList<XMLObject> list = new ArrayList<>();
+        final ArrayList<XMLObject> list = new ArrayList<>();
         list.addAll(evidence);
 
         return Collections.unmodifiableList(list);
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 45fb645..423be06 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
@@ -33,7 +33,7 @@ public class EvidenceUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
 
-        Evidence evidence = (Evidence) parentSAMLObject;
+        final Evidence evidence = (Evidence) parentSAMLObject;
 
         if (childSAMLObject instanceof AssertionIDReference) {
             evidence.getAssertionIDReferences().add((AssertionIDReference) childSAMLObject);
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 90efc1a..8e9b0e4 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
@@ -32,7 +32,7 @@ public class NameIdentifierMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
-        NameIdentifier nameIdentifier = (NameIdentifier) samlElement;
+        final NameIdentifier nameIdentifier = (NameIdentifier) samlElement;
 
         if (nameIdentifier.getNameQualifier() != null) {
             domElement
@@ -46,7 +46,7 @@ public class NameIdentifierMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        NameIdentifier nameIdentifier = (NameIdentifier) samlObject;
+        final NameIdentifier nameIdentifier = (NameIdentifier) samlObject;
 
         if (nameIdentifier.getValue() != null) {
             ElementSupport.appendTextContent(domElement, nameIdentifier.getValue());
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 50531bd..dda9a39 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
@@ -66,7 +66,7 @@ public abstract class RequestAbstractTypeImpl extends AbstractSignableSAMLObject
 
     /** {@inheritDoc} */
     public void setID(final String newID) {
-        String oldID = id;
+        final String oldID = id;
         id = prepareForAssignment(id, newID);
         registerOwnID(oldID, id);
     }
@@ -103,7 +103,7 @@ public abstract class RequestAbstractTypeImpl extends AbstractSignableSAMLObject
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        List<XMLObject> children = new ArrayList<>();
+        final List<XMLObject> children = new ArrayList<>();
 
         children.addAll(respondWiths);
         
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 94adbc1..b3f9eee 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
@@ -36,7 +36,7 @@ public class RequestAbstractTypeMarshaller extends AbstractSAMLObjectMarshaller
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
-        RequestAbstractType request = (RequestAbstractType) samlElement;
+        final RequestAbstractType request = (RequestAbstractType) samlElement;
 
         if (request.getID() != null) {
             domElement.setAttributeNS(null, RequestAbstractType.ID_ATTRIB_NAME, request.getID());
@@ -46,7 +46,7 @@ public class RequestAbstractTypeMarshaller extends AbstractSAMLObjectMarshaller
         }
 
         if (request.getIssueInstant() != null) {
-            String date = SAMLConfigurationSupport.getSAMLDateFormatter().print(request.getIssueInstant());
+            final String date = SAMLConfigurationSupport.getSAMLDateFormatter().print(request.getIssueInstant());
             domElement.setAttributeNS(null, RequestAbstractType.ISSUEINSTANT_ATTRIB_NAME, date);
         }
 
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 ad4cfc0..20d6125 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
@@ -81,10 +81,10 @@ public abstract class RequestAbstractTypeUnmarshaller extends AbstractSAMLObject
                 request.setID(attribute.getValue());
             } else if (RequestAbstractType.ISSUEINSTANT_ATTRIB_NAME.equals(attribute.getLocalName())
                     && !Strings.isNullOrEmpty(attribute.getValue())) {
-                DateTime cal = new DateTime(attribute.getValue(), ISOChronology.getInstanceUTC());
+                final DateTime cal = new DateTime(attribute.getValue(), ISOChronology.getInstanceUTC());
                 request.setIssueInstant(cal);
             } else if (attribute.getLocalName().equals(RequestAbstractType.MAJORVERSION_ATTRIB_NAME)) {
-                int major;
+                final int major;
                 try {
                     major = Integer.parseInt(attribute.getValue());
                     if (major != 1) {
@@ -95,7 +95,7 @@ public abstract class RequestAbstractTypeUnmarshaller extends AbstractSAMLObject
                     throw new UnmarshallingException(n);
                 }
             } else if (RequestAbstractType.MINORVERSION_ATTRIB_NAME.equals(attribute.getLocalName())) {
-                int minor;
+                final int minor;
                 try {
                     minor = Integer.parseInt(attribute.getValue());
                 } catch (final NumberFormatException n) {
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 97ba505..53930c0 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
@@ -102,7 +102,7 @@ public class RequestImpl extends RequestAbstractTypeImpl implements Request {
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
 
-        List<XMLObject> list = new ArrayList<>();
+        final List<XMLObject> list = new ArrayList<>();
 
         if (super.getOrderedChildren() != null) {
             list.addAll(super.getOrderedChildren());
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 157fd3d..e6714e4 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
@@ -31,7 +31,7 @@ public class RequestUnmarshaller extends RequestAbstractTypeUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentElement, final XMLObject childElement) throws UnmarshallingException {
-        Request request = (Request) parentElement;
+        final Request request = (Request) parentElement;
 
         try {
             if (childElement instanceof Query) {
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 2b52b51..76b0748 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
@@ -66,7 +66,7 @@ public abstract class ResponseAbstractTypeImpl extends AbstractSignableSAMLObjec
 
     /** {@inheritDoc} */
     public void setID(final String newID) {
-        String oldID = id;
+        final String oldID = id;
         id = prepareForAssignment(id, newID);
         registerOwnID(oldID, id);
     }
@@ -119,7 +119,7 @@ public abstract class ResponseAbstractTypeImpl extends AbstractSignableSAMLObjec
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        List<XMLObject> children = new ArrayList<>();
+        final List<XMLObject> children = new ArrayList<>();
         
         if(getSignature() != null){
             children.add(getSignature());
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 acef217..4b16680 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
@@ -37,7 +37,7 @@ public abstract class ResponseAbstractTypeMarshaller extends AbstractSAMLObjectM
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
-        ResponseAbstractType response = (ResponseAbstractType) samlElement;
+        final ResponseAbstractType response = (ResponseAbstractType) samlElement;
 
         if (response.getID() != null) {
             domElement.setAttributeNS(null, ResponseAbstractType.ID_ATTRIB_NAME, response.getID());
@@ -51,7 +51,7 @@ public abstract class ResponseAbstractTypeMarshaller extends AbstractSAMLObjectM
         }
 
         if (response.getIssueInstant() != null) {
-            String date = SAMLConfigurationSupport.getSAMLDateFormatter().print(response.getIssueInstant());
+            final String date = SAMLConfigurationSupport.getSAMLDateFormatter().print(response.getIssueInstant());
             domElement.setAttributeNS(null, ResponseAbstractType.ISSUEINSTANT_ATTRIB_NAME, date);
         }
 
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 2f92cf8..f924530 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
@@ -83,7 +83,7 @@ public abstract class ResponseAbstractTypeUnmarshaller extends AbstractSAMLObjec
                     && !Strings.isNullOrEmpty(attribute.getValue())) {
                 response.setIssueInstant(new DateTime(attribute.getValue(), ISOChronology.getInstanceUTC()));
             } else if (attribute.getLocalName().equals(ResponseAbstractType.MAJORVERSION_ATTRIB_NAME)) {
-                int major;
+                final int major;
                 try {
                     major = Integer.parseInt(attribute.getValue());
                     if (major != 1) {
@@ -94,7 +94,7 @@ public abstract class ResponseAbstractTypeUnmarshaller extends AbstractSAMLObjec
                     throw new UnmarshallingException(n);
                 }
             } else if (attribute.getLocalName().equals(ResponseAbstractType.MINORVERSION_ATTRIB_NAME)) {
-                int minor;
+                final int minor;
                 try {
                     minor = Integer.parseInt(attribute.getValue());
                 } catch (final NumberFormatException n) {
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 d30c0ed..86d46f6 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
@@ -67,7 +67,7 @@ public class ResponseImpl extends ResponseAbstractTypeImpl implements Response {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>(1 + assertions.size());
+        final ArrayList<XMLObject> children = new ArrayList<>(1 + assertions.size());
 
         if (super.getOrderedChildren() != null) {
             children.addAll(super.getOrderedChildren());
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 4a0b796..0c9e8a4 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
@@ -33,7 +33,7 @@ public class ResponseUnmarshaller extends ResponseAbstractTypeUnmarshaller {
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
 
-        Response response = (Response) parentSAMLObject;
+        final Response response = (Response) parentSAMLObject;
 
         if (childSAMLObject instanceof Assertion) {
             response.getAssertions().add((Assertion) childSAMLObject);
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 c9ceed0..3d8022d 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
@@ -72,7 +72,7 @@ public class StatusCodeImpl extends AbstractSAMLObject implements StatusCode {
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
         if (childStatusCode != null) {
-            ArrayList<XMLObject> contents = new ArrayList<>(1);
+            final ArrayList<XMLObject> contents = new ArrayList<>(1);
             contents.add(childStatusCode);
             return Collections.unmodifiableList(contents);
         } else {
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 b3df1ed..61aa311 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
@@ -34,9 +34,9 @@ public class StatusCodeMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
-        StatusCode statusCode = (StatusCode) samlElement;
+        final StatusCode statusCode = (StatusCode) samlElement;
 
-        QName statusValue = statusCode.getValue();
+        final QName statusValue = statusCode.getValue();
         if (statusValue != null) {
             domElement.setAttributeNS(null, StatusCode.VALUE_ATTRIB_NAME,
                     QNameSupport.qnameToContentString(statusValue));
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 adaf39f..27d75b1 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
@@ -32,7 +32,7 @@ public class StatusDetailUnmarshaller extends AbstractSAMLObjectUnmarshaller {
      */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
-        StatusDetail statusDetail = (StatusDetail) parentSAMLObject;
+        final StatusDetail statusDetail = (StatusDetail) parentSAMLObject;
 
         statusDetail.getUnknownXMLObjects().add(childSAMLObject);
     }
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 cd01652..2062346 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
@@ -85,7 +85,7 @@ public class StatusImpl extends AbstractSAMLObject implements Status {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>(3);
+        final ArrayList<XMLObject> children = new ArrayList<>(3);
 
         if (statusCode != null) {
             children.add(statusCode);
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 54b755f..4483d2c 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
@@ -31,7 +31,7 @@ import org.w3c.dom.Element;
 public class StatusMessageMarshaller extends AbstractSAMLObjectMarshaller {
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        StatusMessage statusMessage = (StatusMessage) samlObject;
+        final StatusMessage statusMessage = (StatusMessage) samlObject;
 
         if (statusMessage.getMessage() != null) {
             ElementSupport.appendTextContent(domElement, statusMessage.getMessage());
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 2683979..47087d5 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
@@ -28,7 +28,7 @@ public class StatusMessageUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        StatusMessage statusMessage = (StatusMessage) samlObject;
+        final StatusMessage statusMessage = (StatusMessage) samlObject;
         statusMessage.setMessage(elementContent);
     }
 }
\ No newline at end of file
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 a5e7763..e33322e 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
@@ -34,7 +34,7 @@ public class StatusUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
 
-        Status status = (Status) parentSAMLObject;
+        final Status status = (Status) parentSAMLObject;
 
         if (childSAMLObject instanceof StatusCode) {
             status.setStatusCode((StatusCode) childSAMLObject);
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 4610298..d3f71c9 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
@@ -82,7 +82,7 @@ public class SubjectConfirmationImpl extends AbstractSAMLObject implements Subje
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
 
-        List<XMLObject> list = new ArrayList<>(confirmationMethods.size() + 1);
+        final List<XMLObject> list = new ArrayList<>(confirmationMethods.size() + 1);
 
         list.addAll(confirmationMethods);
 
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 fd61cf6..bce9654 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
@@ -33,7 +33,7 @@ public class SubjectConfirmationUnmarshaller extends AbstractSAMLObjectUnmarshal
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
 
-        SubjectConfirmation subjectConfirmation = (SubjectConfirmation) parentSAMLObject;
+        final SubjectConfirmation subjectConfirmation = (SubjectConfirmation) parentSAMLObject;
 
         if (childSAMLObject instanceof ConfirmationMethod) {
             subjectConfirmation.getConfirmationMethods().add((ConfirmationMethod) childSAMLObject);
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 eb7c697..9486d04 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
@@ -72,7 +72,7 @@ public class SubjectImpl extends AbstractSAMLObject implements Subject {
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
 
-        List<XMLObject> list = new ArrayList<>(2);
+        final List<XMLObject> list = new ArrayList<>(2);
 
         if (nameIdentifier != null) {
             list.add(nameIdentifier);
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 9b14d77..db5343c 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
@@ -30,7 +30,7 @@ public class SubjectLocalityMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     public void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
-        SubjectLocality subjectLocality = (SubjectLocality) samlElement;
+        final SubjectLocality subjectLocality = (SubjectLocality) samlElement;
 
         if (subjectLocality.getIPAddress() != null) {
             domElement.setAttributeNS(null, SubjectLocality.IPADDRESS_ATTRIB_NAME, subjectLocality.getIPAddress());
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 98b94a5..aea05f3 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
@@ -61,7 +61,7 @@ public abstract class SubjectQueryImpl extends AbstractSAMLObject implements Sub
             return null;
         }
         
-        List<XMLObject> children = new ArrayList<>();
+        final List<XMLObject> children = new ArrayList<>();
         children.add(subject);
         return Collections.unmodifiableList(children);
     }
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 388c4c6..7be5cdd 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
@@ -35,7 +35,7 @@ public abstract class SubjectQueryUnmarshaller extends AbstractSAMLObjectUnmarsh
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
-        SubjectQuery query = (SubjectQuery) parentSAMLObject;
+        final SubjectQuery query = (SubjectQuery) parentSAMLObject;
 
         if (childSAMLObject instanceof Subject) {
             query.setSubject((Subject) childSAMLObject);
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 42031d2..d0e25bd 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
@@ -61,7 +61,7 @@ public abstract class SubjectStatementImpl extends AbstractSAMLObject implements
             return null;
         }
 
-        List<XMLObject> children = new ArrayList<>();
+        final List<XMLObject> children = new ArrayList<>();
         children.add(subject);
         return Collections.unmodifiableList(children);
     }
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 416e148..77af0d7 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
@@ -35,7 +35,7 @@ public abstract class SubjectStatementUnmarshaller extends AbstractSAMLObjectUnm
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
-        SubjectStatement statement = (SubjectStatement) parentSAMLObject;
+        final SubjectStatement statement = (SubjectStatement) parentSAMLObject;
 
         if (childSAMLObject instanceof Subject) {
             statement.setSubject((Subject) childSAMLObject);
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 cb1b743..41744a8 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
@@ -33,7 +33,7 @@ public class SubjectUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
 
-        Subject subject = (Subject) parentSAMLObject;
+        final Subject subject = (Subject) parentSAMLObject;
 
         if (childSAMLObject instanceof NameIdentifier) {
             subject.setNameIdentifier((NameIdentifier) childSAMLObject);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddSubjectConfirmationToSubjects.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddSubjectConfirmationToSubjects.java
index 7d2c5bb..bc033a7 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddSubjectConfirmationToSubjects.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddSubjectConfirmationToSubjects.java
@@ -188,7 +188,9 @@ public class AddSubjectConfirmationToSubjects extends AbstractProfileAction {
     protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
 
         final SubjectConfirmation confirmation = confirmationBuilder.buildObject();
+// Checkstyle: FinalLocalVariable OFF
         for (String method : confirmationMethods) {
+// Checkstyle: FinalLocalVariable ON
             if (artifactProfile && ConfirmationMethod.METHOD_BEARER.equals(method)) {
 // Checkstyle: ModifiedControlVariable OFF
                 method = ConfirmationMethod.METHOD_ARTIFACT;
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 9b2f761..d0db689 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
@@ -123,9 +123,9 @@ public abstract class AbstractSubjectConfirmationValidator implements SubjectCon
     @Nonnull protected ValidationResult validateNotBefore(@Nonnull final SubjectConfirmation confirmation, 
             @Nonnull final Assertion assertion, @Nonnull final ValidationContext context) 
                     throws AssertionValidationException {
-        DateTime skewedNow = new DateTime(ISOChronology.getInstanceUTC()).plus(SAML20AssertionValidator
+        final DateTime skewedNow = new DateTime(ISOChronology.getInstanceUTC()).plus(SAML20AssertionValidator
                 .getClockSkew(context));
-        DateTime notBefore = confirmation.getSubjectConfirmationData().getNotBefore();
+        final DateTime notBefore = confirmation.getSubjectConfirmationData().getNotBefore();
         
         log.debug("Evaluating SubjectConfirmationData NotBefore '{}' against 'skewed now' time '{}'",
                 notBefore, skewedNow);
@@ -153,9 +153,9 @@ public abstract class AbstractSubjectConfirmationValidator implements SubjectCon
     @Nonnull protected ValidationResult validateNotOnOrAfter(@Nonnull final SubjectConfirmation confirmation, 
             @Nonnull final Assertion assertion, @Nonnull final ValidationContext context) 
                     throws AssertionValidationException {
-        DateTime skewedNow = new DateTime(ISOChronology.getInstanceUTC()).minus(SAML20AssertionValidator
+        final DateTime skewedNow = new DateTime(ISOChronology.getInstanceUTC()).minus(SAML20AssertionValidator
                 .getClockSkew(context));
-        DateTime notOnOrAfter = confirmation.getSubjectConfirmationData().getNotOnOrAfter();
+        final DateTime notOnOrAfter = confirmation.getSubjectConfirmationData().getNotOnOrAfter();
         
         log.debug("Evaluating SubjectConfirmationData NotOnOrAfter '{}' against 'skewed now' time '{}'",
                 notOnOrAfter, skewedNow);
@@ -183,14 +183,14 @@ public abstract class AbstractSubjectConfirmationValidator implements SubjectCon
     @Nonnull protected ValidationResult validateRecipient(@Nonnull final SubjectConfirmation confirmation, 
             @Nonnull final Assertion assertion, @Nonnull final ValidationContext context) 
                     throws AssertionValidationException {
-        String recipient = StringSupport.trimOrNull(confirmation.getSubjectConfirmationData().getRecipient());
+        final String recipient = StringSupport.trimOrNull(confirmation.getSubjectConfirmationData().getRecipient());
         if (recipient == null) {
             return ValidationResult.VALID;
         }
         
         log.debug("Evaluating SubjectConfirmationData at Recipient of : {}", recipient);
 
-        Set<String> validRecipients;
+        final Set<String> validRecipients;
         try {
             validRecipients = (Set<String>) context.getStaticParameters().get(
                     SAML2AssertionValidationParameters.SC_VALID_RECIPIENTS);
@@ -239,14 +239,14 @@ public abstract class AbstractSubjectConfirmationValidator implements SubjectCon
     @Nonnull protected ValidationResult validateAddress(@Nonnull final SubjectConfirmation confirmation, 
             @Nonnull final Assertion assertion, @Nonnull final ValidationContext context) 
                     throws AssertionValidationException {
-        String address = StringSupport.trimOrNull(confirmation.getSubjectConfirmationData().getAddress());
+        final String address = StringSupport.trimOrNull(confirmation.getSubjectConfirmationData().getAddress());
         if (address == null) {
             return ValidationResult.VALID;
         }
         
         log.debug("Evaluating SubjectConfirmationData at Address of : {}", address);
 
-        InetAddress[] confirmingAddresses;
+        final InetAddress[] confirmingAddresses;
         try {
             confirmingAddresses = InetAddress.getAllByName(address);
         } catch (final UnknownHostException e) {
@@ -262,7 +262,7 @@ public abstract class AbstractSubjectConfirmationValidator implements SubjectCon
                     Arrays.asList(confirmingAddresses));
         }
 
-        Set<InetAddress> validAddresses;
+        final Set<InetAddress> validAddresses;
         try {
             validAddresses = (Set<InetAddress>) context.getStaticParameters().get(
                     SAML2AssertionValidationParameters.SC_VALID_ADDRESSES);
@@ -279,7 +279,7 @@ public abstract class AbstractSubjectConfirmationValidator implements SubjectCon
             return ValidationResult.INDETERMINATE;
         }
 
-        for (InetAddress confirmingAddress : confirmingAddresses) {
+        for (final InetAddress confirmingAddress : confirmingAddresses) {
             if (validAddresses.contains(confirmingAddress)) {
                 log.debug("Matched SubjectConfirmationData address '{}' to valid address",
                         confirmingAddress.getHostAddress());
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 f9eb9c8..aab4cdb 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
@@ -81,7 +81,7 @@ public class AudienceRestrictionConditionValidator implements ConditionValidator
             return ValidationResult.INDETERMINATE;
         }
         
-        Set<String> validAudiences;
+        final Set<String> validAudiences;
         try {
             validAudiences = (Set<String>) context.getStaticParameters().get(
                     SAML2AssertionValidationParameters.COND_VALID_AUDIENCES);
@@ -101,8 +101,8 @@ public class AudienceRestrictionConditionValidator implements ConditionValidator
                 + "against the list of valid audiences: {}",
                 validAudiences.toString());
 
-        AudienceRestriction audienceRestriction = (AudienceRestriction) condition;
-        List<Audience> audiences = audienceRestriction.getAudiences();
+        final AudienceRestriction audienceRestriction = (AudienceRestriction) condition;
+        final List<Audience> audiences = audienceRestriction.getAudiences();
         if (audiences == null || audiences.isEmpty()) {
             context.setValidationFailureMessage(String.format(
                     "'%s' condition in assertion '%s' is malformed as it does not contain any audiences",
@@ -110,15 +110,15 @@ public class AudienceRestrictionConditionValidator implements ConditionValidator
             return ValidationResult.INVALID;
         }
 
-        for (Audience audience : audiences) {
-            String audienceURI = StringSupport.trimOrNull(audience.getAudienceURI());
+        for (final Audience audience : audiences) {
+            final String audienceURI = StringSupport.trimOrNull(audience.getAudienceURI());
             if (validAudiences.contains(audienceURI)) {
                 log.debug("Matched valid audience: {}", audienceURI);
                 return ValidationResult.VALID;
             }
         }
 
-        String msg = String.format(
+        final String msg = String.format(
                 "None of the audiences within Assertion '%s' matched the list of valid audiances", assertion.getID());
         log.debug(msg);
         context.setValidationFailureMessage(msg);
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 886892d..c6a37b0 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
@@ -122,16 +122,16 @@ public class HolderOfKeySubjectConfirmationValidator extends AbstractSubjectConf
         
         log.debug("Attempting holder-of-key subject confirmation");
         if (!isValidConfirmationDataType(confirmation)) {
-            String msg = String.format(
+            final String msg = String.format(
                     "Subject confirmation data is not of type '%s'", KeyInfoConfirmationDataType.TYPE_NAME);
             log.debug(msg);
             context.setValidationFailureMessage(msg);
             return ValidationResult.INVALID;
         }
 
-        List<KeyInfo> possibleKeys = getSubjectConfirmationKeyInformation(confirmation, assertion, context);
+        final List<KeyInfo> possibleKeys = getSubjectConfirmationKeyInformation(confirmation, assertion, context);
         if (possibleKeys.isEmpty()) {
-            String msg = String.format(
+            final String msg = String.format(
                     "No key information for holder of key subject confirmation in assertion '%s'", assertion.getID());
             log.debug(msg);
             context.setValidationFailureMessage(msg);
@@ -153,7 +153,7 @@ public class HolderOfKeySubjectConfirmationValidator extends AbstractSubjectConf
             return ValidationResult.INDETERMINATE;
         }
 
-        for (KeyInfo keyInfo : possibleKeys) {
+        for (final KeyInfo keyInfo : possibleKeys) {
             if (matchesKeyValue(keyCertPair.getFirst(), keyInfo)) {
                 log.debug("Successfully matched public key in subject confirmation data to supplied key param");
                 context.getDynamicParameters().put(SAML2AssertionValidationParameters.SC_HOK_CONFIRMED_KEYINFO,
@@ -182,7 +182,7 @@ public class HolderOfKeySubjectConfirmationValidator extends AbstractSubjectConf
      */
     protected boolean isValidConfirmationDataType(@Nonnull final SubjectConfirmation confirmation) 
             throws AssertionValidationException {
-        QName confirmationDataSchemaType = confirmation.getSubjectConfirmationData().getSchemaType();
+        final QName confirmationDataSchemaType = confirmation.getSubjectConfirmationData().getSchemaType();
         if (confirmationDataSchemaType != null
                 && !confirmationDataSchemaType.equals(KeyInfoConfirmationDataType.TYPE_NAME)) {
             log.debug("SubjectConfirmationData xsi:type was non-null and did not match {}",
@@ -257,10 +257,10 @@ public class HolderOfKeySubjectConfirmationValidator extends AbstractSubjectConf
             @Nonnull final SubjectConfirmation confirmation, @Nonnull final Assertion assertion, 
             @Nonnull final ValidationContext context) throws AssertionValidationException {
         
-        SubjectConfirmationData confirmationData = confirmation.getSubjectConfirmationData();
+        final SubjectConfirmationData confirmationData = confirmation.getSubjectConfirmationData();
 
-        List<KeyInfo> keyInfos = new LazyList<>();
-        for (XMLObject object : confirmationData.getUnknownXMLObjects(KeyInfo.DEFAULT_ELEMENT_NAME)) {
+        final List<KeyInfo> keyInfos = new LazyList<>();
+        for (final XMLObject object : confirmationData.getUnknownXMLObjects(KeyInfo.DEFAULT_ELEMENT_NAME)) {
             if (object != null) {
                 keyInfos.add((KeyInfo) object);
             }
@@ -334,9 +334,9 @@ public class HolderOfKeySubjectConfirmationValidator extends AbstractSubjectConf
         
         log.debug("Attempting to match KeyInfo KeyValue to supplied PublicKey param of type: {}", key.getAlgorithm());
         
-        for (KeyValue keyValue : keyValues) {
+        for (final KeyValue keyValue : keyValues) {
             try {
-                PublicKey kiPublicKey = KeyInfoSupport.getKey(keyValue);
+                final PublicKey kiPublicKey = KeyInfoSupport.getKey(keyValue);
                 if (Objects.equals(key, kiPublicKey)) {
                     log.debug("Matched KeyValue PublicKey");
                     return true;
@@ -377,9 +377,9 @@ public class HolderOfKeySubjectConfirmationValidator extends AbstractSubjectConf
         log.debug("Attempting to match KeyInfo DEREncodedKeyValue to supplied PublicKey param of type: {}", 
                 key.getAlgorithm());
         
-        for (DEREncodedKeyValue derEncodedKeyValue : derEncodedKeyValues) {
+        for (final DEREncodedKeyValue derEncodedKeyValue : derEncodedKeyValues) {
             try {
-                PublicKey kiPublicKey = KeyInfoSupport.getKey(derEncodedKeyValue);
+                final PublicKey kiPublicKey = KeyInfoSupport.getKey(derEncodedKeyValue);
                 if (Objects.equals(key, kiPublicKey)) {
                     log.debug("Matched DEREncodedKeyValue PublicKey");
                     return true;
@@ -418,7 +418,7 @@ public class HolderOfKeySubjectConfirmationValidator extends AbstractSubjectConf
             return false;
         }
 
-        List<X509Data> x509Datas = keyInfo.getX509Datas();
+        final List<X509Data> x509Datas = keyInfo.getX509Datas();
         if (x509Datas == null || x509Datas.isEmpty()) {
             log.debug("KeyInfo contained no X509Data children, skipping certificate match");
             return false;
@@ -427,16 +427,16 @@ public class HolderOfKeySubjectConfirmationValidator extends AbstractSubjectConf
         log.debug("Attempting to match KeyInfo X509Data to supplied X509Certificate param");
 
         List<org.opensaml.xmlsec.signature.X509Certificate> xmlCertificates;
-        for (X509Data data : x509Datas) {
+        for (final X509Data data : x509Datas) {
             xmlCertificates = data.getX509Certificates();
             if (xmlCertificates == null || xmlCertificates.isEmpty()) {
                 log.debug("X509Data contained no X509Certificate children, skipping certificate match");
                 continue;
             }
 
-            for (org.opensaml.xmlsec.signature.X509Certificate xmlCertificate : xmlCertificates) {
+            for (final org.opensaml.xmlsec.signature.X509Certificate xmlCertificate : xmlCertificates) {
                 try {
-                    X509Certificate kiCert = KeyInfoSupport.getCertificate(xmlCertificate);
+                    final X509Certificate kiCert = KeyInfoSupport.getCertificate(xmlCertificate);
                     if (Objects.equals(cert, kiCert)) {
                         log.debug("Matched X509Certificate");
                         return true;
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 b56056d..6bd362e 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
@@ -169,7 +169,7 @@ public class OneTimeUseConditionValidator implements ConditionValidator {
              
         log.debug("Effective one-time use cache expires of: {}", expires);
         
-        long computedExpiration = System.currentTimeMillis() + expires;
+        final long computedExpiration = System.currentTimeMillis() + expires;
         log.debug("Computed one-time use cache effective expiration time of: {}", computedExpiration);
         return computedExpiration;
     }
@@ -197,7 +197,7 @@ public class OneTimeUseConditionValidator implements ConditionValidator {
             id = "NoID";
         }
         
-        String value = String.format("%s--%s", issuer, id);
+        final String value = String.format("%s--%s", issuer, id);
         log.debug("Generated one-time use cache value of: {}", value);
         return value;
     }
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 5785940..75d58ea 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
@@ -303,10 +303,10 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
     
     /** {@inheritDoc} */
     protected void doDecode() throws MessageDecodingException {
-        MessageContext<SAMLObject> messageContext = new MessageContext<>();
-        HttpServletRequest request = getHttpServletRequest();
+        final MessageContext<SAMLObject> messageContext = new MessageContext<>();
+        final HttpServletRequest request = getHttpServletRequest();
 
-        String relayState = StringSupport.trim(request.getParameter("RelayState"));
+        final String relayState = StringSupport.trim(request.getParameter("RelayState"));
         log.debug("Decoded SAML relay state of: {}", relayState);
         SAMLBindingSupport.setRelayState(messageContext, relayState);
         
@@ -328,23 +328,23 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      */
     private void processArtifact(final MessageContext messageContext, final HttpServletRequest request) 
             throws MessageDecodingException {
-        String encodedArtifact = StringSupport.trimOrNull(request.getParameter("SAMLart"));
+        final String encodedArtifact = StringSupport.trimOrNull(request.getParameter("SAMLart"));
         if (encodedArtifact == null) {
             log.error("URL SAMLart parameter was missing or did not contain a value.");
             throw new MessageDecodingException("URL SAMLart parameter was missing or did not contain a value.");
         }
         
         try {
-            SAML2Artifact artifact = parseArtifact(encodedArtifact);
+            final SAML2Artifact artifact = parseArtifact(encodedArtifact);
             
-            RoleDescriptor peerRoleDescriptor = resolvePeerRoleDescriptor(artifact);
+            final RoleDescriptor peerRoleDescriptor = resolvePeerRoleDescriptor(artifact);
             if (peerRoleDescriptor == null) {
                 throw new MessageDecodingException("Failed to resolve peer RoleDescriptor based on inbound artifact");
             }
 
-            ArtifactResolutionService ars = resolveArtifactEndpoint(artifact, peerRoleDescriptor);
+            final ArtifactResolutionService ars = resolveArtifactEndpoint(artifact, peerRoleDescriptor);
 
-            SAMLObject inboundMessage = dereferenceArtifact(artifact, peerRoleDescriptor, ars);
+            final SAMLObject inboundMessage = dereferenceArtifact(artifact, peerRoleDescriptor, ars);
 
             messageContext.setMessage(inboundMessage);
         } catch (final MessageDecodingException e) {
@@ -363,7 +363,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
     private SAMLObject dereferenceArtifact(final SAML2Artifact artifact, final RoleDescriptor peerRoleDescriptor, final ArtifactResolutionService ars) 
             throws MessageDecodingException {
         
-        MessageContext<SAMLObject> outbound = new MessageContext<>();
+        final MessageContext<SAMLObject> outbound = new MessageContext<>();
         outbound.setMessage(buildArtifactResolveRequestMessage(artifact, ars.getLocation(), peerRoleDescriptor));
         //TODO more population of context
         //  - signing params
@@ -372,7 +372,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
         //TODO what components needed to support signing and client TLS, and how do we get them?
         //TODO probably support optional static injected creds and params, as well as injected resolution strategies
         
-        InOutOperationContext<SAMLObject, SAMLObject> opContext = new InOutOperationContext<>(null, outbound);
+        final InOutOperationContext<SAMLObject, SAMLObject> opContext = new InOutOperationContext<>(null, outbound);
         
         try {
             log.trace("Executing ArtifactResolve over SOAP 1.1 binding to endpoint: {}", ars.getLocation());
@@ -390,10 +390,10 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      * @return
      */
     private ArtifactResolve buildArtifactResolveRequestMessage(final SAML2Artifact artifact, final String endpoint, final RoleDescriptor peerRoleDescriptor) {
-        ArtifactResolve request = 
+        final ArtifactResolve request = 
                 (ArtifactResolve) XMLObjectSupport.buildXMLObject(ArtifactResolve.DEFAULT_ELEMENT_NAME);
         
-        Artifact requestArtifact = (Artifact) XMLObjectSupport.buildXMLObject(Artifact.DEFAULT_ELEMENT_NAME);
+        final Artifact requestArtifact = (Artifact) XMLObjectSupport.buildXMLObject(Artifact.DEFAULT_ELEMENT_NAME);
         requestArtifact.setArtifact(Base64Support.encode(artifact.getArtifactBytes(), false));
         request.setArtifact(requestArtifact);
         
@@ -410,7 +410,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      * @return
      */
     private Issuer buildIssuer(final RoleDescriptor peerRoleDescriptor) {
-        Issuer issuer = (Issuer) XMLObjectSupport.buildXMLObject(Issuer.DEFAULT_ELEMENT_NAME);
+        final 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
         //issuer.setValue("TODO");
@@ -423,9 +423,9 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      * @return
      */
     private ArtifactResolutionService resolveArtifactEndpoint(final SAML2Artifact artifact, final RoleDescriptor peerRoleDescriptor) throws MessageDecodingException {
-        RoleDescriptorCriterion roleDescriptorCriterion = new RoleDescriptorCriterion(peerRoleDescriptor);
+        final RoleDescriptorCriterion roleDescriptorCriterion = new RoleDescriptorCriterion(peerRoleDescriptor);
 
-        ArtifactResolutionService arsTemplate = 
+        final ArtifactResolutionService arsTemplate = 
                 (ArtifactResolutionService) XMLObjectSupport.buildXMLObject(
                         ArtifactResolutionService.DEFAULT_ELEMENT_NAME);
         
@@ -435,16 +435,16 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
             arsTemplate.setLocation(((SAMLSourceLocationArtifact)artifact).getSourceLocation());
         }
         
-        Integer endpointIndex = SAMLBindingSupport.convertSAML2ArtifactEndpointIndex(artifact.getEndpointIndex());
+        final Integer endpointIndex = SAMLBindingSupport.convertSAML2ArtifactEndpointIndex(artifact.getEndpointIndex());
         arsTemplate.setIndex(endpointIndex);
         
-        EndpointCriterion<ArtifactResolutionService> endpointCriterion = 
+        final EndpointCriterion<ArtifactResolutionService> endpointCriterion = 
                 new EndpointCriterion<>(arsTemplate, false);
 
-        CriteriaSet criteriaSet = new CriteriaSet(roleDescriptorCriterion, endpointCriterion);
+        final CriteriaSet criteriaSet = new CriteriaSet(roleDescriptorCriterion, endpointCriterion);
 
         try {
-            ArtifactResolutionService ars = artifactEndpointResolver.resolveSingle(criteriaSet);
+            final ArtifactResolutionService ars = artifactEndpointResolver.resolveSingle(criteriaSet);
             if (ars != null) {
                 return ars;
             } else {
@@ -461,7 +461,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      */
     private RoleDescriptor resolvePeerRoleDescriptor(final SAML2Artifact artifact) throws MessageDecodingException {
 
-        CriteriaSet criteriaSet = new CriteriaSet(
+        final CriteriaSet criteriaSet = new CriteriaSet(
                 new ArtifactCriterion(artifact),
                 new ProtocolCriterion(SAMLConstants.SAML20P_NS),
                 new EntityRoleCriterion(getPeerEntityRole()));
@@ -486,7 +486,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      * @param messageContext the current message context
      */
     protected void populateBindingContext(final MessageContext<SAMLObject> messageContext) {
-        SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
+        final SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
         bindingContext.setBindingUri(getBindingURI());
         bindingContext.setBindingDescriptor(bindingDescriptor);
         bindingContext.setHasBindingSignature(false);
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 38c003c..748ae97 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
@@ -75,19 +75,19 @@ public class HTTPPostDecoder extends BaseHttpServletRequestXMLMessageDecoder<SAM
 
     /** {@inheritDoc} */
     protected void doDecode() throws MessageDecodingException {
-        MessageContext<SAMLObject> messageContext = new MessageContext<>();
-        HttpServletRequest request = getHttpServletRequest();
+        final MessageContext<SAMLObject> messageContext = new MessageContext<>();
+        final HttpServletRequest request = getHttpServletRequest();
 
         if (!"POST".equalsIgnoreCase(request.getMethod())) {
             throw new MessageDecodingException("This message decoder only supports the HTTP POST method");
         }
 
-        String relayState = request.getParameter("RelayState");
+        final String relayState = request.getParameter("RelayState");
         log.debug("Decoded SAML relay state of: {}", relayState);
         SAMLBindingSupport.setRelayState(messageContext, relayState);
 
-        InputStream base64DecodedMessage = getBase64DecodedMessage(request);
-        SAMLObject inboundMessage = (SAMLObject) unmarshallMessage(base64DecodedMessage);
+        final InputStream base64DecodedMessage = getBase64DecodedMessage(request);
+        final SAMLObject inboundMessage = (SAMLObject) unmarshallMessage(base64DecodedMessage);
         messageContext.setMessage(inboundMessage);
         log.debug("Decoded SAML message");
 
@@ -119,7 +119,7 @@ public class HTTPPostDecoder extends BaseHttpServletRequestXMLMessageDecoder<SAM
         }
 
         log.trace("Base64 decoding SAML message:\n{}", encodedMessage);
-        byte[] decodedBytes = Base64Support.decode(encodedMessage);
+        final byte[] decodedBytes = Base64Support.decode(encodedMessage);
         if(decodedBytes == null){
             log.error("Unable to Base64 decode SAML message");
             throw new MessageDecodingException("Unable to Base64 decode SAML message");
@@ -135,7 +135,7 @@ public class HTTPPostDecoder extends BaseHttpServletRequestXMLMessageDecoder<SAM
      * @param messageContext the current message context
      */
     protected void populateBindingContext(final MessageContext<SAMLObject> messageContext) {
-        SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
+        final SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
         bindingContext.setBindingUri(getBindingURI());
         bindingContext.setBindingDescriptor(bindingDescriptor);
         bindingContext.setHasBindingSignature(false);
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 08c3bac..54d11fe 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
@@ -43,7 +43,7 @@ public class HTTPPostSimpleSignDecoder extends HTTPPostDecoder {
      * @param messageContext the current message context
      */
     protected void populateBindingContext(final MessageContext<SAMLObject> messageContext) {
-        SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
+        final SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
         bindingContext.setBindingUri(getBindingURI());
         bindingContext.setBindingDescriptor(getBindingDescriptor());
         bindingContext.setHasBindingSignature(
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 f393848..4d68159 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
@@ -83,23 +83,23 @@ public class HTTPRedirectDeflateDecoder extends BaseHttpServletRequestXMLMessage
 
     /** {@inheritDoc} */
     protected void doDecode() throws MessageDecodingException {
-        MessageContext<SAMLObject> messageContext = new MessageContext<>();
-        HttpServletRequest request = getHttpServletRequest();
+        final MessageContext<SAMLObject> messageContext = new MessageContext<>();
+        final HttpServletRequest request = getHttpServletRequest();
         
         if (!"GET".equalsIgnoreCase(request.getMethod())) {
             throw new MessageDecodingException("This message decoder only supports the HTTP GET method");
         }
         
-        String samlEncoding = StringSupport.trimOrNull(request.getParameter("SAMLEncoding"));
+        final String samlEncoding = StringSupport.trimOrNull(request.getParameter("SAMLEncoding"));
         if (samlEncoding != null && !SAMLConstants.SAML2_BINDING_URL_ENCODING_DEFLATE_URI.equals(samlEncoding)) {
             throw new MessageDecodingException("Request indicated an unsupported SAMLEncoding: " + samlEncoding);
         }
 
-        String relayState = request.getParameter("RelayState");
+        final String relayState = request.getParameter("RelayState");
         log.debug("Decoded RelayState: {}", relayState);
         SAMLBindingSupport.setRelayState(messageContext, relayState);
 
-        InputStream samlMessageIns;
+        final InputStream samlMessageIns;
         if (!Strings.isNullOrEmpty(request.getParameter("SAMLRequest"))) {
             samlMessageIns = decodeMessage(request.getParameter("SAMLRequest"));
         } else if (!Strings.isNullOrEmpty(request.getParameter("SAMLResponse"))) {
@@ -109,7 +109,7 @@ public class HTTPRedirectDeflateDecoder extends BaseHttpServletRequestXMLMessage
                     "No SAMLRequest or SAMLResponse query path parameter, invalid SAML 2 HTTP Redirect message");
         }
 
-        SAMLObject samlMessage = (SAMLObject) unmarshallMessage(samlMessageIns);
+        final SAMLObject samlMessage = (SAMLObject) unmarshallMessage(samlMessageIns);
         messageContext.setMessage(samlMessage);
         log.debug("Decoded SAML message");
 
@@ -130,15 +130,15 @@ public class HTTPRedirectDeflateDecoder extends BaseHttpServletRequestXMLMessage
     protected InputStream decodeMessage(final String message) throws MessageDecodingException {
         log.debug("Base64 decoding and inflating SAML message");
 
-        byte[] decodedBytes = Base64Support.decode(message);
+        final byte[] decodedBytes = Base64Support.decode(message);
         if(decodedBytes == null){
             log.error("Unable to Base64 decode incoming message");
             throw new MessageDecodingException("Unable to Base64 decode incoming message");
         }
         
         try {
-            ByteArrayInputStream bytesIn = new ByteArrayInputStream(decodedBytes);
-            InflaterInputStream inflater = new InflaterInputStream(bytesIn, new Inflater(true));
+            final ByteArrayInputStream bytesIn = new ByteArrayInputStream(decodedBytes);
+            final InflaterInputStream inflater = new InflaterInputStream(bytesIn, new Inflater(true));
             return inflater;
         } catch (final Exception e) {
             log.error("Unable to Base64 decode and inflate SAML message", e);
@@ -152,7 +152,7 @@ public class HTTPRedirectDeflateDecoder extends BaseHttpServletRequestXMLMessage
      * @param messageContext the current message context
      */
     protected void populateBindingContext(final MessageContext<SAMLObject> messageContext) {
-        SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
+        final SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
         bindingContext.setBindingUri(getBindingURI());
         bindingContext.setBindingDescriptor(bindingDescriptor);
         bindingContext.setHasBindingSignature(
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 ca9b99e..f421a9c 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
@@ -81,7 +81,7 @@ public class HTTPSOAP11Decoder extends org.opensaml.soap.soap11.decoder.http.imp
         
         populateBindingContext(getMessageContext());
         
-        SAMLObject samlMessage = getMessageContext().getMessage();
+        final SAMLObject samlMessage = getMessageContext().getMessage();
         log.debug("Decoded SOAP messaged which included SAML message of type {}", samlMessage.getElementQName());
     }
     
@@ -91,7 +91,7 @@ public class HTTPSOAP11Decoder extends org.opensaml.soap.soap11.decoder.http.imp
      * @param messageContext the current message context
      */
     protected void populateBindingContext(final MessageContext<SAMLObject> messageContext) {
-        SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
+        final SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
         bindingContext.setBindingUri(getBindingURI());
         bindingContext.setBindingDescriptor(bindingDescriptor);
         bindingContext.setHasBindingSignature(false);
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 66d9311..07359be 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
@@ -82,7 +82,7 @@ public class HttpClientResponseSOAP11Decoder
         
         populateBindingContext(getMessageContext());
         
-        SAMLObject samlMessage = getMessageContext().getMessage();
+        final SAMLObject samlMessage = getMessageContext().getMessage();
         log.debug("Decoded SOAP messaged which included SAML message of type {}", samlMessage.getElementQName());
     }
     
@@ -92,7 +92,7 @@ public class HttpClientResponseSOAP11Decoder
      * @param messageContext the current message context
      */
     protected void populateBindingContext(final MessageContext<SAMLObject> messageContext) {
-        SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
+        final SAMLBindingContext bindingContext = messageContext.getSubcontext(SAMLBindingContext.class, true);
         bindingContext.setBindingUri(getBindingURI());
         bindingContext.setBindingDescriptor(bindingDescriptor);
         bindingContext.setHasBindingSignature(false);
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 81cfb3b..3b6e80c 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
@@ -134,14 +134,14 @@ public class HTTPPostEncoder extends BaseSAML2MessageEncoder {
 
     /** {@inheritDoc} */
     protected void doEncode() throws MessageEncodingException {
-        MessageContext<SAMLObject> messageContext = getMessageContext();
+        final MessageContext<SAMLObject> messageContext = getMessageContext();
 
-        SAMLObject outboundMessage = messageContext.getMessage();
+        final SAMLObject outboundMessage = messageContext.getMessage();
         if (outboundMessage == null) {
             throw new MessageEncodingException("No outbound SAML message contained in message context");
         }
         
-        String endpointURL = getEndpointURL(messageContext).toString();
+        final String endpointURL = getEndpointURL(messageContext).toString();
 
         postEncode(messageContext, endpointURL);
     }
@@ -158,17 +158,17 @@ public class HTTPPostEncoder extends BaseSAML2MessageEncoder {
             throws MessageEncodingException {
         log.debug("Invoking Velocity template to create POST body");
         try {
-            VelocityContext context = new VelocityContext();
+            final VelocityContext context = new VelocityContext();
 
             populateVelocityContext(context, messageContext, endpointURL);
 
-            HttpServletResponse response = getHttpServletResponse();
+            final HttpServletResponse response = getHttpServletResponse();
             
             HttpServletSupport.addNoCacheHeaders(response);
             HttpServletSupport.setUTF8Encoding(response);
             HttpServletSupport.setContentType(response, "text/html");
             
-            Writer out = new OutputStreamWriter(response.getOutputStream(), "UTF-8");
+            final Writer out = new OutputStreamWriter(response.getOutputStream(), "UTF-8");
             velocityEngine.mergeTemplate(velocityTemplateId, "UTF-8", context, out);
             out.flush();
         } catch (final Exception e) {
@@ -188,19 +188,19 @@ public class HTTPPostEncoder extends BaseSAML2MessageEncoder {
     protected void populateVelocityContext(final VelocityContext velocityContext, final MessageContext<SAMLObject> messageContext,
             final String endpointURL) throws MessageEncodingException {
 
-        String encodedEndpointURL = HTMLEncoder.encodeForHTMLAttribute(endpointURL);
+        final String encodedEndpointURL = HTMLEncoder.encodeForHTMLAttribute(endpointURL);
         log.debug("Encoding action url of '{}' with encoded value '{}'", endpointURL, encodedEndpointURL);
         velocityContext.put("action", encodedEndpointURL);
         velocityContext.put("binding", getBindingURI());
         
-        SAMLObject outboundMessage = messageContext.getMessage();
+        final SAMLObject outboundMessage = messageContext.getMessage();
         
         log.debug("Marshalling and Base64 encoding SAML message");
-        Element domMessage = marshallMessage(outboundMessage);
+        final Element domMessage = marshallMessage(outboundMessage);
         
         try {
-            String messageXML = SerializeSupport.nodeToString(domMessage);
-            String encodedMessage = Base64Support.encode(messageXML.getBytes("UTF-8"), Base64Support.UNCHUNKED);
+            final String messageXML = SerializeSupport.nodeToString(domMessage);
+            final String encodedMessage = Base64Support.encode(messageXML.getBytes("UTF-8"), Base64Support.UNCHUNKED);
             if (outboundMessage instanceof RequestAbstractType) {
                 velocityContext.put("SAMLRequest", encodedMessage);
             } else if (outboundMessage instanceof StatusResponseType) {
@@ -214,9 +214,9 @@ public class HTTPPostEncoder extends BaseSAML2MessageEncoder {
             throw new MessageEncodingException("Unable to encode message, UTF-8 encoding is not supported");
         }
 
-        String relayState = SAMLBindingSupport.getRelayState(messageContext);
+        final String relayState = SAMLBindingSupport.getRelayState(messageContext);
         if (SAMLBindingSupport.checkRelayState(relayState)) {
-            String encodedRelayState = HTMLEncoder.encodeForHTMLAttribute(relayState);
+            final String encodedRelayState = HTMLEncoder.encodeForHTMLAttribute(relayState);
             log.debug("Setting RelayState parameter to: '{}', encoded as '{}'", relayState, encodedRelayState);
             velocityContext.put("RelayState", encodedRelayState);
         }
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 3d19ec6..db119e4 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
@@ -71,7 +71,7 @@ public class HTTPPostSimpleSignEncoder extends HTTPPostEncoder {
 
         super.populateVelocityContext(velocityContext, messageContext, endpointURL);
 
-        SignatureSigningParameters signingParameters = 
+        final SignatureSigningParameters signingParameters = 
                 SAMLMessageSecuritySupport.getContextSigningParameters(messageContext);
         
         if (signingParameters == null || signingParameters.getSigningCredential() == null) {
@@ -79,17 +79,17 @@ public class HTTPPostSimpleSignEncoder extends HTTPPostEncoder {
             return;
         }
 
-        String sigAlgURI = getSignatureAlgorithmURI(signingParameters);
+        final String sigAlgURI = getSignatureAlgorithmURI(signingParameters);
         velocityContext.put("SigAlg", sigAlgURI);
 
-        String formControlData = buildFormDataToSign(velocityContext, messageContext, sigAlgURI);
+        final String formControlData = buildFormDataToSign(velocityContext, messageContext, sigAlgURI);
         velocityContext.put("Signature", generateSignature(signingParameters.getSigningCredential(), 
                 sigAlgURI, formControlData));
 
         
-        KeyInfoGenerator kiGenerator = signingParameters.getKeyInfoGenerator();
+        final KeyInfoGenerator kiGenerator = signingParameters.getKeyInfoGenerator();
         if (kiGenerator != null) {
-            String kiBase64 = buildKeyInfo(signingParameters.getSigningCredential(), kiGenerator);
+            final String kiBase64 = buildKeyInfo(signingParameters.getSigningCredential(), kiGenerator);
             if (!Strings.isNullOrEmpty(kiBase64)) {
                 velocityContext.put("KeyInfo", kiBase64);
             }
@@ -108,15 +108,15 @@ public class HTTPPostSimpleSignEncoder extends HTTPPostEncoder {
             throws MessageEncodingException {
 
         try {
-            KeyInfo keyInfo = kiGenerator.generate(signingCredential);
+            final KeyInfo keyInfo = kiGenerator.generate(signingCredential);
             if (keyInfo != null) {
-                Marshaller marshaller = XMLObjectProviderRegistrySupport.getMarshallerFactory().getMarshaller(keyInfo);
+                final Marshaller marshaller = XMLObjectProviderRegistrySupport.getMarshallerFactory().getMarshaller(keyInfo);
                 if (marshaller == null) {
                     log.error("No KeyInfo marshaller available from configuration");
                     throw new MessageEncodingException("No KeyInfo marshaller was configured");
                 }
-                String kiXML = SerializeSupport.nodeToString(marshaller.marshall(keyInfo));
-                String kiBase64 = Base64Support.encode(kiXML.getBytes(), Base64Support.UNCHUNKED);
+                final String kiXML = SerializeSupport.nodeToString(marshaller.marshall(keyInfo));
+                final String kiBase64 = Base64Support.encode(kiXML.getBytes(), Base64Support.UNCHUNKED);
                 return kiBase64;
             } else {
                 return null;
@@ -142,14 +142,14 @@ public class HTTPPostSimpleSignEncoder extends HTTPPostEncoder {
      */
     protected String buildFormDataToSign(final VelocityContext velocityContext, final MessageContext<SAMLObject> messageContext,
             final String sigAlgURI) {
-        StringBuilder builder = new StringBuilder();
+        final StringBuilder builder = new StringBuilder();
 
         boolean isRequest = false;
         if (velocityContext.get("SAMLRequest") != null) {
             isRequest = true;
         }
 
-        String msgB64;
+        final String msgB64;
         if (isRequest) {
             msgB64 = (String) velocityContext.get("SAMLRequest");
         } else {
@@ -169,7 +169,7 @@ public class HTTPPostSimpleSignEncoder extends HTTPPostEncoder {
             builder.append("SAMLResponse=" + msg);
         }
 
-        String relayState = SAMLBindingSupport.getRelayState(messageContext);
+        final String relayState = SAMLBindingSupport.getRelayState(messageContext);
         if (relayState != null) {
             builder.append("&RelayState=" + relayState);
         }
@@ -219,7 +219,7 @@ public class HTTPPostSimpleSignEncoder extends HTTPPostEncoder {
 
         String b64Signature = null;
         try {
-            byte[] rawSignature =
+            final byte[] rawSignature =
                     XMLSigningUtil.signWithURI(signingCredential, algorithmURI, formData.getBytes("UTF-8"));
             b64Signature = Base64Support.encode(rawSignature, Base64Support.UNCHUNKED);
             log.debug("Generated digital signature value (base64-encoded) {}", b64Signature);
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 41fc86d..54c2889 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
@@ -72,18 +72,18 @@ public class HTTPRedirectDeflateEncoder extends BaseSAML2MessageEncoder {
 
     /** {@inheritDoc} */
     protected void doEncode() throws MessageEncodingException {
-        MessageContext<SAMLObject> messageContext = getMessageContext();
-        SAMLObject outboundMessage = messageContext.getMessage();
+        final MessageContext<SAMLObject> messageContext = getMessageContext();
+        final SAMLObject outboundMessage = messageContext.getMessage();
 
-        String endpointURL = getEndpointURL(messageContext).toString();
+        final String endpointURL = getEndpointURL(messageContext).toString();
 
         removeSignature(outboundMessage);
 
-        String encodedMessage = deflateAndBase64Encode(outboundMessage);
+        final String encodedMessage = deflateAndBase64Encode(outboundMessage);
 
-        String redirectURL = buildRedirectURL(messageContext, endpointURL, encodedMessage);
+        final String redirectURL = buildRedirectURL(messageContext, endpointURL, encodedMessage);
 
-        HttpServletResponse response = getHttpServletResponse();
+        final HttpServletResponse response = getHttpServletResponse();
         HttpServletSupport.addNoCacheHeaders(response);
         HttpServletSupport.setUTF8Encoding(response);
 
@@ -101,7 +101,7 @@ public class HTTPRedirectDeflateEncoder extends BaseSAML2MessageEncoder {
      */
     protected void removeSignature(final SAMLObject message) {
         if (message instanceof SignableSAMLObject) {
-            SignableSAMLObject signableMessage = (SignableSAMLObject) message;
+            final SignableSAMLObject signableMessage = (SignableSAMLObject) message;
             if (signableMessage.isSigned()) {
                 log.debug("Removing SAML protocol message signature");
                 signableMessage.setSignature(null);
@@ -121,11 +121,11 @@ public class HTTPRedirectDeflateEncoder extends BaseSAML2MessageEncoder {
     protected String deflateAndBase64Encode(final SAMLObject message) throws MessageEncodingException {
         log.debug("Deflating and Base64 encoding SAML message");
         try {
-            String messageStr = SerializeSupport.nodeToString(marshallMessage(message));
+            final String messageStr = SerializeSupport.nodeToString(marshallMessage(message));
 
-            ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
-            Deflater deflater = new Deflater(Deflater.DEFLATED, true);
-            DeflaterOutputStream deflaterStream = new DeflaterOutputStream(bytesOut, deflater);
+            final ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
+            final Deflater deflater = new Deflater(Deflater.DEFLATED, true);
+            final DeflaterOutputStream deflaterStream = new DeflaterOutputStream(bytesOut, deflater);
             deflaterStream.write(messageStr.getBytes("UTF-8"));
             deflaterStream.finish();
 
@@ -157,10 +157,10 @@ public class HTTPRedirectDeflateEncoder extends BaseSAML2MessageEncoder {
             throw new MessageEncodingException("Endpoint URL " + endpoint + " is not a valid URL", e);
         }
 
-        List<Pair<String, String>> queryParams = urlBuilder.getQueryParams();
+        final List<Pair<String, String>> queryParams = urlBuilder.getQueryParams();
         queryParams.clear();
         
-        SAMLObject outboundMessage = messageContext.getMessage();
+        final SAMLObject outboundMessage = messageContext.getMessage();
 
         if (outboundMessage instanceof RequestAbstractType) {
             queryParams.add(new Pair<>("SAMLRequest", message));
@@ -171,18 +171,18 @@ public class HTTPRedirectDeflateEncoder extends BaseSAML2MessageEncoder {
                     "SAML message is neither a SAML RequestAbstractType or StatusResponseType");
         }
 
-        String relayState = SAMLBindingSupport.getRelayState(messageContext);
+        final String relayState = SAMLBindingSupport.getRelayState(messageContext);
         if (SAMLBindingSupport.checkRelayState(relayState)) {
             queryParams.add(new Pair<>("RelayState", relayState));
         }
 
-        SignatureSigningParameters signingParameters = 
+        final SignatureSigningParameters signingParameters = 
                 SAMLMessageSecuritySupport.getContextSigningParameters(messageContext);
         if (signingParameters != null && signingParameters.getSigningCredential() != null) {
-            String sigAlgURI =  getSignatureAlgorithmURI(signingParameters);
-            Pair<String, String> sigAlg = new Pair<>("SigAlg", sigAlgURI);
+            final String sigAlgURI =  getSignatureAlgorithmURI(signingParameters);
+            final Pair<String, String> sigAlg = new Pair<>("SigAlg", sigAlgURI);
             queryParams.add(sigAlg);
-            String sigMaterial = urlBuilder.buildQueryString();
+            final String sigMaterial = urlBuilder.buildQueryString();
 
             queryParams.add(new Pair<>("Signature", generateSignature(
                     signingParameters.getSigningCredential(), sigAlgURI, sigMaterial)));
@@ -232,7 +232,7 @@ public class HTTPRedirectDeflateEncoder extends BaseSAML2MessageEncoder {
 
         String b64Signature = null;
         try {
-            byte[] rawSignature =
+            final byte[] rawSignature =
                     XMLSigningUtil.signWithURI(signingCredential, algorithmURI, queryString.getBytes("UTF-8"));
             b64Signature = Base64Support.encode(rawSignature, Base64Support.UNCHUNKED);
             log.debug("Generated digital signature value (base64-encoded) {}", b64Signature);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/impl/SAML2AuthnRequestsSignedSecurityHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/impl/SAML2AuthnRequestsSignedSecurityHandler.java
index 40c6c55..ed83e68 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/impl/SAML2AuthnRequestsSignedSecurityHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/impl/SAML2AuthnRequestsSignedSecurityHandler.java
@@ -45,20 +45,20 @@ public class SAML2AuthnRequestsSignedSecurityHandler extends AbstractMessageHand
 // Checkstyle: ReturnCount OFF
     /** {@inheritDoc} */
     public void doInvoke(@Nonnull final MessageContext<SAMLObject> messageContext) throws MessageHandlerException {
-        SAMLObject samlMessage = messageContext.getMessage();
+        final SAMLObject samlMessage = messageContext.getMessage();
         if (! (samlMessage instanceof AuthnRequest) ) {
             log.debug("Inbound message is not an instance of AuthnRequest, skipping evaluation...");
             return;
         }
         
-        SAMLPeerEntityContext peerContext = messageContext.getSubcontext(SAMLPeerEntityContext.class, true);
+        final SAMLPeerEntityContext peerContext = messageContext.getSubcontext(SAMLPeerEntityContext.class, true);
         if (peerContext == null || Strings.isNullOrEmpty(peerContext.getEntityId())) {
             log.warn("SAML peer entityID was not available, unable to evaluate rule");
             return;
         }
-        String messageIssuer = peerContext.getEntityId();
+        final String messageIssuer = peerContext.getEntityId();
         
-        SAMLMetadataContext metadataContext = peerContext.getSubcontext(SAMLMetadataContext.class, false);
+        final SAMLMetadataContext metadataContext = peerContext.getSubcontext(SAMLMetadataContext.class, false);
         if (metadataContext == null || metadataContext.getRoleDescriptor() == null) {
             log.warn("SAMLPeerContext did not contain either a SAMLMetadataContext or a RoleDescriptor, " 
                     + "unable to evaluate rule");
@@ -71,7 +71,7 @@ public class SAML2AuthnRequestsSignedSecurityHandler extends AbstractMessageHand
             return;
         }
         
-        SPSSODescriptor spssoRole = (SPSSODescriptor) metadataContext.getRoleDescriptor();
+        final SPSSODescriptor spssoRole = (SPSSODescriptor) metadataContext.getRoleDescriptor();
         
         if (spssoRole.isAuthnRequestsSigned() == Boolean.TRUE) {
             if (! isMessageSigned(messageContext)) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandler.java
index fda9694..917b256 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/impl/SAML2HTTPPostSimpleSignSecurityHandler.java
@@ -127,7 +127,7 @@ public class SAML2HTTPPostSimpleSignSecurityHandler extends BaseSAMLSimpleSignat
         final HttpServletRequest request = getHttpServletRequest();
         
         final StringBuilder builder = new StringBuilder();
-        String samlMsg;
+        final String samlMsg;
         try {
             if (request.getParameter("SAMLRequest") != null) {
                 samlMsg = new String(Base64Support.decode(request.getParameter("SAMLRequest")), "UTF-8");
@@ -149,7 +149,7 @@ public class SAML2HTTPPostSimpleSignSecurityHandler extends BaseSAMLSimpleSignat
 
         builder.append("&SigAlg=" + request.getParameter("SigAlg"));
 
-        String constructed = builder.toString();
+        final String constructed = builder.toString();
         if (Strings.isNullOrEmpty(constructed)) {
             log.warn("Could not construct signed content string from form control data");
             return null;
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 ab964f2..64f2646 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,8 +32,9 @@ import org.w3c.dom.Element;
 public abstract class AbstractNameIDTypeMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        NameIDType nameID = (NameIDType) samlObject;
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement)
+            throws MarshallingException {
+        final NameIDType nameID = (NameIDType) samlObject;
 
         if (nameID.getNameQualifier() != null) {
             domElement.setAttributeNS(null, NameID.NAME_QUALIFIER_ATTRIB_NAME, nameID.getNameQualifier());
@@ -53,8 +54,9 @@ public abstract class AbstractNameIDTypeMarshaller extends AbstractSAMLObjectMar
     }
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        NameIDType nameID = (NameIDType) samlObject;
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
+            throws MarshallingException {
+        final NameIDType nameID = (NameIDType) samlObject;
         ElementSupport.appendTextContent(domElement, nameID.getValue());
     }
 }
\ No newline at end of file
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 e5ecf2d..102e7e3 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,8 +35,9 @@ import org.w3c.dom.Element;
 public class ActionMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        Action action = (Action) samlObject;
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement)
+            throws MarshallingException {
+        final Action action = (Action) samlObject;
 
         if (action.getNamespace() != null) {
             domElement.setAttributeNS(null, Action.NAMEPSACE_ATTRIB_NAME, action.getNamespace());
@@ -44,8 +45,9 @@ public class ActionMarshaller extends AbstractSAMLObjectMarshaller {
     }
 
     /** {@inheritDoc} */
-    protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        Action action = (Action) samlObject;
+    protected void marshallElementContent(final XMLObject samlObject, final Element domElement)
+            throws MarshallingException {
+        final Action action = (Action) samlObject;
         ElementSupport.appendTextContent(domElement, action.getAction());
     }
 }
\ 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 8a11c66..bc32ad5 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
@@ -88,7 +88,7 @@ public class AdviceImpl extends AbstractSAMLObject implements Advice {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.addAll(indexedChildren);
 
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 caf87ef..1d54768 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
@@ -33,7 +33,7 @@ public class AdviceUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
-        Advice advice = (Advice) parentObject;
+        final Advice advice = (Advice) parentObject;
 
         // This is an unbounded choice over several unrelated elements, and the <any> wildcard element.
         advice.getChildren().add(childObject);
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 6041587..0444917 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
@@ -36,7 +36,7 @@ public class ArtifactMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        Artifact artifact = (Artifact) samlObject;
+        final Artifact artifact = (Artifact) samlObject;
 
         if (artifact.getArtifact() != null) {
             ElementSupport.appendTextContent(domElement, artifact.getArtifact());
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 1fd6d14..ebee428 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,8 @@ public class ArtifactResolveBuilder extends AbstractSAMLObjectBuilder<ArtifactRe
     }
 
     /** {@inheritDoc} */
-    public ArtifactResolve buildObject(final String namespaceURI, final String localName, final 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 c8b2138..c14c8bf 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
@@ -60,7 +60,7 @@ public class ArtifactResolveImpl extends RequestAbstractTypeImpl implements Arti
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (super.getOrderedChildren() != null) {
             children.addAll(super.getOrderedChildren());
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 d76baca..42d33a4 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
@@ -34,7 +34,7 @@ public class ArtifactResolveUnmarshaller extends RequestAbstractTypeUnmarshaller
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
-        ArtifactResolve ar = (ArtifactResolve) parentSAMLObject;
+        final ArtifactResolve ar = (ArtifactResolve) parentSAMLObject;
 
         if (childSAMLObject instanceof Artifact) {
             ar.setArtifact((Artifact) childSAMLObject);
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 adecc2f..b0add74 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
@@ -62,7 +62,7 @@ public class ArtifactResponseImpl extends StatusResponseTypeImpl implements Arti
      * {@inheritDoc}
      */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.addAll(super.getOrderedChildren());
         children.add(protocolMessage);
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 ac165b8..160fbbe 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
@@ -38,7 +38,7 @@ public class ArtifactResponseUnmarshaller extends StatusResponseTypeUnmarshaller
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
-        ArtifactResponse artifactResponse = (ArtifactResponse) parentSAMLObject;
+        final ArtifactResponse artifactResponse = (ArtifactResponse) parentSAMLObject;
 
         if (childSAMLObject instanceof Issuer) {
             artifactResponse.setIssuer((Issuer) childSAMLObject);
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 66739b3..4f88115 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
@@ -32,7 +32,7 @@ public class ArtifactUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        Artifact artifact = (Artifact) samlObject;
+        final Artifact artifact = (Artifact) samlObject;
 
         artifact.setArtifact(elementContent);
     }
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 33811e3..68ace36 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
@@ -36,7 +36,7 @@ public class AssertionIDRefMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        AssertionIDRef assertionIDRef = (AssertionIDRef) samlObject;
+        final AssertionIDRef assertionIDRef = (AssertionIDRef) samlObject;
         ElementSupport.appendTextContent(domElement, assertionIDRef.getAssertionID());
     }
 }
\ No newline at end of file
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 12f52b4..5c68c86 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
@@ -32,7 +32,7 @@ public class AssertionIDRefUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        AssertionIDRef assertionIDRef = (AssertionIDRef) samlObject;
+        final AssertionIDRef assertionIDRef = (AssertionIDRef) samlObject;
         assertionIDRef.setAssertionID(elementContent);
     }
 }
\ 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 c3bf519..73e35ce 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
@@ -57,7 +57,7 @@ public class AssertionIDRequestImpl extends RequestAbstractTypeImpl implements A
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (super.getOrderedChildren() != null) {
             children.addAll(super.getOrderedChildren());
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 80b6152..df23f6f 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
@@ -34,7 +34,7 @@ public class AssertionIDRequestUnmarshaller extends RequestAbstractTypeUnmarshal
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
-        AssertionIDRequest idRequest = (AssertionIDRequest) parentSAMLObject;
+        final AssertionIDRequest idRequest = (AssertionIDRequest) parentSAMLObject;
 
         if (childSAMLObject instanceof AssertionIDRef) {
             idRequest.getAssertionIDRefs().add((AssertionIDRef) childSAMLObject);
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 d03a577..77dad7e 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
@@ -112,7 +112,7 @@ public class AssertionImpl extends AbstractSignableSAMLObject implements Asserti
 
     /** {@inheritDoc} */
     public void setID(final String newID) {
-        String oldID = this.id;
+        final String oldID = this.id;
         this.id = prepareForAssignment(this.id, newID);
         registerOwnID(oldID, this.id);
     }
@@ -169,21 +169,21 @@ public class AssertionImpl extends AbstractSignableSAMLObject implements Asserti
 
     /** {@inheritDoc} */
     public List<AuthnStatement> getAuthnStatements() {
-        QName statementQName = new QName(SAMLConstants.SAML20_NS, AuthnStatement.DEFAULT_ELEMENT_LOCAL_NAME,
+        final QName statementQName = new QName(SAMLConstants.SAML20_NS, AuthnStatement.DEFAULT_ELEMENT_LOCAL_NAME,
                 SAMLConstants.SAML20_PREFIX);
         return (List<AuthnStatement>) statements.subList(statementQName);
     }
 
     /** {@inheritDoc} */
     public List<AuthzDecisionStatement> getAuthzDecisionStatements() {
-        QName statementQName = new QName(SAMLConstants.SAML20_NS, AuthzDecisionStatement.DEFAULT_ELEMENT_LOCAL_NAME,
+        final QName statementQName = new QName(SAMLConstants.SAML20_NS, AuthzDecisionStatement.DEFAULT_ELEMENT_LOCAL_NAME,
                 SAMLConstants.SAML20_PREFIX);
         return (List<AuthzDecisionStatement>) statements.subList(statementQName);
     }
 
     /** {@inheritDoc} */
     public List<AttributeStatement> getAttributeStatements() {
-        QName statementQName = new QName(SAMLConstants.SAML20_NS, AttributeStatement.DEFAULT_ELEMENT_LOCAL_NAME,
+        final QName statementQName = new QName(SAMLConstants.SAML20_NS, AttributeStatement.DEFAULT_ELEMENT_LOCAL_NAME,
                 SAMLConstants.SAML20_PREFIX);
         return (List<AttributeStatement>) statements.subList(statementQName);
     }
@@ -195,7 +195,7 @@ public class AssertionImpl extends AbstractSignableSAMLObject implements Asserti
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.add(issuer);
         
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 f8df877..db94725 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,15 +34,16 @@ import org.w3c.dom.Element;
 public class AssertionMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        Assertion assertion = (Assertion) samlObject;
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement)
+            throws MarshallingException {
+        final Assertion assertion = (Assertion) samlObject;
 
         if (assertion.getVersion() != null) {
             domElement.setAttributeNS(null, Assertion.VERSION_ATTRIB_NAME, assertion.getVersion().toString());
         }
 
         if (assertion.getIssueInstant() != null) {
-            String issueInstantStr = SAMLConfigurationSupport.getSAMLDateFormatter().print(assertion.getIssueInstant());
+            final String issueInstantStr = SAMLConfigurationSupport.getSAMLDateFormatter().print(assertion.getIssueInstant());
             domElement.setAttributeNS(null, Assertion.ISSUE_INSTANT_ATTRIB_NAME, issueInstantStr);
         }
 
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 e2710f3..681d530 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,8 @@ public class AssertionURIRefBuilder extends AbstractSAMLObjectBuilder<AssertionU
     }
 
     /** {@inheritDoc} */
-    public AssertionURIRef buildObject(final String namespaceURI, final String localName, final 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/AssertionURIRefMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/AssertionURIRefMarshaller.java
index b7a5d64..649daef 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
@@ -36,7 +36,7 @@ public class AssertionURIRefMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        AssertionURIRef assertionURIRef = (AssertionURIRef) samlObject;
+        final AssertionURIRef assertionURIRef = (AssertionURIRef) samlObject;
         ElementSupport.appendTextContent(domElement, assertionURIRef.getAssertionURI());
     }
 }
\ No newline at end of file
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 6893368..870a36e 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
@@ -32,7 +32,7 @@ public class AssertionURIRefUnmarshaller extends AbstractSAMLObjectUnmarshaller
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        AssertionURIRef assertionURIRef = (AssertionURIRef) samlObject;
+        final AssertionURIRef assertionURIRef = (AssertionURIRef) samlObject;
         assertionURIRef.setAssertionURI(elementContent);
     }
 }
\ 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 9ee3b4a..0e3c468 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
@@ -104,7 +104,7 @@ public class AttributeImpl extends AbstractSAMLObject implements Attribute {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.addAll(attributeValues);
 
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 4930ab4..d752b20 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
@@ -30,7 +30,7 @@ public class AttributeMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
-        Attribute attribute = (Attribute) samlElement;
+        final Attribute attribute = (Attribute) samlElement;
 
         if (attribute.getName() != null) {
             domElement.setAttributeNS(null, Attribute.NAME_ATTTRIB_NAME, attribute.getName());
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 abaa008..df111a7 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
@@ -57,7 +57,7 @@ public class AttributeQueryImpl extends SubjectQueryImpl implements AttributeQue
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (super.getOrderedChildren() != null) {
             children.addAll(super.getOrderedChildren());
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 8e5b76a..fd48d22 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
@@ -34,7 +34,7 @@ public class AttributeQueryUnmarshaller extends SubjectQueryUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
-        AttributeQuery query = (AttributeQuery) parentSAMLObject;
+        final AttributeQuery query = (AttributeQuery) parentSAMLObject;
 
         if (childSAMLObject instanceof Attribute) {
             query.getAttributes().add((Attribute) childSAMLObject);
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 d2cdfd4..3213c43 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
@@ -65,7 +65,7 @@ public class AttributeStatementImpl extends AbstractSAMLObject implements Attrib
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.addAll(indexedChildren);
         
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 ec75279..43b14f4 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
@@ -35,7 +35,7 @@ public class AttributeStatementUnmarshaller extends AbstractSAMLObjectUnmarshall
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
-        AttributeStatement attributeStatement = (AttributeStatement) parentObject;
+        final AttributeStatement attributeStatement = (AttributeStatement) parentObject;
 
         if (childObject instanceof Attribute) {
             attributeStatement.getAttributes().add((Attribute) childObject);
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 210c8ae..bd91734 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
@@ -37,7 +37,7 @@ public class AttributeUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
         final Attribute attribute = (Attribute) parentSAMLObject;
 
-        QName childQName = childSAMLObject.getElementQName();
+        final QName childQName = childSAMLObject.getElementQName();
         if ("AttributeValue".equals(childQName.getLocalPart())
                 && childQName.getNamespaceURI().equals(SAMLConstants.SAML20_NS)) {
             attribute.getAttributeValues().add(childSAMLObject);
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 57ec61f..3e9d130 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
@@ -36,7 +36,7 @@ public class AudienceMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        Audience audience = (Audience) samlObject;
+        final Audience audience = (Audience) samlObject;
         ElementSupport.appendTextContent(domElement, audience.getAudienceURI());
     }
 }
\ 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 bcc7008..3a0d019 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
@@ -58,7 +58,7 @@ public class AudienceRestrictionImpl extends AbstractSAMLObject implements Audie
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.addAll(audience);
 
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 b2b14e2..f852808 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
@@ -34,7 +34,7 @@ public class AudienceRestrictionUnmarshaller extends AbstractSAMLObjectUnmarshal
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
-        AudienceRestriction audienceRestriction = (AudienceRestriction) parentObject;
+        final AudienceRestriction audienceRestriction = (AudienceRestriction) parentObject;
 
         if (childObject instanceof Audience) {
             audienceRestriction.getAudiences().add((Audience) childObject);
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 e44276e..c13f770 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
@@ -32,7 +32,7 @@ public class AudienceUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        Audience audience = (Audience) samlObject;
+        final Audience audience = (Audience) samlObject;
         audience.setAudienceURI(elementContent);
     }
 }
\ No newline at end of file
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 b9f37b0..c842ce3 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
@@ -36,7 +36,7 @@ public class AuthenticatingAuthorityMarshaller extends AbstractSAMLObjectMarshal
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        AuthenticatingAuthority authenticatingAuthority = (AuthenticatingAuthority) samlObject;
+        final AuthenticatingAuthority authenticatingAuthority = (AuthenticatingAuthority) samlObject;
         ElementSupport.appendTextContent(domElement, authenticatingAuthority.getURI());
     }
 }
\ No newline at end of file
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 1a8b412..aef1152 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
@@ -32,7 +32,7 @@ public class AuthenticatingAuthorityUnmarshaller extends AbstractSAMLObjectUnmar
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        AuthenticatingAuthority authenticatingAuthority = (AuthenticatingAuthority) samlObject;
+        final AuthenticatingAuthority authenticatingAuthority = (AuthenticatingAuthority) samlObject;
         authenticatingAuthority.setURI(elementContent);
     }
 }
\ No newline at end of file
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 ae23729..6190f2d 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
@@ -36,7 +36,7 @@ public class AuthnContextClassRefMarshaller extends AbstractSAMLObjectMarshaller
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        AuthnContextClassRef authnContextClassRef = (AuthnContextClassRef) samlObject;
+        final AuthnContextClassRef authnContextClassRef = (AuthnContextClassRef) samlObject;
         ElementSupport.appendTextContent(domElement, authnContextClassRef.getAuthnContextClassRef());
     }
 }
\ No newline at end of file
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 31ac80e..3f77b7d 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
@@ -32,7 +32,7 @@ public class AuthnContextClassRefUnmarshaller extends AbstractSAMLObjectUnmarsha
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        AuthnContextClassRef authnContextClassRef = (AuthnContextClassRef) samlObject;
+        final AuthnContextClassRef authnContextClassRef = (AuthnContextClassRef) samlObject;
         authnContextClassRef.setAuthnContextClassRef(elementContent);
     }
 }
\ No newline at end of file
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 ad7172b..c36f96a 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
@@ -43,10 +43,10 @@ public class AuthnContextDeclMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        AuthnContextDecl authnCtxDecl = (AuthnContextDecl) xmlObject;
+        final AuthnContextDecl authnCtxDecl = (AuthnContextDecl) xmlObject;
 
         Attr attribute;
-        for (Entry<QName, String> entry : authnCtxDecl.getUnknownAttributes().entrySet()) {
+        for (final Entry<QName, String> entry : authnCtxDecl.getUnknownAttributes().entrySet()) {
             attribute = AttributeSupport.constructAttribute(domElement.getOwnerDocument(), entry.getKey());
             attribute.setValue(entry.getValue());
             domElement.setAttributeNodeNS(attribute);
@@ -59,7 +59,7 @@ public class AuthnContextDeclMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        AuthnContextDecl authnCtxDecl = (AuthnContextDecl) xmlObject;
+        final AuthnContextDecl authnCtxDecl = (AuthnContextDecl) xmlObject;
 
         if (authnCtxDecl.getTextContent() != null) {
             ElementSupport.appendTextContent(domElement, authnCtxDecl.getTextContent());
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 3d6c0ff..525e18c 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
@@ -36,7 +36,7 @@ public class AuthnContextDeclRefMarshaller extends AbstractSAMLObjectMarshaller
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        AuthnContextDeclRef authnContextDeclRef = (AuthnContextDeclRef) samlObject;
+        final AuthnContextDeclRef authnContextDeclRef = (AuthnContextDeclRef) samlObject;
         ElementSupport.appendTextContent(domElement, authnContextDeclRef.getAuthnContextDeclRef());
     }
 }
\ No newline at end of file
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 0988b88..256e9f4 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
@@ -32,7 +32,7 @@ public class AuthnContextDeclRefUnmarshaller extends AbstractSAMLObjectUnmarshal
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        AuthnContextDeclRef authnContextDeclRef = (AuthnContextDeclRef) samlObject;
+        final AuthnContextDeclRef authnContextDeclRef = (AuthnContextDeclRef) samlObject;
         authnContextDeclRef.setAuthnContextDeclRef(elementContent);
     }
 }
\ No newline at end of file
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 2c80336..eee5e53 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
@@ -39,16 +39,16 @@ public class AuthnContextDeclUnmarshaller extends AbstractSAMLObjectUnmarshaller
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        AuthnContextDecl authnCtcDecl = (AuthnContextDecl) parentXMLObject;
+        final AuthnContextDecl authnCtcDecl = (AuthnContextDecl) parentXMLObject;
 
         authnCtcDecl.getUnknownXMLObjects().add(childXMLObject);
     }
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        AuthnContextDecl authnCtcDecl = (AuthnContextDecl) xmlObject;
+        final AuthnContextDecl authnCtcDecl = (AuthnContextDecl) xmlObject;
 
-        QName attribQName = QNameSupport.constructQName(attribute.getNamespaceURI(), attribute.getLocalName(), attribute
+        final QName attribQName = QNameSupport.constructQName(attribute.getNamespaceURI(), attribute.getLocalName(), attribute
                 .getPrefix());
 
         if (attribute.isId()) {
@@ -60,7 +60,7 @@ public class AuthnContextDeclUnmarshaller extends AbstractSAMLObjectUnmarshaller
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
-        AuthnContextDecl authnCtcDecl = (AuthnContextDecl) xmlObject;
+        final 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 c80f4d8..6d292b7 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
@@ -100,7 +100,7 @@ public class AuthnContextImpl extends AbstractSAMLObject implements AuthnContext
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.add(authnContextClassRef);
         children.add(authnContextDecl);
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 05a2bc9..8724a55 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
@@ -37,7 +37,7 @@ public class AuthnContextUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
-        AuthnContext authnContext = (AuthnContext) parentObject;
+        final AuthnContext authnContext = (AuthnContext) parentObject;
         if (childObject instanceof AuthnContextClassRef) {
             authnContext.setAuthnContextClassRef((AuthnContextClassRef) childObject);
         } else if (childObject instanceof AuthnContextDecl) {
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 f36bec4..964058b 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
@@ -73,7 +73,7 @@ public class AuthnQueryImpl extends SubjectQueryImpl implements AuthnQuery {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (super.getOrderedChildren() != null) {
             children.addAll(super.getOrderedChildren());
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 ed9b3e5..a87b5c8 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
@@ -33,7 +33,7 @@ public class AuthnQueryMarshaller extends SubjectQueryMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        AuthnQuery query = (AuthnQuery) samlObject;
+        final AuthnQuery query = (AuthnQuery) samlObject;
 
         if (query.getSessionIndex() != null) {
             domElement.setAttributeNS(null, AuthnQuery.SESSION_INDEX_ATTRIB_NAME, query.getSessionIndex());
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 e546c8a..8c55f97 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
@@ -247,7 +247,7 @@ public class AuthnRequestImpl extends RequestAbstractTypeImpl implements AuthnRe
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (super.getOrderedChildren() != null) {
             children.addAll(super.getOrderedChildren());
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 a69efff..4d1d0be 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
@@ -33,7 +33,7 @@ public class AuthnRequestMarshaller extends RequestAbstractTypeMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        AuthnRequest req = (AuthnRequest) samlObject;
+        final AuthnRequest req = (AuthnRequest) samlObject;
 
         if (req.isForceAuthnXSBoolean() != null) {
             domElement.setAttributeNS(null, AuthnRequest.FORCE_AUTHN_ATTRIB_NAME, req.isForceAuthnXSBoolean()
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 e8a535e..18bb146 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
@@ -115,7 +115,7 @@ public class AuthnStatementImpl extends AbstractSAMLObject implements AuthnState
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.add(subjectLocality);
         children.add(authnContext);
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 b98fd45..f26bdf0 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
@@ -35,10 +35,10 @@ public class AuthnStatementMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        AuthnStatement authnStatement = (AuthnStatement) samlObject;
+        final AuthnStatement authnStatement = (AuthnStatement) samlObject;
 
         if (authnStatement.getAuthnInstant() != null) {
-            String authnInstantStr = SAMLConfigurationSupport.getSAMLDateFormatter().print(
+            final String authnInstantStr = SAMLConfigurationSupport.getSAMLDateFormatter().print(
                     authnStatement.getAuthnInstant());
             domElement.setAttributeNS(null, AuthnStatement.AUTHN_INSTANT_ATTRIB_NAME, authnInstantStr);
         }
@@ -48,7 +48,7 @@ public class AuthnStatementMarshaller extends AbstractSAMLObjectMarshaller {
         }
 
         if (authnStatement.getSessionNotOnOrAfter() != null) {
-            String sessionNotOnOrAfterStr = SAMLConfigurationSupport.getSAMLDateFormatter().print(
+            final String sessionNotOnOrAfterStr = SAMLConfigurationSupport.getSAMLDateFormatter().print(
                     authnStatement.getSessionNotOnOrAfter());
             domElement.setAttributeNS(null, AuthnStatement.SESSION_NOT_ON_OR_AFTER_ATTRIB_NAME, sessionNotOnOrAfterStr);
         }
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 96f7fb4..999d52c 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
@@ -84,7 +84,7 @@ public class AuthzDecisionQueryImpl extends SubjectQueryImpl implements AuthzDec
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (super.getOrderedChildren() != null) {
             children.addAll(super.getOrderedChildren());
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 a52935e..dcbcfb7 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
@@ -33,7 +33,7 @@ public class AuthzDecisionQueryMarshaller extends SubjectQueryMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        AuthzDecisionQuery query = (AuthzDecisionQuery) samlObject;
+        final AuthzDecisionQuery query = (AuthzDecisionQuery) samlObject;
 
         if (query.getResource() != null) {
             domElement.setAttributeNS(null, AuthzDecisionQuery.RESOURCE_ATTRIB_NAME, query.getResource());
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 0beaeb8..350a390 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
@@ -99,7 +99,7 @@ public class AuthzDecisionStatementImpl extends AbstractSAMLObject implements Au
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.addAll(actions);
         children.add(evidence);
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 df7066a..85575cb 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
@@ -34,7 +34,7 @@ public class AuthzDecisionStatementMarshaller extends AbstractSAMLObjectMarshall
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        AuthzDecisionStatement authzDS = (AuthzDecisionStatement) samlObject;
+        final AuthzDecisionStatement authzDS = (AuthzDecisionStatement) samlObject;
 
         if (authzDS.getResource() != null) {
             domElement.setAttributeNS(null, AuthzDecisionStatement.RESOURCE_ATTRIB_NAME, authzDS.getResource());
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 c6b07f9..d69c7e8 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
@@ -34,7 +34,7 @@ public abstract class BaseIDMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        BaseID baseID = (BaseID) samlObject;
+        final 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/ConditionsImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/ConditionsImpl.java
index 183a76b..9187184 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
@@ -71,16 +71,16 @@ public class ConditionsImpl extends AbstractSAMLObject implements Conditions {
 
     /** {@inheritDoc} */
     public List<AudienceRestriction> getAudienceRestrictions() {
-        QName conditionQName = new QName(SAMLConstants.SAML20_NS, AudienceRestriction.DEFAULT_ELEMENT_LOCAL_NAME,
+        final QName conditionQName = new QName(SAMLConstants.SAML20_NS, AudienceRestriction.DEFAULT_ELEMENT_LOCAL_NAME,
                 SAMLConstants.SAML20_PREFIX);
         return (List<AudienceRestriction>) conditions.subList(conditionQName);
     }
 
     /** {@inheritDoc} */
     public OneTimeUse getOneTimeUse() {
-        QName conditionQName = new QName(SAMLConstants.SAML20_NS, OneTimeUse.DEFAULT_ELEMENT_LOCAL_NAME,
+        final QName conditionQName = new QName(SAMLConstants.SAML20_NS, OneTimeUse.DEFAULT_ELEMENT_LOCAL_NAME,
                 SAMLConstants.SAML20_PREFIX);
-        List<OneTimeUse> list = (List<OneTimeUse>) conditions.subList(conditionQName);
+        final List<OneTimeUse> list = (List<OneTimeUse>) conditions.subList(conditionQName);
         if (list == null || list.size() == 0) {
             return null;
         } else {
@@ -90,9 +90,9 @@ public class ConditionsImpl extends AbstractSAMLObject implements Conditions {
 
     /** {@inheritDoc} */
     public ProxyRestriction getProxyRestriction() {
-        QName conditionQName = new QName(SAMLConstants.SAML20_NS, ProxyRestriction.DEFAULT_ELEMENT_LOCAL_NAME,
+        final QName conditionQName = new QName(SAMLConstants.SAML20_NS, ProxyRestriction.DEFAULT_ELEMENT_LOCAL_NAME,
                 SAMLConstants.SAML20_PREFIX);
-        List<ProxyRestriction> list = (List<ProxyRestriction>) conditions.subList(conditionQName);
+        final List<ProxyRestriction> list = (List<ProxyRestriction>) conditions.subList(conditionQName);
         if (list == null || list.size() == 0) {
             return null;
         } else {
@@ -122,7 +122,7 @@ public class ConditionsImpl extends AbstractSAMLObject implements Conditions {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.addAll(conditions);
 
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 17f3fd2..e5020d9 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
@@ -35,15 +35,15 @@ public class ConditionsMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        Conditions conditions = (Conditions) samlObject;
+        final Conditions conditions = (Conditions) samlObject;
 
         if (conditions.getNotBefore() != null) {
-            String notBeforeStr = SAMLConfigurationSupport.getSAMLDateFormatter().print(conditions.getNotBefore());
+            final String notBeforeStr = SAMLConfigurationSupport.getSAMLDateFormatter().print(conditions.getNotBefore());
             domElement.setAttributeNS(null, Conditions.NOT_BEFORE_ATTRIB_NAME, notBeforeStr);
         }
 
         if (conditions.getNotOnOrAfter() != null) {
-            String notOnOrAfterStr = SAMLConfigurationSupport.getSAMLDateFormatter().print(
+            final String notOnOrAfterStr = SAMLConfigurationSupport.getSAMLDateFormatter().print(
                     conditions.getNotOnOrAfter());
             domElement.setAttributeNS(null, Conditions.NOT_ON_OR_AFTER_ATTRIB_NAME, notOnOrAfterStr);
         }
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 6dbc012..001b1c6 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
@@ -68,7 +68,7 @@ public class EncryptedElementTypeImpl extends AbstractSAMLObject implements Encr
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         
         if (encryptedData != null) {
             children.add(encryptedData);
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 83ed68e..c58fba5 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
@@ -32,7 +32,7 @@ public class EncryptedElementTypeUnmarshaller extends AbstractSAMLObjectUnmarsha
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
-        EncryptedElementType eet = (EncryptedElementType) parentSAMLObject;
+        final EncryptedElementType eet = (EncryptedElementType) parentSAMLObject;
 
         if (childSAMLObject instanceof EncryptedData) {
             eet.setEncryptedData((EncryptedData) childSAMLObject);
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 306a53c..7af1796 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
@@ -82,7 +82,7 @@ public class EvidenceImpl extends AbstractSAMLObject implements Evidence {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (evidence.size() == 0) {
             return null;
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 6d8a8a4..a835090 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
@@ -37,7 +37,7 @@ public class EvidenceUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
-        Evidence evidence = (Evidence) parentObject;
+        final Evidence evidence = (Evidence) parentObject;
 
         if (childObject instanceof AssertionIDRef) {
             evidence.getAssertionIDReferences().add((AssertionIDRef) childObject);
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 edec5b7..c28b063 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
@@ -44,7 +44,7 @@ public class ExtensionsUnmarshaller extends AbstractSAMLObjectUnmarshaller {
      */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        Extensions extensions = (Extensions) parentXMLObject;
+        final Extensions extensions = (Extensions) parentXMLObject;
 
         extensions.getUnknownXMLObjects().add(childXMLObject);
     }
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 cb4c9c4..2ba9d1b 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
@@ -36,7 +36,7 @@ public class GetCompleteMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        GetComplete gc = (GetComplete) samlObject;
+        final GetComplete gc = (GetComplete) samlObject;
 
         if (gc.getGetComplete() != null) {
             ElementSupport.appendTextContent(domElement, gc.getGetComplete());
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 3a27bff..976f0d6 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
@@ -32,7 +32,7 @@ public class GetCompleteUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        GetComplete gc = (GetComplete) samlObject;
+        final GetComplete gc = (GetComplete) samlObject;
 
         gc.setGetComplete(elementContent);
     }
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 0c694f9..efc1fde 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
@@ -34,7 +34,7 @@ public class IDPEntryMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        IDPEntry entry = (IDPEntry) samlObject;
+        final IDPEntry entry = (IDPEntry) samlObject;
 
         if (entry.getProviderID() != null) {
             domElement.setAttributeNS(null, IDPEntry.PROVIDER_ID_ATTRIB_NAME, entry.getProviderID());
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 8ec9cad..ddb0e3d 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
@@ -72,7 +72,7 @@ public class IDPListImpl extends AbstractSAMLObject implements IDPList {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         children.addAll(idpEntries);
         children.add(getComplete);
         if (children.size() > 0) {
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 d27f5d8..7ea5a1f 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
@@ -36,7 +36,7 @@ public class IDPListUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
-        IDPList list = (IDPList) parentSAMLObject;
+        final IDPList list = (IDPList) parentSAMLObject;
 
         if (childSAMLObject instanceof IDPEntry) {
             list.getIDPEntrys().add((IDPEntry) childSAMLObject);
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 a83388d..e0295b3 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
@@ -123,7 +123,7 @@ public class LogoutRequestImpl extends RequestAbstractTypeImpl implements Logout
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (super.getOrderedChildren() != null) {
             children.addAll(super.getOrderedChildren());
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 25dcc52..4bf9fe3 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
@@ -34,14 +34,14 @@ public class LogoutRequestMarshaller extends RequestAbstractTypeMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        LogoutRequest req = (LogoutRequest) samlObject;
+        final LogoutRequest req = (LogoutRequest) samlObject;
 
         if (req.getReason() != null) {
             domElement.setAttributeNS(null, LogoutRequest.REASON_ATTRIB_NAME, req.getReason());
         }
 
         if (req.getNotOnOrAfter() != null) {
-            String noaStr = SAMLConfigurationSupport.getSAMLDateFormatter().print(req.getNotOnOrAfter());
+            final String noaStr = SAMLConfigurationSupport.getSAMLDateFormatter().print(req.getNotOnOrAfter());
             domElement.setAttributeNS(null, LogoutRequest.NOT_ON_OR_AFTER_ATTRIB_NAME, noaStr);
         }
 
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 a13971b..35dba08 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
@@ -116,7 +116,7 @@ public class ManageNameIDRequestImpl extends RequestAbstractTypeImpl implements
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (super.getOrderedChildren() != null) {
             children.addAll(super.getOrderedChildren());
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 28983cb..4440c89 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
@@ -38,7 +38,7 @@ public class ManageNameIDRequestUnmarshaller extends RequestAbstractTypeUnmarsha
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
-        ManageNameIDRequest req = (ManageNameIDRequest) parentSAMLObject;
+        final ManageNameIDRequest req = (ManageNameIDRequest) parentSAMLObject;
 
         if (childSAMLObject instanceof NameID) {
             req.setNameID((NameID) childSAMLObject);
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 d96e882..4c5a03f 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
@@ -98,7 +98,7 @@ public class NameIDMappingRequestImpl extends RequestAbstractTypeImpl implements
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (super.getOrderedChildren() != null) {
             children.addAll(super.getOrderedChildren());
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 f590ad2..c0674bb 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
@@ -33,7 +33,7 @@ public class NameIDMappingRequestUnmarshaller extends RequestAbstractTypeUnmarsh
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
-        NameIDMappingRequest req = (NameIDMappingRequest) parentSAMLObject;
+        final NameIDMappingRequest req = (NameIDMappingRequest) parentSAMLObject;
 
         if (childSAMLObject instanceof BaseID) {
             req.setBaseID((BaseID) childSAMLObject);
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 19fdc5e..4c22942 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
@@ -70,7 +70,7 @@ public class NameIDMappingResponseImpl extends StatusResponseTypeImpl implements
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (super.getOrderedChildren() != null) {
             children.addAll(super.getOrderedChildren());
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 2a8362a..a05d46d 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
@@ -31,7 +31,7 @@ public class NameIDMappingResponseUnmarshaller extends StatusResponseTypeUnmarsh
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
-        NameIDMappingResponse resp = (NameIDMappingResponse) parentSAMLObject;
+        final NameIDMappingResponse resp = (NameIDMappingResponse) parentSAMLObject;
 
         if (childSAMLObject instanceof NameID) {
             resp.setNameID((NameID) childSAMLObject);
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 92d887a..a4635ed 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
@@ -34,7 +34,7 @@ public class NameIDPolicyMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        NameIDPolicy policy = (NameIDPolicy) samlObject;
+        final NameIDPolicy policy = (NameIDPolicy) samlObject;
 
         if (policy.getFormat() != null) {
             domElement.setAttributeNS(null, NameIDPolicy.FORMAT_ATTRIB_NAME, policy.getFormat());
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 8eb492e..2f297ff 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
@@ -36,7 +36,7 @@ public class NewIDMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        NewID newID = (NewID) samlObject;
+        final NewID newID = (NewID) samlObject;
 
         if (newID.getNewID() != null) {
             ElementSupport.appendTextContent(domElement, newID.getNewID());
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 1eb3240..beb61c3 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
@@ -32,7 +32,7 @@ public class NewIDUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        NewID newID = (NewID) samlObject;
+        final NewID newID = (NewID) samlObject;
 
         newID.setNewID(elementContent);
     }
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 e5d4c4b..8fe6394 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
@@ -75,7 +75,7 @@ public class ProxyRestrictionImpl extends AbstractSAMLObject implements ProxyRes
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.addAll(audiences);
         return Collections.unmodifiableList(children);
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 bd509f2..448bc0a 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
@@ -34,7 +34,7 @@ public class ProxyRestrictionMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        ProxyRestriction proxyRestriction = (ProxyRestriction) samlObject;
+        final ProxyRestriction proxyRestriction = (ProxyRestriction) samlObject;
         if (proxyRestriction.getProxyCount() != null) {
             domElement.setAttributeNS(null, ProxyRestriction.COUNT_ATTRIB_NAME, Integer.toString(proxyRestriction
                     .getProxyCount()));
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 9b16c35..5eb7546 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
@@ -88,7 +88,7 @@ public abstract class RequestAbstractTypeImpl extends AbstractSignableSAMLObject
 
     /** {@inheritDoc} */
     public void setID(final String newID) {
-        String oldID = this.id;
+        final String oldID = this.id;
         this.id = prepareForAssignment(this.id, newID);
         registerOwnID(oldID, this.id);
     }
@@ -150,7 +150,7 @@ public abstract class RequestAbstractTypeImpl extends AbstractSignableSAMLObject
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (issuer != null) {
             children.add(issuer);
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 63eed4e..253a731 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
@@ -35,7 +35,7 @@ public abstract class RequestAbstractTypeMarshaller extends AbstractSAMLObjectMa
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        RequestAbstractType req = (RequestAbstractType) samlObject;
+        final RequestAbstractType req = (RequestAbstractType) samlObject;
 
         if (req.getVersion() != null) {
             domElement.setAttributeNS(null, RequestAbstractType.VERSION_ATTRIB_NAME, req.getVersion().toString());
@@ -51,7 +51,7 @@ public abstract class RequestAbstractTypeMarshaller extends AbstractSAMLObjectMa
         }
 
         if (req.getIssueInstant() != null) {
-            String iiStr = SAMLConfigurationSupport.getSAMLDateFormatter().print(req.getIssueInstant());
+            final String iiStr = SAMLConfigurationSupport.getSAMLDateFormatter().print(req.getIssueInstant());
             domElement.setAttributeNS(null, RequestAbstractType.ISSUE_INSTANT_ATTRIB_NAME, iiStr);
         }
 
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 c5a2b2d..985c9c9 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
@@ -82,7 +82,7 @@ public class RequestedAuthnContextImpl extends AbstractSAMLObject implements Req
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.addAll(authnContextClassRefs);
         children.addAll(authnContextDeclRefs);
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 c10d5f1..5cfc7be 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
@@ -34,7 +34,7 @@ public class RequestedAuthnContextMarshaller extends AbstractSAMLObjectMarshalle
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        RequestedAuthnContext rac = (RequestedAuthnContext) samlObject;
+        final RequestedAuthnContext rac = (RequestedAuthnContext) samlObject;
 
         if (rac.getComparison() != null) {
             domElement.setAttributeNS(null, RequestedAuthnContext.COMPARISON_ATTRIB_NAME, rac.getComparison()
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 da9afcd..b22f227 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
@@ -36,7 +36,7 @@ public class RequesterIDMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        RequesterID reqID = (RequesterID) samlObject;
+        final RequesterID reqID = (RequesterID) samlObject;
 
         if (reqID.getRequesterID() != null) {
             ElementSupport.appendTextContent(domElement, reqID.getRequesterID());
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 7abc41d..dd4b0fa 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
@@ -32,7 +32,7 @@ public class RequesterIDUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        RequesterID reqID = (RequesterID) samlObject;
+        final RequesterID reqID = (RequesterID) samlObject;
 
         reqID.setRequesterID(elementContent);
     }
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 3f6c03e..533373c 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
@@ -63,7 +63,7 @@ public class ResponseImpl extends StatusResponseTypeImpl implements Response {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (super.getOrderedChildren() != null) {
             children.addAll(super.getOrderedChildren());
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 d6a1a59..0d5660c 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
@@ -35,7 +35,7 @@ public class ResponseUnmarshaller extends StatusResponseTypeUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
-        Response resp = (Response) parentSAMLObject;
+        final Response resp = (Response) parentSAMLObject;
 
         if (childSAMLObject instanceof Assertion) {
             resp.getAssertions().add((Assertion) childSAMLObject);
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 afe6b4c..d372de2 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
@@ -86,7 +86,7 @@ public class ScopingImpl extends AbstractSAMLObject implements Scoping {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (idpList != null) {
             children.add(idpList);
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 dd9e2c9..d7c1075 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
@@ -34,7 +34,7 @@ public class ScopingMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        Scoping scoping = (Scoping) samlObject;
+        final Scoping scoping = (Scoping) samlObject;
 
         if (scoping.getProxyCount() != null) {
             domElement.setAttributeNS(null, Scoping.PROXY_COUNT_ATTRIB_NAME, scoping.getProxyCount().toString());
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 a271556..bb02f4b 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
@@ -36,7 +36,7 @@ public class SessionIndexMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        SessionIndex si = (SessionIndex) samlObject;
+        final SessionIndex si = (SessionIndex) samlObject;
 
         if (si.getSessionIndex() != null) {
             ElementSupport.appendTextContent(domElement, si.getSessionIndex());
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 6d1f4ab..0a29015 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
@@ -32,7 +32,7 @@ public class SessionIndexUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        SessionIndex si = (SessionIndex) samlObject;
+        final SessionIndex si = (SessionIndex) samlObject;
 
         si.setSessionIndex(elementContent);
     }
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 b004922..f473c71 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
@@ -74,7 +74,7 @@ public class StatusCodeImpl extends AbstractSAMLObject implements StatusCode {
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
         if (childStatusCode != null) {
-            ArrayList<XMLObject> children = new ArrayList<>();
+            final ArrayList<XMLObject> children = new ArrayList<>();
             children.add(childStatusCode);
             return Collections.unmodifiableList(children);
         } else {
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 e4651e4..e44317e 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
@@ -34,7 +34,7 @@ public class StatusCodeMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        StatusCode statusCode = (StatusCode) samlObject;
+        final StatusCode statusCode = (StatusCode) samlObject;
 
         if (statusCode.getValue() != null) {
             domElement.setAttributeNS(null, StatusCode.VALUE_ATTRIB_NAME, statusCode.getValue());
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 17e8432..7e731ae 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
@@ -32,7 +32,7 @@ public class StatusDetailUnmarshaller extends AbstractSAMLObjectUnmarshaller {
      */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
-        StatusDetail statusDetail = (StatusDetail) parentSAMLObject;
+        final StatusDetail statusDetail = (StatusDetail) parentSAMLObject;
 
         statusDetail.getUnknownXMLObjects().add(childSAMLObject);
     }
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 ec1eacf..708440f 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
@@ -90,7 +90,7 @@ public class StatusImpl extends AbstractSAMLObject implements Status {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.add(statusCode);
         if (statusMessage != null) {
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 340487e..695e837 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
@@ -36,7 +36,7 @@ public class StatusMessageMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        StatusMessage message = (StatusMessage) samlObject;
+        final StatusMessage message = (StatusMessage) samlObject;
 
         if (message.getMessage() != null) {
             ElementSupport.appendTextContent(domElement, message.getMessage());
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 cf82e4e..d18ce97 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
@@ -33,7 +33,7 @@ public class StatusMessageUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        StatusMessage message = (StatusMessage) samlObject;
+        final 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 90a6f6b..71b607d 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
@@ -95,7 +95,7 @@ public abstract class StatusResponseTypeImpl extends AbstractSignableSAMLObject
 
     /** {@inheritDoc} */
     public void setID(final String newID) {
-        String oldID = this.id;
+        final String oldID = this.id;
         this.id = prepareForAssignment(this.id, newID);
         registerOwnID(oldID, this.id);
     }
@@ -177,7 +177,7 @@ public abstract class StatusResponseTypeImpl extends AbstractSignableSAMLObject
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (issuer != null){
             children.add(issuer);
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 afb6b6e..0e87ed7 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
@@ -35,7 +35,7 @@ public abstract class StatusResponseTypeMarshaller extends AbstractSAMLObjectMar
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        StatusResponseType sr = (StatusResponseType) samlObject;
+        final StatusResponseType sr = (StatusResponseType) samlObject;
 
         if (sr.getVersion() != null) {
             domElement.setAttributeNS(null, StatusResponseType.VERSION_ATTRIB_NAME, sr.getVersion().toString());
@@ -55,7 +55,7 @@ public abstract class StatusResponseTypeMarshaller extends AbstractSAMLObjectMar
         }
 
         if (sr.getIssueInstant() != null) {
-            String iiStr = SAMLConfigurationSupport.getSAMLDateFormatter().print(sr.getIssueInstant());
+            final String iiStr = SAMLConfigurationSupport.getSAMLDateFormatter().print(sr.getIssueInstant());
             domElement.setAttributeNS(null, StatusResponseType.ISSUE_INSTANT_ATTRIB_NAME, iiStr);
         }
 
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 484f076..4a72886 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
@@ -37,7 +37,7 @@ public class StatusUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
-        Status status = (Status) parentSAMLObject;
+        final Status status = (Status) parentSAMLObject;
 
         if (childSAMLObject instanceof StatusCode) {
             status.setStatusCode((StatusCode) childSAMLObject);
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 9a0b83e..aa66d1b 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
@@ -35,15 +35,15 @@ public class SubjectConfirmationDataMarshaller extends AbstractSAMLObjectMarshal
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        SubjectConfirmationData subjectCD = (SubjectConfirmationData) samlObject;
+        final SubjectConfirmationData subjectCD = (SubjectConfirmationData) samlObject;
 
         if (subjectCD.getNotBefore() != null) {
-            String notBeforeStr = SAMLConfigurationSupport.getSAMLDateFormatter().print(subjectCD.getNotBefore());
+            final String notBeforeStr = SAMLConfigurationSupport.getSAMLDateFormatter().print(subjectCD.getNotBefore());
             domElement.setAttributeNS(null, SubjectConfirmationData.NOT_BEFORE_ATTRIB_NAME, notBeforeStr);
         }
 
         if (subjectCD.getNotOnOrAfter() != null) {
-            String notOnOrAfterStr = SAMLConfigurationSupport.getSAMLDateFormatter().print(subjectCD.getNotOnOrAfter());
+            final String notOnOrAfterStr = SAMLConfigurationSupport.getSAMLDateFormatter().print(subjectCD.getNotOnOrAfter());
             domElement.setAttributeNS(null, SubjectConfirmationData.NOT_ON_OR_AFTER_ATTRIB_NAME, notOnOrAfterStr);
         }
 
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 acb12d8..1205c08 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
@@ -113,7 +113,7 @@ public class SubjectConfirmationImpl extends AbstractSAMLObject implements Subje
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (baseID != null) {
             children.add(baseID);
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 9724b79..e94ea1e 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
@@ -34,7 +34,7 @@ public class SubjectConfirmationMarshaller extends AbstractSAMLObjectMarshaller
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        SubjectConfirmation subjectConfirmation = (SubjectConfirmation) samlObject;
+        final SubjectConfirmation subjectConfirmation = (SubjectConfirmation) samlObject;
 
         if (subjectConfirmation.getMethod() != null) {
             domElement.setAttributeNS(null, SubjectConfirmation.METHOD_ATTRIB_NAME, subjectConfirmation.getMethod());
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 244cb33..98de850 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
@@ -96,7 +96,7 @@ public class SubjectImpl extends AbstractSAMLObject implements Subject {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (baseID != null) {
             children.add(baseID);
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 f0af429..b2df754 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
@@ -34,7 +34,7 @@ public class SubjectLocalityMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        SubjectLocality subjectLocality = (SubjectLocality) samlObject;
+        final 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/SubjectQueryImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/core/impl/SubjectQueryImpl.java
index e83c9b6..9253e0f 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
@@ -62,7 +62,7 @@ public abstract class SubjectQueryImpl extends RequestAbstractTypeImpl implement
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (super.getOrderedChildren() != null) {
             children.addAll(super.getOrderedChildren());
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 b5f6e63..a231bc6 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
@@ -34,7 +34,7 @@ public abstract class SubjectQueryUnmarshaller extends RequestAbstractTypeUnmars
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
-        SubjectQuery sq = (SubjectQuery) parentSAMLObject;
+        final SubjectQuery sq = (SubjectQuery) parentSAMLObject;
 
         if (childSAMLObject instanceof Subject) {
             sq.setSubject((Subject) childSAMLObject);
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 b59054c..42907e2 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
@@ -33,7 +33,7 @@ public class SubjectUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
-        Subject subject = (Subject) parentObject;
+        final Subject subject = (Subject) parentObject;
 
         if (childObject instanceof BaseID) {
             subject.setBaseID((BaseID) childObject);
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 e9ba466..b6217b8 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
@@ -31,7 +31,7 @@ public class RelayStateMarshaller extends XSStringMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        RelayState relayState = (RelayState) xmlObject;
+        final RelayState relayState = (RelayState) xmlObject;
         
         if (relayState.isSOAP11MustUnderstandXSBoolean() != null) {
             XMLObjectSupport.marshallAttribute(RelayState.SOAP11_MUST_UNDERSTAND_ATTR_NAME, 
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 ec4a88f..8d95e96 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
@@ -35,9 +35,9 @@ public class RelayStateUnmarshaller extends XSStringUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        RelayState relayState = (RelayState) xmlObject;
+        final RelayState relayState = (RelayState) xmlObject;
         
-        QName attrName = QNameSupport.getNodeQName(attribute);
+        final QName attrName = QNameSupport.getNodeQName(attribute);
         if (RelayState.SOAP11_MUST_UNDERSTAND_ATTR_NAME.equals(attrName)) {
             relayState.setSOAP11MustUnderstand(XSBooleanValue.valueOf(attribute.getValue()));
         } else if (RelayState.SOAP11_ACTOR_ATTR_NAME.equals(attrName)) {
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 5237303..b6dc4eb 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
@@ -31,7 +31,7 @@ public class RequestAuthenticatedMarshaller extends AbstractSAMLObjectMarshaller
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        RequestAuthenticated ra = (RequestAuthenticated) xmlObject;
+        final RequestAuthenticated ra = (RequestAuthenticated) xmlObject;
         
         if (ra.isSOAP11MustUnderstandXSBoolean() != null) {
             XMLObjectSupport.marshallAttribute(RequestAuthenticated.SOAP11_MUST_UNDERSTAND_ATTR_NAME, 
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 5b0a0b9..017f202 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
@@ -35,9 +35,9 @@ public class RequestAuthenticatedUnmarshaller extends AbstractSAMLObjectUnmarsha
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
-        RequestAuthenticated ra = (RequestAuthenticated) xmlObject;
+        final RequestAuthenticated ra = (RequestAuthenticated) xmlObject;
         
-        QName attrName = QNameSupport.getNodeQName(attribute);
+        final QName attrName = QNameSupport.getNodeQName(attribute);
         if (RequestAuthenticated.SOAP11_MUST_UNDERSTAND_ATTR_NAME.equals(attrName)) {
             ra.setSOAP11MustUnderstand(XSBooleanValue.valueOf(attribute.getValue()));
         } else if (RequestAuthenticated.SOAP11_ACTOR_ATTR_NAME.equals(attrName)) {
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 c836e1c..2c920d5 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
@@ -167,7 +167,7 @@ public class RequestImpl extends AbstractSAMLObject implements Request {
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         if (issuer!=null) {
             children.add(issuer);
         }
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 9165daf..2417042 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
@@ -31,7 +31,7 @@ public class RequestMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        Request request = (Request) xmlObject;
+        final Request request = (Request) xmlObject;
         
         if (request.getProviderName() != null) {
             domElement.setAttributeNS(null, Request.PROVIDER_NAME_ATTRIB_NAME, request.getProviderName());
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 748f349..dde0ca9 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
@@ -37,9 +37,9 @@ public class RequestUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
-        Request request = (Request) samlObject;
+        final Request request = (Request) samlObject;
         
-        QName attrName = QNameSupport.getNodeQName(attribute);
+        final QName attrName = QNameSupport.getNodeQName(attribute);
         if (Request.SOAP11_MUST_UNDERSTAND_ATTR_NAME.equals(attrName)) {
             request.setSOAP11MustUnderstand(XSBooleanValue.valueOf(attribute.getValue()));
         } else if (Request.SOAP11_ACTOR_ATTR_NAME.equals(attrName)) {
@@ -56,7 +56,7 @@ public class RequestUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
-        Request request = (Request) parentSAMLObject;
+        final Request request = (Request) parentSAMLObject;
         
         if (childSAMLObject instanceof Issuer) {
             request.setIssuer((Issuer) childSAMLObject);
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 0e96094..8ac8a45 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
@@ -31,7 +31,7 @@ public class ResponseMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        Response response = (Response) xmlObject;
+        final Response response = (Response) xmlObject;
         
         if (response.getAssertionConsumerServiceURL() != null) {
             domElement.setAttributeNS(null, Response.ASSERTION_CONSUMER_SERVICE_URL_ATTRIB_NAME,
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 e035b32..c85bae3 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
@@ -35,9 +35,9 @@ public class ResponseUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
-        Response response = (Response) samlObject;
+        final Response response = (Response) samlObject;
         
-        QName attrName = QNameSupport.getNodeQName(attribute);
+        final QName attrName = QNameSupport.getNodeQName(attribute);
         if (Response.SOAP11_MUST_UNDERSTAND_ATTR_NAME.equals(attrName)) {
             response.setSOAP11MustUnderstand(XSBooleanValue.valueOf(attribute.getValue()));
         } else if (Response.SOAP11_ACTOR_ATTR_NAME.equals(attrName)) {
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 8278cbd..6741082 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
@@ -124,7 +124,7 @@ public class SubjectConfirmationImpl extends AbstractSAMLObject implements Subje
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (subjectConfirmationData != null) {
             children.add(subjectConfirmationData);
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 aeec924..3f94f92 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
@@ -35,7 +35,7 @@ public class SubjectConfirmationMarshaller extends AbstractSAMLObjectMarshaller
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        SubjectConfirmation sc = (SubjectConfirmation) samlObject;
+        final SubjectConfirmation sc = (SubjectConfirmation) samlObject;
 
         if (sc.isSOAP11MustUnderstandXSBoolean() != null) {
             XMLObjectSupport.marshallAttribute(SubjectConfirmation.SOAP11_MUST_UNDERSTAND_ATTR_NAME, 
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 2ef7a98..da0feda 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
@@ -36,7 +36,7 @@ public class SubjectConfirmationUnmarshaller extends AbstractSAMLObjectUnmarshal
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
-        SubjectConfirmation sc = (SubjectConfirmation) parentObject;
+        final SubjectConfirmation sc = (SubjectConfirmation) parentObject;
 
         if (childObject instanceof SubjectConfirmationData) {
             sc.setSubjectConfirmationData((SubjectConfirmationData) childObject);
@@ -47,9 +47,9 @@ public class SubjectConfirmationUnmarshaller extends AbstractSAMLObjectUnmarshal
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
-        SubjectConfirmation sc = (SubjectConfirmation) samlObject;
+        final SubjectConfirmation sc = (SubjectConfirmation) samlObject;
 
-        QName attrName = QNameSupport.getNodeQName(attribute);
+        final QName attrName = QNameSupport.getNodeQName(attribute);
         if (SubjectConfirmation.SOAP11_MUST_UNDERSTAND_ATTR_NAME.equals(attrName)) {
             sc.setSOAP11MustUnderstand(XSBooleanValue.valueOf(attribute.getValue()));
         } else if (SubjectConfirmation.SOAP11_ACTOR_ATTR_NAME.equals(attrName)) {
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 8ddebcf..3c11f94 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
@@ -30,7 +30,7 @@ public class AdditionalMetadataLocationMarshaller extends AbstractSAMLObjectMars
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
-        AdditionalMetadataLocation aml = (AdditionalMetadataLocation) samlElement;
+        final AdditionalMetadataLocation aml = (AdditionalMetadataLocation) samlElement;
 
         if (aml.getNamespaceURI() != null) {
             domElement.setAttributeNS(null, AdditionalMetadataLocation.NAMESPACE_ATTRIB_NAME, aml.getNamespaceURI());
@@ -41,7 +41,7 @@ public class AdditionalMetadataLocationMarshaller extends AbstractSAMLObjectMars
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         super.marshallElementContent(samlObject, domElement);
 
-        AdditionalMetadataLocation aml = (AdditionalMetadataLocation) samlObject;
+        final AdditionalMetadataLocation aml = (AdditionalMetadataLocation) samlObject;
         if (aml.getLocationURI() != null) {
             domElement.appendChild(domElement.getOwnerDocument().createTextNode(aml.getLocationURI()));
         }
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 a4833cc..5eaf79b 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,8 @@ public class AffiliateMemberBuilder extends AbstractSAMLObjectBuilder<AffiliateM
     }
 
     /** {@inheritDoc} */
-    public AffiliateMember buildObject(final String namespaceURI, final String localName, final 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/AffiliateMemberMarshaller.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AffiliateMemberMarshaller.java
index 3f55f7f..1c60f62 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
@@ -34,7 +34,7 @@ public class AffiliateMemberMarshaller extends AbstractSAMLObjectMarshaller {
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
         super.marshallElementContent(samlObject, domElement);
 
-        AffiliateMember member = (AffiliateMember) samlObject;
+        final AffiliateMember member = (AffiliateMember) samlObject;
         if (member.getID() != null) {
             domElement.appendChild(domElement.getOwnerDocument().createTextNode(member.getID()));
         }
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 d416f92..4a2b6c2 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
@@ -28,7 +28,7 @@ public class AffiliateMemberUnmarshaller extends AbstractSAMLObjectUnmarshaller
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        AffiliateMember member = (AffiliateMember) samlObject;
+        final AffiliateMember member = (AffiliateMember) samlObject;
         member.setID(elementContent);
     }
 }
\ 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 4fe6917..27dbcf3 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
@@ -102,7 +102,7 @@ public class AffiliationDescriptorImpl extends AbstractSignableSAMLObject implem
     /** {@inheritDoc} */
     @Override
     public void setID(final String newID) {
-        String oldID = this.id;
+        final String oldID = this.id;
         this.id = prepareForAssignment(this.id, newID);
         registerOwnID(oldID, this.id);
     }
@@ -114,7 +114,7 @@ public class AffiliationDescriptorImpl extends AbstractSignableSAMLObject implem
             return true;
         }
 
-        DateTime now = new DateTime();
+        final DateTime now = new DateTime();
         return now.isBefore(validUntil);
     }
 
@@ -181,7 +181,7 @@ public class AffiliationDescriptorImpl extends AbstractSignableSAMLObject implem
     /** {@inheritDoc} */
     @Override
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if(getSignature() != null){
             children.add(getSignature());
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 cac006a..727c3c0 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
@@ -44,7 +44,7 @@ public class AffiliationDescriptorMarshaller extends AbstractSAMLObjectMarshalle
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
-        AffiliationDescriptor descriptor = (AffiliationDescriptor) samlElement;
+        final AffiliationDescriptor descriptor = (AffiliationDescriptor) samlElement;
 
         // Set affiliationOwnerID
         if (descriptor.getOwnerID() != null) {
@@ -60,14 +60,14 @@ public class AffiliationDescriptorMarshaller extends AbstractSAMLObjectMarshalle
         // Set the validUntil attribute
         if (descriptor.getValidUntil() != null) {
             log.debug("Writting validUntil attribute to AffiliationDescriptor DOM element");
-            String validUntilStr = SAMLConfigurationSupport.getSAMLDateFormatter().print(descriptor.getValidUntil());
+            final String validUntilStr = SAMLConfigurationSupport.getSAMLDateFormatter().print(descriptor.getValidUntil());
             domElement.setAttributeNS(null, TimeBoundSAMLObject.VALID_UNTIL_ATTRIB_NAME, validUntilStr);
         }
 
         // Set the cacheDuration attribute
         if (descriptor.getCacheDuration() != null) {
             log.debug("Writting cacheDuration attribute to AffiliationDescriptor DOM element");
-            String cacheDuration = DOMTypeSupport.longToDuration(descriptor.getCacheDuration());
+            final String cacheDuration = DOMTypeSupport.longToDuration(descriptor.getCacheDuration());
             domElement.setAttributeNS(null, CacheableSAMLObject.CACHE_DURATION_ATTRIB_NAME, cacheDuration);
         }
 
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 1233aa9..0289408 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
@@ -96,7 +96,7 @@ public class AttributeAuthorityDescriptorImpl extends RoleDescriptorImpl impleme
     
     /** {@inheritDoc} */
     public List<Endpoint> getEndpoints() {
-        List<Endpoint> endpoints = new ArrayList<>();
+        final List<Endpoint> endpoints = new ArrayList<>();
         endpoints.addAll(attributeServices);
         endpoints.addAll(assertionIDRequestServices);
         return Collections.unmodifiableList(endpoints);
@@ -115,7 +115,7 @@ public class AttributeAuthorityDescriptorImpl extends RoleDescriptorImpl impleme
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.addAll(super.getOrderedChildren());
         children.addAll(attributeServices);
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 5f75668..8d7bfbb 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
@@ -37,7 +37,7 @@ public class AttributeAuthorityDescriptorUnmarshaller extends RoleDescriptorUnma
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentElement, final XMLObject childElement) throws UnmarshallingException {
-        AttributeAuthorityDescriptor descriptor = (AttributeAuthorityDescriptor) parentElement;
+        final AttributeAuthorityDescriptor descriptor = (AttributeAuthorityDescriptor) parentElement;
 
         if (childElement instanceof AttributeService) {
             descriptor.getAttributeServices().add((AttributeService) childElement);
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 cd243af..c78a3fe 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
@@ -126,7 +126,7 @@ public class AttributeConsumingServiceImpl extends AbstractSAMLObject implements
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.addAll(serviceNames);
         children.addAll(serviceDescriptions);
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 6d11c54..d8ff223 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,8 +33,9 @@ import org.w3c.dom.Element;
 public class AttributeConsumingServiceMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
-    protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        AttributeConsumingService service = (AttributeConsumingService) samlObject;
+    protected void marshallAttributes(final XMLObject samlObject, final Element domElement)
+            throws MarshallingException {
+        final AttributeConsumingService service = (AttributeConsumingService) samlObject;
 
         domElement.setAttributeNS(null, AttributeConsumingService.INDEX_ATTRIB_NAME, Integer.toString(service
                 .getIndex()));
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 c365811..89af6d2 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
@@ -36,7 +36,7 @@ public class AttributeProfileMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        AttributeProfile profile = (AttributeProfile) samlObject;
+        final 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/AuthnAuthorityDescriptorImpl.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/AuthnAuthorityDescriptorImpl.java
index c30d3b2..f0fb8d3 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
@@ -76,7 +76,7 @@ public class AuthnAuthorityDescriptorImpl extends RoleDescriptorImpl implements
     
     /** {@inheritDoc} */
     public List<Endpoint> getEndpoints() {
-        List<Endpoint> endpoints = new ArrayList<>();
+        final List<Endpoint> endpoints = new ArrayList<>();
         endpoints.addAll(authnQueryServices);
         endpoints.addAll(assertionIDRequestServices);
         return Collections.unmodifiableList(endpoints);
@@ -95,7 +95,7 @@ public class AuthnAuthorityDescriptorImpl extends RoleDescriptorImpl implements
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.addAll(super.getOrderedChildren());
         children.addAll(authnQueryServices);
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 2eab297..a18957b 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
@@ -31,7 +31,7 @@ public class AuthnAuthorityDescriptorUnmarshaller extends RoleDescriptorUnmarsha
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentElement, final XMLObject childElement) throws UnmarshallingException {
-        AuthnAuthorityDescriptor descriptor = (AuthnAuthorityDescriptor) parentElement;
+        final AuthnAuthorityDescriptor descriptor = (AuthnAuthorityDescriptor) parentElement;
 
         if (childElement instanceof AuthnQueryService) {
             descriptor.getAuthnQueryServices().add((AuthnQueryService) childElement);
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 5bf5877..af1218d 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
@@ -36,7 +36,7 @@ public class CompanyMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        Company company = (Company) samlObject;
+        final Company company = (Company) samlObject;
 
         if (company.getName() != null) {
             ElementSupport.appendTextContent(domElement, company.getName());
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 2bea40c..02835c2 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
@@ -32,7 +32,7 @@ public class CompanyUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        Company company = (Company) samlObject;
+        final Company company = (Company) samlObject;
 
         company.setName(elementContent);
     }
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 e80dfeb..cd54e2f 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
@@ -161,7 +161,7 @@ public class ContactPersonImpl extends AbstractSAMLObject implements ContactPers
     /** {@inheritDoc} */
     @Override
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.add(extensions);
         children.add(company);
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 b0c499b..da8a2fc 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
@@ -34,7 +34,7 @@ public class ContactPersonMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        ContactPerson person = (ContactPerson) samlObject;
+        final ContactPerson person = (ContactPerson) samlObject;
 
         if (person.getType() != null) {
             domElement.setAttributeNS(null, ContactPerson.CONTACT_TYPE_ATTRIB_NAME, person.getType().toString());
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 e45cec3..33d705f 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
@@ -42,7 +42,7 @@ public class ContactPersonUnmarshaller extends AbstractSAMLObjectUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
-        ContactPerson person = (ContactPerson) parentSAMLObject;
+        final ContactPerson person = (ContactPerson) parentSAMLObject;
 
         if (childSAMLObject instanceof Extensions) {
             person.setExtensions((Extensions) childSAMLObject);
@@ -63,7 +63,7 @@ public class ContactPersonUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
-        ContactPerson person = (ContactPerson) samlObject;
+        final ContactPerson person = (ContactPerson) samlObject;
 
         if (attribute.getNamespaceURI() == null) {
             if (attribute.getLocalName().equals(ContactPerson.CONTACT_TYPE_ATTRIB_NAME)) {
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 bd032ed..6d29c0d 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
@@ -36,7 +36,7 @@ public class EmailAddressMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        EmailAddress address = (EmailAddress) samlObject;
+        final EmailAddress address = (EmailAddress) samlObject;
 
         if (address.getAddress() != null) {
             ElementSupport.appendTextContent(domElement, address.getAddress());
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 9b4e56e..ad2de6b 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
@@ -32,7 +32,7 @@ public class EmailAddressUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        EmailAddress address = (EmailAddress) samlObject;
+        final EmailAddress address = (EmailAddress) samlObject;
 
         address.setAddress(elementContent);
     }
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 4712735..880b221 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
@@ -29,7 +29,7 @@ public class EndpointMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     public void marshallAttributes(final XMLObject samlElement, final Element domElement) {
-        Endpoint endpoint = (Endpoint) samlElement;
+        final Endpoint endpoint = (Endpoint) samlElement;
 
         if (endpoint.getBinding() != null) {
             domElement.setAttributeNS(null, Endpoint.BINDING_ATTRIB_NAME, endpoint.getBinding().toString());
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 2591c72..54863b6 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
@@ -82,7 +82,7 @@ public class EntitiesDescriptorImpl extends AbstractSignableSAMLObject implement
 
     /** {@inheritDoc} */
     public void setID(final String newID) {
-        String oldID = this.id;
+        final String oldID = this.id;
         this.id = prepareForAssignment(this.id, newID);
         registerOwnID(oldID, this.id);
     }
@@ -93,7 +93,7 @@ public class EntitiesDescriptorImpl extends AbstractSignableSAMLObject implement
             return true;
         }
         
-        DateTime now = new DateTime();
+        final DateTime now = new DateTime();
         return now.isBefore(validUntil);
     }
 
@@ -144,7 +144,7 @@ public class EntitiesDescriptorImpl extends AbstractSignableSAMLObject implement
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if(getSignature() != null){
             children.add(getSignature());
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 7e4d665..732cc70 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
@@ -40,7 +40,7 @@ public class EntitiesDescriptorMarshaller extends AbstractSAMLObjectMarshaller {
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlElement, final Element domElement) {
 
-        EntitiesDescriptor entitiesDescriptor = (EntitiesDescriptor) samlElement;
+        final EntitiesDescriptor entitiesDescriptor = (EntitiesDescriptor) samlElement;
 
         // Set the ID attribute
         if (entitiesDescriptor.getID() != null) {
@@ -52,7 +52,7 @@ public class EntitiesDescriptorMarshaller extends AbstractSAMLObjectMarshaller {
         // Set the validUntil attribute
         if (entitiesDescriptor.getValidUntil() != null) {
             log.debug("Writting validUntil attribute to EntitiesDescriptor DOM element");
-            String validUntilStr =
+            final String validUntilStr =
                     SAMLConfigurationSupport.getSAMLDateFormatter().print(entitiesDescriptor.getValidUntil());
             domElement.setAttributeNS(null, TimeBoundSAMLObject.VALID_UNTIL_ATTRIB_NAME, validUntilStr);
         }
@@ -60,7 +60,7 @@ public class EntitiesDescriptorMarshaller extends AbstractSAMLObjectMarshaller {
         // Set the cacheDuration attribute
         if (entitiesDescriptor.getCacheDuration() != null) {
             log.debug("Writting cacheDuration attribute to EntitiesDescriptor DOM element");
-            String cacheDuration = DOMTypeSupport.longToDuration(entitiesDescriptor.getCacheDuration());
+            final String cacheDuration = DOMTypeSupport.longToDuration(entitiesDescriptor.getCacheDuration());
             domElement.setAttributeNS(null, CacheableSAMLObject.CACHE_DURATION_ATTRIB_NAME, cacheDuration);
         }
 
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 0f26aae..8584e61 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
@@ -115,7 +115,7 @@ public class EntityDescriptorImpl extends AbstractSignableSAMLObject implements
 
     /** {@inheritDoc} */
     public void setID(final String newID) {
-        String oldID = this.id;
+        final String oldID = this.id;
         this.id = prepareForAssignment(this.id, newID);
         registerOwnID(oldID, this.id);
     }
@@ -126,7 +126,7 @@ public class EntityDescriptorImpl extends AbstractSignableSAMLObject implements
             return true;
         }
 
-        DateTime now = new DateTime();
+        final DateTime now = new DateTime();
         return now.isBefore(validUntil);
     }
 
@@ -172,8 +172,8 @@ public class EntityDescriptorImpl extends AbstractSignableSAMLObject implements
 
     /** {@inheritDoc} */
     public List<RoleDescriptor> getRoleDescriptors(final QName type, final String supportedProtocol) {
-        ArrayList<RoleDescriptor> supportingRoleDescriptors = new ArrayList<>();
-        for (RoleDescriptor descriptor : roleDescriptors.subList(type)) {
+        final ArrayList<RoleDescriptor> supportingRoleDescriptors = new ArrayList<>();
+        for (final RoleDescriptor descriptor : roleDescriptors.subList(type)) {
             if (descriptor.isSupportedProtocol(supportedProtocol)) {
                 supportingRoleDescriptors.add(descriptor);
             }
@@ -184,7 +184,7 @@ public class EntityDescriptorImpl extends AbstractSignableSAMLObject implements
 
     /** {@inheritDoc} */
     public IDPSSODescriptor getIDPSSODescriptor(final String supportedProtocol) {
-        List<RoleDescriptor> descriptors = getRoleDescriptors(IDPSSODescriptor.DEFAULT_ELEMENT_NAME, supportedProtocol);
+        final List<RoleDescriptor> descriptors = getRoleDescriptors(IDPSSODescriptor.DEFAULT_ELEMENT_NAME, supportedProtocol);
         if (descriptors.size() > 0) {
             return (IDPSSODescriptor) descriptors.get(0);
         }
@@ -194,7 +194,7 @@ public class EntityDescriptorImpl extends AbstractSignableSAMLObject implements
 
     /** {@inheritDoc} */
     public SPSSODescriptor getSPSSODescriptor(final String supportedProtocol) {
-        List<RoleDescriptor> descriptors = getRoleDescriptors(SPSSODescriptor.DEFAULT_ELEMENT_NAME, supportedProtocol);
+        final List<RoleDescriptor> descriptors = getRoleDescriptors(SPSSODescriptor.DEFAULT_ELEMENT_NAME, supportedProtocol);
         if (descriptors.size() > 0) {
             return (SPSSODescriptor) descriptors.get(0);
         }
@@ -204,7 +204,7 @@ public class EntityDescriptorImpl extends AbstractSignableSAMLObject implements
 
     /** {@inheritDoc} */
     public AuthnAuthorityDescriptor getAuthnAuthorityDescriptor(final String supportedProtocol) {
-        List<RoleDescriptor> descriptors = getRoleDescriptors(AuthnAuthorityDescriptor.DEFAULT_ELEMENT_NAME,
+        final List<RoleDescriptor> descriptors = getRoleDescriptors(AuthnAuthorityDescriptor.DEFAULT_ELEMENT_NAME,
                 supportedProtocol);
         if (descriptors.size() > 0) {
             return (AuthnAuthorityDescriptor) descriptors.get(0);
@@ -215,7 +215,7 @@ public class EntityDescriptorImpl extends AbstractSignableSAMLObject implements
 
     /** {@inheritDoc} */
     public AttributeAuthorityDescriptor getAttributeAuthorityDescriptor(final String supportedProtocol) {
-        List<RoleDescriptor> descriptors = getRoleDescriptors(AttributeAuthorityDescriptor.DEFAULT_ELEMENT_NAME,
+        final List<RoleDescriptor> descriptors = getRoleDescriptors(AttributeAuthorityDescriptor.DEFAULT_ELEMENT_NAME,
                 supportedProtocol);
         if (descriptors.size() > 0) {
             return (AttributeAuthorityDescriptor) descriptors.get(0);
@@ -226,7 +226,7 @@ public class EntityDescriptorImpl extends AbstractSignableSAMLObject implements
 
     /** {@inheritDoc} */
     public PDPDescriptor getPDPDescriptor(final String supportedProtocol) {
-        List<RoleDescriptor> descriptors = getRoleDescriptors(PDPDescriptor.DEFAULT_ELEMENT_NAME, supportedProtocol);
+        final List<RoleDescriptor> descriptors = getRoleDescriptors(PDPDescriptor.DEFAULT_ELEMENT_NAME, supportedProtocol);
         if (descriptors.size() > 0) {
             return (PDPDescriptor) descriptors.get(0);
         }
@@ -278,7 +278,7 @@ public class EntityDescriptorImpl extends AbstractSignableSAMLObject implements
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (getSignature() != null) {
             children.add(getSignature());
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 f258045..30ddb5d 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
@@ -39,7 +39,7 @@ public class EntityDescriptorMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlElement, final Element domElement) {
-        EntityDescriptor entityDescriptor = (EntityDescriptor) samlElement;
+        final EntityDescriptor entityDescriptor = (EntityDescriptor) samlElement;
 
         // Set the entityID attribute
         if (entityDescriptor.getEntityID() != null) {
@@ -55,7 +55,7 @@ public class EntityDescriptorMarshaller extends AbstractSAMLObjectMarshaller {
         // Set the validUntil attribute
         if (entityDescriptor.getValidUntil() != null) {
             log.debug("Writting validUntil attribute to EntityDescriptor DOM element");
-            String validUntilStr =
+            final String validUntilStr =
                     SAMLConfigurationSupport.getSAMLDateFormatter().print(entityDescriptor.getValidUntil());
             domElement.setAttributeNS(null, TimeBoundSAMLObject.VALID_UNTIL_ATTRIB_NAME, validUntilStr);
         }
@@ -63,7 +63,7 @@ public class EntityDescriptorMarshaller extends AbstractSAMLObjectMarshaller {
         // Set the cacheDuration attribute
         if (entityDescriptor.getCacheDuration() != null) {
             log.debug("Writting cacheDuration attribute to EntityDescriptor DOM element");
-            String cacheDuration = DOMTypeSupport.longToDuration(entityDescriptor.getCacheDuration());
+            final String cacheDuration = DOMTypeSupport.longToDuration(entityDescriptor.getCacheDuration());
             domElement.setAttributeNS(null, CacheableSAMLObject.CACHE_DURATION_ATTRIB_NAME, cacheDuration);
         }
 
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 99822dd..6d71ffb 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
@@ -43,7 +43,7 @@ public class ExtensionsUnmarshaller extends AbstractSAMLObjectUnmarshaller {
      */
     protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
             throws UnmarshallingException {
-        Extensions extensions = (Extensions) parentXMLObject;
+        final Extensions extensions = (Extensions) parentXMLObject;
 
         extensions.getUnknownXMLObjects().add(childXMLObject);
     }
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 4153437..81706cb 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
@@ -36,7 +36,7 @@ public class GivenNameMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        GivenName name = (GivenName) samlObject;
+        final GivenName name = (GivenName) samlObject;
 
         if (name.getName() != null) {
             ElementSupport.appendTextContent(domElement, name.getName());
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 e31e1e5..f1bf296 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
@@ -32,7 +32,7 @@ public class GivenNameUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        GivenName name = (GivenName) samlObject;
+        final GivenName name = (GivenName) samlObject;
 
         name.setName(elementContent);
     }
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 fcf672b..20a1a75 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
@@ -133,7 +133,7 @@ public class IDPSSODescriptorImpl extends SSODescriptorImpl implements IDPSSODes
 
     /** {@inheritDoc} */
     public List<Endpoint> getEndpoints() {
-        List<Endpoint> endpoints = new ArrayList<>();
+        final List<Endpoint> endpoints = new ArrayList<>();
         endpoints.addAll(super.getEndpoints());
         endpoints.addAll(singleSignOnServices);
         endpoints.addAll(nameIDMappingServices);
@@ -156,7 +156,7 @@ public class IDPSSODescriptorImpl extends SSODescriptorImpl implements IDPSSODes
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.addAll(super.getOrderedChildren());
         children.addAll(singleSignOnServices);
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 32206b2..554a1cf 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
@@ -33,7 +33,7 @@ public class IDPSSODescriptorMarshaller extends SSODescriptorMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        IDPSSODescriptor descriptor = (IDPSSODescriptor) samlObject;
+        final IDPSSODescriptor descriptor = (IDPSSODescriptor) samlObject;
 
         if (descriptor.getWantAuthnRequestsSignedXSBoolean() != null) {
             domElement.setAttributeNS(null, IDPSSODescriptor.WANT_AUTHN_REQ_SIGNED_ATTRIB_NAME, descriptor
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 92e6014..52bb5cf 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
@@ -32,7 +32,7 @@ public class IndexedEndpointMarshaller extends EndpointMarshaller {
 
     /** {@inheritDoc} */
     public void marshallAttributes(final XMLObject samlObject, final Element domElement) {
-        IndexedEndpoint iEndpoint = (IndexedEndpoint) samlObject;
+        final IndexedEndpoint iEndpoint = (IndexedEndpoint) samlObject;
 
         if (iEndpoint.getIndex() != null) {
             domElement.setAttributeNS(null, IndexedEndpoint.INDEX_ATTRIB_NAME, iEndpoint.getIndex().toString());
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 5b87932..fbd1228 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
@@ -87,7 +87,7 @@ public class KeyDescriptorImpl extends AbstractSAMLObject implements KeyDescript
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.add(keyInfo);
         children.addAll(encryptionMethods);
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 4e05a9f..3096b4f 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
@@ -32,10 +32,10 @@ public class KeyDescriptorMarshaller extends AbstractSAMLObjectMarshaller {
     /** {@inheritDoc} */
     @Override
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        KeyDescriptor keyDescriptor = (KeyDescriptor) xmlObject;
+        final KeyDescriptor keyDescriptor = (KeyDescriptor) xmlObject;
 
         if (keyDescriptor.getUse() != null) {
-            UsageType use = keyDescriptor.getUse();
+            final UsageType use = keyDescriptor.getUse();
             // UsageType enum contains more values than are allowed by SAML 2 schema
             if (use.equals(UsageType.SIGNING) || use.equals(UsageType.ENCRYPTION)) {
                 domElement.setAttributeNS(null, KeyDescriptor.USE_ATTRIB_NAME, use.toString().toLowerCase());
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 a6e676f..64a3278 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
@@ -52,7 +52,7 @@ public class LocalizedNameImpl extends XSStringImpl implements LocalizedName {
 
     /** {@inheritDoc} */
     public void setXMLLang(final String newLang) {
-        boolean hasValue = newLang != null && !Strings.isNullOrEmpty(newLang);
+        final 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 4c2a104..e524406 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
@@ -38,10 +38,10 @@ public class LocalizedNameMarshaller extends AbstractSAMLObjectMarshaller {
      * {@inheritDoc}
      */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        LocalizedName name = (LocalizedName) samlObject;
+        final LocalizedName name = (LocalizedName) samlObject;
 
         if (name.getXMLLang() != null) {
-            Attr attribute = AttributeSupport.constructAttribute(domElement.getOwnerDocument(), XMLConstants.XML_NS,
+            final Attr attribute = AttributeSupport.constructAttribute(domElement.getOwnerDocument(), XMLConstants.XML_NS,
                     LangBearing.XML_LANG_ATTR_LOCAL_NAME, XMLConstants.XML_PREFIX);
             attribute.setValue(name.getXMLLang());
             domElement.setAttributeNodeNS(attribute);
@@ -50,7 +50,7 @@ public class LocalizedNameMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        LocalizedName name = (LocalizedName) samlObject;
+        final LocalizedName name = (LocalizedName) samlObject;
 
         if (name.getValue() != null) {
             ElementSupport.appendTextContent(domElement, name.getValue());
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 54f0d57..cadc77b 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
@@ -52,7 +52,7 @@ public class LocalizedURIImpl extends XSURIImpl implements LocalizedURI {
 
     /** {@inheritDoc} */
     public void setXMLLang(final String newLang) {
-        boolean hasValue = newLang != null && !Strings.isNullOrEmpty(newLang);
+        final 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 ba0d38a..5c86698 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
@@ -38,10 +38,10 @@ public class LocalizedURIMarshaller extends AbstractSAMLObjectMarshaller {
      * {@inheritDoc}
      */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        LocalizedURI name = (LocalizedURI) samlObject;
+        final LocalizedURI name = (LocalizedURI) samlObject;
 
         if (name.getXMLLang() != null) {
-            Attr attribute = AttributeSupport.constructAttribute(domElement.getOwnerDocument(), XMLConstants.XML_NS,
+            final Attr attribute = AttributeSupport.constructAttribute(domElement.getOwnerDocument(), XMLConstants.XML_NS,
                     LangBearing.XML_LANG_ATTR_LOCAL_NAME, XMLConstants.XML_PREFIX);
             attribute.setValue(name.getXMLLang());
             domElement.setAttributeNodeNS(attribute);
@@ -50,7 +50,7 @@ public class LocalizedURIMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        LocalizedURI name = (LocalizedURI) samlObject;
+        final LocalizedURI name = (LocalizedURI) samlObject;
 
         if (name.getValue() != null) {
             ElementSupport.appendTextContent(domElement, name.getValue());
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 e6df7ba..41b9aab 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
@@ -36,7 +36,7 @@ public class NameIDFormatMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        NameIDFormat format = (NameIDFormat) samlObject;
+        final NameIDFormat format = (NameIDFormat) samlObject;
 
         if (format.getFormat() != null) {
             ElementSupport.appendTextContent(domElement, format.getFormat());
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 61ddeb2..1fb900a 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
@@ -32,7 +32,7 @@ public class NameIDFormatUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        NameIDFormat format = (NameIDFormat) samlObject;
+        final NameIDFormat format = (NameIDFormat) samlObject;
 
         format.setFormat(elementContent);
     }
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 bfb2211..bbe5262 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
@@ -108,7 +108,7 @@ public class OrganizationImpl extends AbstractSAMLObject implements Organization
     /** {@inheritDoc} */
     @Override
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.add(extensions);
         children.addAll(names);
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 ffb4276..cfa57f8 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
@@ -36,7 +36,7 @@ public class OrganizationMarshaller extends AbstractSAMLObjectMarshaller {
      * {@inheritDoc}
      */
     protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
-        Organization org = (Organization) xmlObject;
+        final Organization org = (Organization) xmlObject;
 
         marshallUnknownAttributes(org, domElement);
     }
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 61bc667..665863a 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
@@ -80,7 +80,7 @@ public class PDPDescriptorImpl extends RoleDescriptorImpl implements PDPDescript
     
     /** {@inheritDoc} */
     public List<Endpoint> getEndpoints() {
-        List<Endpoint> endpoints = new ArrayList<>();
+        final List<Endpoint> endpoints = new ArrayList<>();
         endpoints.addAll(authzServices);
         endpoints.addAll(assertionIDRequestServices);
         return Collections.unmodifiableList(endpoints);
@@ -99,7 +99,7 @@ public class PDPDescriptorImpl extends RoleDescriptorImpl implements PDPDescript
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.addAll(super.getOrderedChildren());
         children.addAll(authzServices);
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 29f7b68..7b37755 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
@@ -36,7 +36,7 @@ public class PDPDescriptorUnmarshaller extends RoleDescriptorUnmarshaller {
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject)
             throws UnmarshallingException {
-        PDPDescriptor descriptor = (PDPDescriptor) parentSAMLObject;
+        final PDPDescriptor descriptor = (PDPDescriptor) parentSAMLObject;
 
         if (childSAMLObject instanceof AuthzService) {
             descriptor.getAuthzServices().add((AuthzService) childSAMLObject);
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 2411e7c..e26de8d 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
@@ -34,7 +34,7 @@ public class RequestedAttributeMarshaller extends AttributeMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        RequestedAttribute requestedAttribute = (RequestedAttribute) samlObject;
+        final RequestedAttribute requestedAttribute = (RequestedAttribute) samlObject;
 
         if (requestedAttribute.isRequiredXSBoolean() != null) {
             domElement.setAttributeNS(null, RequestedAttribute.IS_REQUIRED_ATTRIB_NAME, requestedAttribute
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 77d9f7e..6a040d8 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
@@ -93,7 +93,7 @@ public abstract class RoleDescriptorImpl extends AbstractSignableSAMLObject impl
     /** {@inheritDoc} */
     @Override
     public void setID(final String newID) {
-        String oldID = this.id;
+        final String oldID = this.id;
         this.id = prepareForAssignment(this.id, newID);
         registerOwnID(oldID, this.id);
     }
@@ -105,7 +105,7 @@ public abstract class RoleDescriptorImpl extends AbstractSignableSAMLObject impl
             return true;
         }
         
-        DateTime now = new DateTime();
+        final DateTime now = new DateTime();
         return now.isBefore(validUntil);
     }
 
@@ -168,7 +168,7 @@ public abstract class RoleDescriptorImpl extends AbstractSignableSAMLObject impl
     /** {@inheritDoc} */
     @Override
     public void removeSupportedProtocols(final Collection<String> protocols) {
-        for (String protocol : protocols) {
+        for (final String protocol : protocols) {
             removeSupportedProtocol(protocol);
         }
     }
@@ -243,7 +243,7 @@ public abstract class RoleDescriptorImpl extends AbstractSignableSAMLObject impl
     /** {@inheritDoc} */
     @Override
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         if (getSignature() != null) {
             children.add(getSignature());
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 c11f4b9..61a1781 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
@@ -42,7 +42,7 @@ public abstract class RoleDescriptorMarshaller extends AbstractSAMLObjectMarshal
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
-        RoleDescriptor roleDescriptor = (RoleDescriptor) samlElement;
+        final RoleDescriptor roleDescriptor = (RoleDescriptor) samlElement;
 
         // Set the ID attribute
         if (roleDescriptor.getID() != null) {
@@ -54,7 +54,7 @@ public abstract class RoleDescriptorMarshaller extends AbstractSAMLObjectMarshal
         // Set the validUntil attribute
         if (roleDescriptor.getValidUntil() != null) {
             log.trace("Writting validUntil attribute to RoleDescriptor DOM element");
-            String validUntilStr =
+            final String validUntilStr =
                     SAMLConfigurationSupport.getSAMLDateFormatter().print(roleDescriptor.getValidUntil());
             domElement.setAttributeNS(null, TimeBoundSAMLObject.VALID_UNTIL_ATTRIB_NAME, validUntilStr);
         }
@@ -62,17 +62,17 @@ public abstract class RoleDescriptorMarshaller extends AbstractSAMLObjectMarshal
         // Set the cacheDuration attribute
         if (roleDescriptor.getCacheDuration() != null) {
             log.trace("Writting cacheDuration attribute to EntitiesDescriptor DOM element");
-            String cacheDuration = DOMTypeSupport.longToDuration(roleDescriptor.getCacheDuration());
+            final String cacheDuration = DOMTypeSupport.longToDuration(roleDescriptor.getCacheDuration());
             domElement.setAttributeNS(null, CacheableSAMLObject.CACHE_DURATION_ATTRIB_NAME, cacheDuration);
         }
 
         // Set the protocolSupportEnumeration attribute
-        List<String> supportedProtocols = roleDescriptor.getSupportedProtocols();
+        final List<String> supportedProtocols = roleDescriptor.getSupportedProtocols();
         if (supportedProtocols != null && supportedProtocols.size() > 0) {
             log.trace("Writting protocolSupportEnumberation attribute to RoleDescriptor DOM element");
 
-            StringBuilder builder = new StringBuilder();
-            for (String protocol : supportedProtocols) {
+            final StringBuilder builder = new StringBuilder();
+            for (final String protocol : supportedProtocols) {
                 builder.append(protocol);
                 builder.append(" ");
             }
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 aaab6d7..b8469fe 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
@@ -77,7 +77,7 @@ public abstract class RoleDescriptorUnmarshaller extends AbstractSAMLObjectUnmar
             } else if (attribute.getLocalName().equals(CacheableSAMLObject.CACHE_DURATION_ATTRIB_NAME)) {
                 roleDescriptor.setCacheDuration(DOMTypeSupport.durationToLong(attribute.getValue()));
             } else if (attribute.getLocalName().equals(RoleDescriptor.PROTOCOL_ENUMERATION_ATTRIB_NAME)) {
-                StringTokenizer protocolTokenizer = new StringTokenizer(attribute.getValue(), " ");
+                final StringTokenizer protocolTokenizer = new StringTokenizer(attribute.getValue(), " ");
                 while (protocolTokenizer.hasMoreTokens()) {
                     roleDescriptor.addSupportedProtocol(protocolTokenizer.nextToken());
                 }
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 a911937..4c0181c 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
@@ -138,14 +138,14 @@ public class SPSSODescriptorImpl extends SSODescriptorImpl implements SPSSODescr
     
     /** {@inheritDoc} */
     public AttributeConsumingService getDefaultAttributeConsumingService(){
-        AttributeConsumingServiceSelector selector = new AttributeConsumingServiceSelector();
+        final AttributeConsumingServiceSelector selector = new AttributeConsumingServiceSelector();
         selector.setRoleDescriptor(this);
         return selector.selectService();
     }
     
     /** {@inheritDoc} */
     public List<Endpoint> getEndpoints() {
-        List<Endpoint> endpoints = new ArrayList<>();
+        final List<Endpoint> endpoints = new ArrayList<>();
         endpoints.addAll(super.getEndpoints());
         endpoints.addAll(assertionConsumerServices);
         return Collections.unmodifiableList(endpoints);
@@ -162,7 +162,7 @@ public class SPSSODescriptorImpl extends SSODescriptorImpl implements SPSSODescr
 
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
 
         children.addAll(super.getOrderedChildren());
         children.addAll(assertionConsumerServices);
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 427bddb..7cffd42 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
@@ -33,7 +33,7 @@ public class SPSSODescriptorMarshaller extends SSODescriptorMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallAttributes(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        SPSSODescriptor descriptor = (SPSSODescriptor) samlObject;
+        final SPSSODescriptor descriptor = (SPSSODescriptor) samlObject;
 
         if (descriptor.isAuthnRequestsSignedXSBoolean() != null) {
             domElement.setAttributeNS(null, SPSSODescriptor.AUTH_REQUESTS_SIGNED_ATTRIB_NAME, descriptor
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 aca4286..0e147bc 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
@@ -96,7 +96,7 @@ public abstract class SSODescriptorImpl extends RoleDescriptorImpl implements SS
     
     /** {@inheritDoc} */
     public List<Endpoint> getEndpoints() {
-        List<Endpoint> endpoints = new ArrayList<>();
+        final List<Endpoint> endpoints = new ArrayList<>();
         endpoints.addAll(artifactResolutionServices);
         endpoints.addAll(singleLogoutServices);
         endpoints.addAll(manageNameIDServices);
@@ -118,7 +118,7 @@ public abstract class SSODescriptorImpl extends RoleDescriptorImpl implements SS
     
     /** {@inheritDoc} */
     public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<>();
+        final ArrayList<XMLObject> children = new ArrayList<>();
         
         children.addAll(super.getOrderedChildren());
         children.addAll(artifactResolutionServices);
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 47b5939..a32f729 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
@@ -32,7 +32,7 @@ public abstract class SSODescriptorUnmarshaller extends RoleDescriptorUnmarshall
 
     /** {@inheritDoc} */
     protected void processChildElement(final XMLObject parentElement, final XMLObject childElement) throws UnmarshallingException {
-        SSODescriptor descriptor = (SSODescriptor) parentElement;
+        final SSODescriptor descriptor = (SSODescriptor) parentElement;
         if (childElement instanceof ArtifactResolutionService) {
             descriptor.getArtifactResolutionServices().add((ArtifactResolutionService) childElement);
         } else if (childElement instanceof SingleLogoutService) {
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 e92422f..10b7578 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
@@ -36,7 +36,7 @@ public class SurNameMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        SurName name = (SurName) samlObject;
+        final SurName name = (SurName) samlObject;
 
         if (name.getName() != null) {
             ElementSupport.appendTextContent(domElement, name.getName());
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 4164ca6..b5c280c 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
@@ -32,7 +32,7 @@ public class SurNameUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        SurName name = (SurName) samlObject;
+        final SurName name = (SurName) samlObject;
 
         name.setName(elementContent);
     }
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 86750e6..6f1607a 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
@@ -36,7 +36,7 @@ public class TelephoneNumberMarshaller extends AbstractSAMLObjectMarshaller {
 
     /** {@inheritDoc} */
     protected void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
-        TelephoneNumber number = (TelephoneNumber) samlObject;
+        final TelephoneNumber number = (TelephoneNumber) samlObject;
 
         if (number.getNumber() != null) {
             ElementSupport.appendTextContent(domElement, number.getNumber());
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 8f8c7aa..f9f474b 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
@@ -32,7 +32,7 @@ public class TelephoneNumberUnmarshaller extends AbstractSAMLObjectUnmarshaller
 
     /** {@inheritDoc} */
     protected void processElementContent(final XMLObject samlObject, final String elementContent) {
-        TelephoneNumber number = (TelephoneNumber) samlObject;
+        final TelephoneNumber number = (TelephoneNumber) samlObject;
 
         number.setNumber(elementContent);
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AbstractEncryptAction.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AbstractEncryptAction.java
index 9897636..11d76ce 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AbstractEncryptAction.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AbstractEncryptAction.java
@@ -198,11 +198,11 @@ public abstract class AbstractEncryptAction extends AbstractConditionalProfileAc
                 log.debug("{} Resolved self-encryption recipient value: {}", getLogPrefix(), selfRecipient);
             }
             if (encryptToSelfParametersStrategy != null) {
-                List<EncryptionParameters> selfParams = encryptToSelfParametersStrategy.apply(
+                final List<EncryptionParameters> selfParams = encryptToSelfParametersStrategy.apply(
                         new Pair<ProfileRequestContext, EncryptionParameters>(profileRequestContext, params));
                 if (selfParams != null && !selfParams.isEmpty()) {
                     log.debug("{} Saw {} self-encryption parameters", getLogPrefix(), selfParams.size());
-                    for (EncryptionParameters selfParam : selfParams) {
+                    for (final EncryptionParameters selfParam : selfParams) {
                         keyParams.add(new KeyEncryptionParameters(selfParam, selfRecipient));
                     }
                 } else {
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 bc14948..caaec03 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
@@ -300,7 +300,7 @@ public class AddStatusToResponse extends AbstractProfileAction {
             Constraint.isNotNull(mappings, "Status code mappings cannot be null");
             
             codeMappings = new HashMap<>(mappings.size());
-            for (Map.Entry<String,List<String>> entry : mappings.entrySet()) {
+            for (final Map.Entry<String,List<String>> entry : mappings.entrySet()) {
                 final String event = StringSupport.trimOrNull(entry.getKey());
                 if (event != null && entry.getValue() != null) {
                     codeMappings.put(event, new ArrayList<>(Collections2.filter(entry.getValue(),
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 9f55128..9370b7b 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
@@ -147,7 +147,7 @@ public class DefaultSAML20AssertionValidationContextBuilder
     @Nonnull protected Map<String,Object> buildStaticParameters(
             @Nonnull final SAML20AssertionTokenValidationInput input) {
         
-        HashMap<String, Object> staticParams = new HashMap<>();
+        final HashMap<String, Object> staticParams = new HashMap<>();
         
         //For signature validation
         staticParams.put(SAML2AssertionValidationParameters.SIGNATURE_REQUIRED, new Boolean(isSignatureRequired()));
@@ -155,11 +155,11 @@ public class DefaultSAML20AssertionValidationContextBuilder
                 getSignatureCriteriaSet(input));
         
         // For HoK subject confirmation
-        X509Certificate attesterCertificate = getAttesterCertificate(input);
+        final X509Certificate attesterCertificate = getAttesterCertificate(input);
         if (attesterCertificate != null) {
             staticParams.put(SAML2AssertionValidationParameters.SC_HOK_PRESENTER_CERT, attesterCertificate);
         }
-        PublicKey attesterPublicKey = getAttesterPublicKey(input);
+        final PublicKey attesterPublicKey = getAttesterPublicKey(input);
         if (attesterPublicKey != null) {
             staticParams.put(SAML2AssertionValidationParameters.SC_HOK_PRESENTER_KEY, attesterPublicKey);
         }
@@ -192,10 +192,10 @@ public class DefaultSAML20AssertionValidationContextBuilder
      * @return the criteria set based on the message context data
      */
     @Nonnull protected CriteriaSet getSignatureCriteriaSet(@Nonnull final SAML20AssertionTokenValidationInput input) {
-        CriteriaSet criteriaSet = new CriteriaSet();
+        final CriteriaSet criteriaSet = new CriteriaSet();
         
         if (getSignatureCriteriaSetFunction() != null) {
-            CriteriaSet dynamicCriteria = getSignatureCriteriaSetFunction().apply(
+            final CriteriaSet dynamicCriteria = getSignatureCriteriaSetFunction().apply(
                     new Pair<MessageContext, Assertion>());
             if (dynamicCriteria != null) {
                 criteriaSet.addAll(dynamicCriteria);
@@ -238,7 +238,7 @@ public class DefaultSAML20AssertionValidationContextBuilder
     @Nullable protected X509Certificate getAttesterCertificate(
             @Nonnull final SAML20AssertionTokenValidationInput input) {
         try {
-            X509Credential credential = new ServletRequestX509CredentialAdapter(input.getHttpServletRequest());
+            final X509Credential credential = new ServletRequestX509CredentialAdapter(input.getHttpServletRequest());
             return ((X509Credential)credential).getEntityCertificate();
         } catch (final SecurityException e) {
             log.warn("Peer TLS X.509 certificate was not present. " 
@@ -283,12 +283,12 @@ public class DefaultSAML20AssertionValidationContextBuilder
      * @return set of recipient endpoint URI's
      */
     @Nonnull protected Set<String> getValidRecipients(@Nonnull final SAML20AssertionTokenValidationInput input) {
-        LazySet<String> validRecipients = new LazySet<>();
+        final LazySet<String> validRecipients = new LazySet<>();
         
-        String endpoint = input.getHttpServletRequest().getRequestURL().toString();
+        final String endpoint = input.getHttpServletRequest().getRequestURL().toString();
         validRecipients.add(endpoint);
         
-        SAMLSelfEntityContext selfContext = input.getMessageContext().getSubcontext(SAMLSelfEntityContext.class);
+        final SAMLSelfEntityContext selfContext = input.getMessageContext().getSubcontext(SAMLSelfEntityContext.class);
         if (selfContext != null && selfContext.getEntityId() != null) {
             validRecipients.add(selfContext.getEntityId());
         }
@@ -312,9 +312,9 @@ public class DefaultSAML20AssertionValidationContextBuilder
      */
     @Nonnull protected Set<InetAddress> getValidAddresses(@Nonnull final SAML20AssertionTokenValidationInput input) {
         try {
-            LazySet<InetAddress> validAddresses = new LazySet<>();
+            final LazySet<InetAddress> validAddresses = new LazySet<>();
             InetAddress[] addresses = null;
-            String attesterIPAddress = getAttesterIPAddress(input);
+            final String attesterIPAddress = getAttesterIPAddress(input);
             log.debug("Saw attester IP address: {}", attesterIPAddress);
             if (attesterIPAddress != null) {
                 addresses = InetAddress.getAllByName(attesterIPAddress);
@@ -359,9 +359,9 @@ public class DefaultSAML20AssertionValidationContextBuilder
      * @return set of audience URI's
      */
     @Nonnull protected Set<String> getValidAudiences(@Nonnull final SAML20AssertionTokenValidationInput input) {
-        LazySet<String> validAudiences = new LazySet<>();
+        final LazySet<String> validAudiences = new LazySet<>();
         
-        SAMLSelfEntityContext selfContext = input.getMessageContext().getSubcontext(SAMLSelfEntityContext.class);
+        final SAMLSelfEntityContext selfContext = input.getMessageContext().getSubcontext(SAMLSelfEntityContext.class);
         if (selfContext != null && selfContext.getEntityId() != null) {
             validAudiences.add(selfContext.getEntityId());
         }
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 368f46f..505fb4e 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
@@ -246,16 +246,16 @@ public class WSSecuritySAML20AssertionTokenSecurityHandler extends AbstractMessa
             return;
         }
         
-        List<Assertion> assertions = resolveAssertions(messageContext);
+        final List<Assertion> assertions = resolveAssertions(messageContext);
         if (assertions == null || assertions.isEmpty()) {
             log.info("Inbound SOAP envelope contained no Assertion tokens. Skipping further processing");
             return;
         }
         
-        WSSecurityContext wsContext = messageContext.getSubcontext(WSSecurityContext.class, true);
+        final WSSecurityContext wsContext = messageContext.getSubcontext(WSSecurityContext.class, true);
         
-        for (Assertion assertion : assertions) {
-            SAML20AssertionValidator validator = resolveValidator(messageContext, assertion);
+        for (final Assertion assertion : assertions) {
+            final SAML20AssertionValidator validator = resolveValidator(messageContext, assertion);
             if (validator == null) {
                 log.warn("No SAML20AssertionValidator was available, terminating");
                 SOAPMessagingSupport.registerSOAP11Fault(messageContext, FaultCode.SERVER, 
@@ -263,11 +263,11 @@ public class WSSecuritySAML20AssertionTokenSecurityHandler extends AbstractMessa
                 throw new MessageHandlerException("No SAML20AssertionValidator was available");
             }
         
-            ValidationContext validationContext = buildValidationContext(messageContext, assertion);
+            final ValidationContext validationContext = buildValidationContext(messageContext, assertion);
             
             try { 
-                ValidationResult validationResult = validator.validate(assertion, validationContext);
-                SAML20AssertionToken token = new SAML20AssertionToken(assertion);
+                final ValidationResult validationResult = validator.validate(assertion, validationContext);
+                final SAML20AssertionToken token = new SAML20AssertionToken(assertion);
                 processResult(validationContext, validationResult, token, messageContext);
                 wsContext.getTokens().add(token);
             } catch (final AssertionValidationException e) {
@@ -356,7 +356,7 @@ public class WSSecuritySAML20AssertionTokenSecurityHandler extends AbstractMessa
         
         if (getAssertionValidatorLookup() != null) {
             log.debug("Attempting to resolve SAML 2 Assertion validator via lookup function");
-            SAML20AssertionValidator validator = getAssertionValidatorLookup().apply(
+            final SAML20AssertionValidator validator = getAssertionValidatorLookup().apply(
                     new Pair<>(messageContext, assertion));
             if (validator != null) {
                 log.debug("Resolved SAML 2 Assertion validator via lookup function");
@@ -386,7 +386,7 @@ public class WSSecuritySAML20AssertionTokenSecurityHandler extends AbstractMessa
     @Nonnull protected ValidationContext buildValidationContext(@Nonnull final MessageContext messageContext, 
             @Nonnull final Assertion assertion) throws MessageHandlerException {
         
-        ValidationContext validationContext = getValidationContextBuilder().apply(
+        final ValidationContext validationContext = getValidationContextBuilder().apply(
                 new SAML20AssertionTokenValidationInput(messageContext, getHttpServletRequest(), assertion));
         
         if (validationContext == null) {
@@ -407,21 +407,21 @@ public class WSSecuritySAML20AssertionTokenSecurityHandler extends AbstractMessa
      * @return the list of resolved Assertions, or an empty list
      */
     @Nonnull protected List<Assertion> resolveAssertions(@Nonnull final MessageContext messageContext) {
-        List<XMLObject> securityHeaders = SOAPMessagingSupport.getInboundHeaderBlock(messageContext,
+        final List<XMLObject> securityHeaders = SOAPMessagingSupport.getInboundHeaderBlock(messageContext,
                 Security.ELEMENT_NAME);
         if (securityHeaders == null || securityHeaders.isEmpty()) {
             log.debug("No WS-Security Security header found in inbound SOAP message. Skipping further processing.");
             return Collections.emptyList();
         }
         
-        LazyList<Assertion> assertions = new LazyList<>();
+        final LazyList<Assertion> assertions = new LazyList<>();
         
         // There could be multiple Security headers targeted to this node, so process all of them
-        for (XMLObject header : securityHeaders) {
-            Security securityHeader = (Security) header;
-            List<XMLObject> xmlObjects = securityHeader.getUnknownXMLObjects(Assertion.DEFAULT_ELEMENT_NAME);
+        for (final XMLObject header : securityHeaders) {
+            final Security securityHeader = (Security) header;
+            final List<XMLObject> xmlObjects = securityHeader.getUnknownXMLObjects(Assertion.DEFAULT_ELEMENT_NAME);
             if (xmlObjects != null && !xmlObjects.isEmpty()) {
-                for (XMLObject xmlObject : xmlObjects) {
+                for (final XMLObject xmlObject : xmlObjects) {
                     assertions.add((Assertion) xmlObject);
                 }
             }
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 cc8c580..6a9e190 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
@@ -98,27 +98,27 @@ public class InlineSelfEncryptionParametersStrategy
             return Collections.emptyList();
         }
         
-        List<Credential> credentials = resolveCredentials(input.getFirst());
+        final List<Credential> credentials = resolveCredentials(input.getFirst());
         if (credentials.isEmpty()) {
             log.debug("No self-encryption credentials were resolved, skipping further processing");
             return Collections.emptyList();
         }
         log.debug("Resolved {} self-encryption credentials", credentials.size());
         
-        List<EncryptionConfiguration> baseConfigs = resolveBaseConfigurations(input.getFirst());
+        final List<EncryptionConfiguration> baseConfigs = resolveBaseConfigurations(input.getFirst());
         log.debug("Resolved {} base EncryptionConfigurations", baseConfigs.size());
         
-        ArrayList<EncryptionParameters> encParams = new ArrayList<>();
+        final ArrayList<EncryptionParameters> encParams = new ArrayList<>();
         
-        for (Credential cred : credentials) {
-            BasicEncryptionConfiguration selfConfig = new BasicEncryptionConfiguration();
+        for (final Credential cred : credentials) {
+            final BasicEncryptionConfiguration selfConfig = new BasicEncryptionConfiguration();
             selfConfig.setKeyTransportEncryptionCredentials(Collections.singletonList(cred));
             if (input.getSecond() != null && input.getSecond().getDataEncryptionAlgorithm() != null) {
                 selfConfig.setDataEncryptionAlgorithms(Collections.singletonList(
                         input.getSecond().getDataEncryptionAlgorithm()));
             }
             
-            ArrayList<EncryptionConfiguration> configs = new ArrayList<>();
+            final ArrayList<EncryptionConfiguration> configs = new ArrayList<>();
             configs.add(selfConfig);
             configs.addAll(baseConfigs);
             
@@ -146,7 +146,7 @@ public class InlineSelfEncryptionParametersStrategy
     @Nonnull protected List<Credential> resolveCredentials(
             @Nonnull final ProfileRequestContext profileRequestContext) {
         try {
-            ArrayList<Credential> credentials = new ArrayList<>();
+            final ArrayList<Credential> credentials = new ArrayList<>();
             Iterables.addAll(credentials, credentialResolver.resolve(
                     new CriteriaSet(new UsageCriterion(UsageType.ENCRYPTION))));
             return credentials;
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 7ba19c9..f633433 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
@@ -77,15 +77,15 @@ public class SAMLSignatureProfileValidator implements SignaturePrevalidator {
             log.error("SignatureImpl did not contain the an Apache XMLSignature child");
             throw new SignatureException("Apache XMLSignature does not exist on SignatureImpl");
         }
-        XMLSignature apacheSig = sigImpl.getXMLSignature();
+        final XMLSignature apacheSig = sigImpl.getXMLSignature();
 
         if (!(sigImpl.getParent() instanceof SignableSAMLObject)) {
             log.error("Signature is not an immedidate child of a SignableSAMLObject");
             throw new SignatureException("Signature is not an immediate child of a SignableSAMLObject.");
         }
-        SignableSAMLObject signableObject = (SignableSAMLObject) sigImpl.getParent();
+        final SignableSAMLObject signableObject = (SignableSAMLObject) sigImpl.getParent();
 
-        Reference ref = validateReference(apacheSig);
+        final Reference ref = validateReference(apacheSig);
 
         validateReferenceURI(ref.getURI(), signableObject);
 
@@ -105,7 +105,7 @@ public class SAMLSignatureProfileValidator implements SignaturePrevalidator {
      *             obtaining the Reference instance
      */
     protected Reference validateReference(final XMLSignature apacheSig) throws SignatureException {
-        int numReferences = apacheSig.getSignedInfo().getLength();
+        final int numReferences = apacheSig.getSignedInfo().getLength();
         if (numReferences != 1) {
             log.error("Signature SignedInfo had invalid number of References: " + numReferences);
             throw new SignatureException("Signature SignedInfo must have exactly 1 Reference element");
@@ -137,23 +137,23 @@ public class SAMLSignatureProfileValidator implements SignaturePrevalidator {
      * @throws SignatureException  if the URI is invalid or doesn't resolve to the expected DOM node
      */
     protected void validateReferenceURI(final String uri, final SignableSAMLObject signableObject) throws SignatureException {
-        String id = signableObject.getSignatureReferenceID();
+        final String id = signableObject.getSignatureReferenceID();
         validateReferenceURI(uri, id);
         
         if (Strings.isNullOrEmpty(uri)) {
             return;
         }
         
-        String uriID = uri.substring(1);
+        final String uriID = uri.substring(1);
         
-        Element expected = signableObject.getDOM();
+        final Element expected = signableObject.getDOM();
         if (expected == null) {
             log.error("SignableSAMLObject does not have a cached DOM Element.");
             throw new SignatureException("SignableSAMLObject does not have a cached DOM Element.");
         }
-        Document doc = expected.getOwnerDocument();
+        final Document doc = expected.getOwnerDocument();
         
-        Element resolved = IdResolver.getElementById(doc, uriID);
+        final Element resolved = IdResolver.getElementById(doc, uriID);
         if (resolved == null) {
             log.error("Apache xmlsec IdResolver could not resolve the Element for id reference: {}", uriID);
             throw new SignatureException("Apache xmlsec IdResolver could not resolve the Element for id reference: "
@@ -215,7 +215,7 @@ public class SAMLSignatureProfileValidator implements SignaturePrevalidator {
             throw new SignatureException("Transforms instance was null");
         }
 
-        int numTransforms = transforms.getLength();
+        final int numTransforms = transforms.getLength();
         if (numTransforms > 2) {
             log.error("Invalid number of Transforms was present: " + numTransforms);
             throw new SignatureException("Invalid number of transforms");
@@ -230,7 +230,7 @@ public class SAMLSignatureProfileValidator implements SignaturePrevalidator {
                 log.error("Error obtaining transform instance", e);
                 throw new SignatureException("Error obtaining transform instance", e);
             }
-            String uri = transform.getURI();
+            final String uri = transform.getURI();
             if (Transforms.TRANSFORM_ENVELOPED_SIGNATURE.equals(uri)) {
                 log.debug("Saw Enveloped signature transform");
                 sawEnveloped = true;

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


More information about the commits mailing list