[java-opensaml] branch main updated: JSPT-98 Integrate lifecycle checking methods in base classes

Rod Widdowson rdw at steadingsoftware.com
Sat Jul 16 10:30:53 UTC 2022


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

rdw pushed a commit to branch main
in repository java-opensaml.

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

The following commit(s) were added to refs/heads/main by this push:
     new 4c19a82f1 JSPT-98 Integrate lifecycle checking methods in base classes
4c19a82f1 is described below

commit 4c19a82f13f61680c37ec37450d19241c292b5dc
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Jul 15 16:21:22 2022 +0100

    JSPT-98 Integrate lifecycle checking methods in base classes
    
    https://shibboleth.atlassian.net/browse/JSPT-98
    
    rename methods
            throwSetterPreconditionExceptions -> checkSetterPreconditions
            throwComponentStateExceptions -> checkComponentActive
---
 .../messaging/decoder/AbstractMessageDecoder.java  |  2 +-
 .../AbstractHttpClientResponseMessageDecoder.java  |  2 +-
 .../AbstractHttpServletRequestMessageDecoder.java  |  2 +-
 .../messaging/encoder/AbstractMessageEncoder.java  |  4 +--
 .../AbstractHttpClientRequestMessageEncoder.java   |  2 +-
 .../AbstractHttpServletResponseMessageEncoder.java |  2 +-
 .../messaging/handler/AbstractMessageHandler.java  |  2 +-
 .../impl/AbstractMessageChannelSecurity.java       |  2 +-
 .../handler/impl/CheckExpectedIssuer.java          |  4 +--
 .../handler/impl/CheckMandatoryAuthentication.java |  2 +-
 .../handler/impl/CheckMandatoryIssuer.java         |  2 +-
 .../handler/impl/FunctionMessageHandler.java       |  2 +-
 .../handler/impl/HTTPRequestValidationHandler.java |  8 +++---
 .../impl/URLEvaluatingMessageChannelSecurity.java  |  2 +-
 .../action/AbstractConditionalProfileAction.java   |  2 +-
 .../profile/action/AbstractProfileAction.java      |  4 +--
 .../impl/AbstractMessageChannelSecurity.java       |  2 +-
 .../opensaml/profile/action/impl/CheckAccess.java  | 14 +++++-----
 .../HttpServletRequestMessageChannelSecurity.java  |  2 +-
 .../org/opensaml/profile/action/impl/LogEvent.java |  4 +--
 .../PopulateClientTLSValidationParameters.java     |  6 ++--
 .../action/impl/PopulateDecryptionParameters.java  |  6 ++--
 .../profile/action/impl/PopulateMetricContext.java |  2 +-
 .../PopulateSignatureValidationParameters.java     |  6 ++--
 .../common/binding/AbstractEndpointResolver.java   |  2 +-
 .../profile/AbstractNameIdentifierGenerator.java   | 18 ++++++------
 .../logic/AbstractNameIDPolicyPredicate.java       |  8 +++---
 .../logic/AffiliationNameIDPolicyPredicate.java    |  4 +--
 .../resolver/ChainingMetadataResolver.java         |  6 ++--
 .../profile/AbstractSAML2NameIDGenerator.java      |  2 +-
 .../artifact/impl/BasicSAMLArtifactMap.java        |  6 ++--
 .../impl/StorageServiceSAMLArtifactMap.java        |  6 ++--
 .../StorageServiceSAMLArtifactMapEntryFactory.java |  2 +-
 .../impl/AddChannelBindingsHeaderHandler.java      |  2 +-
 .../binding/impl/CheckMessageVersionHandler.java   |  2 +-
 .../PopulateSignatureSigningParametersHandler.java | 12 ++++----
 .../binding/impl/SAMLMetadataLookupHandler.java    |  8 +++---
 .../binding/impl/SAMLProtocolAndRoleHandler.java   |  2 +-
 .../BaseSAMLSimpleSignatureSecurityHandler.java    |  2 +-
 ...ecordServerTLSEntityAuthenticationtHandler.java |  6 ++--
 .../impl/MessageLifetimeSecurityHandler.java       |  6 ++--
 .../impl/MessageReplaySecurityHandler.java         |  6 ++--
 .../impl/ReceivedEndpointSecurityHandler.java      |  4 +--
 .../impl/SAMLMDClientCertAuthSecurityHandler.java  |  2 +-
 .../SAMLOutboundProtocolMessageSigningHandler.java |  2 +-
 ...ProtocolMessageXMLSignatureSecurityHandler.java |  2 +-
 .../impl/AddAudienceRestrictionToAssertions.java   |  6 ++--
 .../profile/impl/AddInResponseToToResponse.java    |  4 +--
 .../impl/AddNotBeforeConditionToAssertions.java    |  2 +-
 .../impl/AddNotOnOrAfterConditionToAssertions.java |  6 ++--
 .../impl/PopulateSignatureSigningParameters.java   | 12 ++++----
 .../saml/common/profile/impl/SignAssertions.java   |  4 +--
 .../common/profile/impl/VerifyChannelBindings.java |  6 ++--
 .../resolver/filter/impl/AlgorithmFilter.java      |  2 +-
 .../filter/impl/EntityAttributesFilter.java        |  4 +--
 .../resolver/filter/impl/NameIDFormatFilter.java   |  6 ++--
 .../filter/impl/NodeProcessingMetadataFilter.java  |  4 +--
 .../impl/AbstractBatchMetadataResolver.java        | 10 +++----
 .../impl/AbstractDynamicHTTPMetadataResolver.java  |  4 +--
 .../impl/AbstractDynamicMetadataResolver.java      | 32 +++++++++++-----------
 .../resolver/impl/AbstractMetadataResolver.java    | 16 +++++------
 .../impl/AbstractReloadingMetadataResolver.java    | 10 +++----
 .../resolver/impl/CompositeMetadataResolver.java   |  6 ++--
 .../impl/FileBackedHTTPMetadataResolver.java       |  6 ++--
 .../resolver/impl/FilesystemMetadataResolver.java  |  2 +-
 .../FunctionDrivenDynamicHTTPMetadataResolver.java |  2 +-
 .../resolver/impl/HTTPMetadataResolver.java        |  2 +-
 .../impl/PredicateRoleDescriptorResolver.java      | 14 +++++-----
 .../binding/encoding/impl/HTTPArtifactEncoder.java |  2 +-
 .../binding/encoding/impl/HTTPPostEncoder.java     |  4 +--
 .../impl/AddDoNotCacheConditionToAssertions.java   |  2 +-
 .../profile/impl/AddNameIdentifierToSubjects.java  |  8 +++---
 .../saml/saml1/profile/impl/AddResponseShell.java  |  4 +--
 .../saml1/profile/impl/AddStatusToResponse.java    | 14 +++++-----
 .../impl/AddSubjectConfirmationToSubjects.java     |  6 ++--
 .../impl/CopyNameIdentifierFromRequest.java        |  6 ++--
 .../saml/saml1/profile/impl/ResolveArtifacts.java  | 10 +++----
 .../binding/decoding/impl/HTTPArtifactDecoder.java | 18 ++++++------
 .../binding/encoding/impl/HTTPArtifactEncoder.java |  8 +++---
 .../binding/encoding/impl/HTTPPostEncoder.java     |  4 +--
 .../impl/ExtractChannelBindingsHeadersHandler.java |  4 +--
 .../SAML2HTTPPostSimpleSignSecurityHandler.java    |  4 +--
 .../saml2/profile/impl/AbstractDecryptAction.java  |  8 +++---
 .../saml2/profile/impl/AbstractEncryptAction.java  | 12 ++++----
 .../profile/impl/AbstractResponseShellAction.java  |  6 ++--
 .../impl/AddChannelBindingsToAssertions.java       |  4 +--
 .../profile/impl/AddGeneratedKeyToAssertions.java  |  4 +--
 .../saml2/profile/impl/AddNameIDToSubjects.java    | 16 +++++------
 .../impl/AddOneTimeUseConditionToAssertions.java   |  2 +-
 .../impl/AddProxyRestrictionToAssertions.java      |  4 +--
 .../saml2/profile/impl/AddStatusResponseShell.java |  6 ++--
 .../saml2/profile/impl/AddStatusToResponse.java    | 14 +++++-----
 .../impl/AddSubjectConfirmationToSubjects.java     | 14 +++++-----
 .../saml2/profile/impl/CopyNameIDFromRequest.java  |  6 ++--
 .../saml/saml2/profile/impl/EncryptAssertions.java |  2 +-
 .../saml/saml2/profile/impl/EncryptAttributes.java |  2 +-
 .../saml/saml2/profile/impl/EncryptNameIDs.java    |  2 +-
 .../saml2/profile/impl/PopulateECPContext.java     |  8 +++---
 .../saml/saml2/profile/impl/ResolveArtifact.java   | 10 +++----
 .../saml2/profile/impl/ValidateAssertions.java     | 12 ++++----
 ...ecuritySAML20AssertionTokenSecurityHandler.java | 10 +++----
 .../crypto/ec/curves/AbstractNamedCurve.java       |  2 +-
 .../HttpClientSecurityContextHandler.java          |  6 ++--
 .../impl/BaseClientCertAuthSecurityHandler.java    |  2 +-
 ...opulateHttpClientSecurityParametersHandler.java | 10 +++----
 .../http/AbstractPipelineHttpSOAPClient.java       |  6 ++--
 .../opensaml/soap/client/http/HttpSOAPClient.java  |  8 +++---
 .../client/http/PipelineFactoryHttpSOAPClient.java |  4 +--
 .../AbstractHeaderGeneratingMessageHandler.java    |  8 +++---
 .../soap/soap11/profile/impl/AddSOAPFault.java     | 14 +++++-----
 .../messaging/impl/AddActionHandler.java           |  4 +--
 .../messaging/impl/AddMessageIDHandler.java        |  2 +-
 .../messaging/impl/AddRelatesToHandler.java        |  4 +--
 .../messaging/impl/ValidateActionHandler.java      |  2 +-
 .../messaging/impl/AddTimestampHandler.java        |  8 +++---
 .../opensaml/storage/AbstractStorageService.java   | 10 +++----
 .../java/org/opensaml/storage/ReplayCache.java     |  4 +--
 .../java/org/opensaml/storage/RevocationCache.java |  6 ++--
 .../storage/impl/client/ClientStorageService.java  | 14 +++++-----
 .../impl/client/LoadClientStorageServices.java     |  4 +--
 .../client/PopulateClientStorageLoadContext.java   |  2 +-
 .../client/PopulateClientStorageSaveContext.java   |  2 +-
 .../SaveCookieBackedClientStorageServices.java     |  2 +-
 .../xmlsec/agreement/impl/DigestMethod.java        |  2 +-
 .../opensaml/xmlsec/agreement/impl/KANonce.java    |  6 ++--
 .../opensaml/xmlsec/derivation/impl/ConcatKDF.java | 16 +++++------
 .../opensaml/xmlsec/derivation/impl/PBKDF2.java    | 16 +++++------
 ...pulateSignatureValidationParametersHandler.java |  6 ++--
 128 files changed, 381 insertions(+), 381 deletions(-)

diff --git a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/AbstractMessageDecoder.java b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/AbstractMessageDecoder.java
index 34a7c912c..85b0ac2c0 100644
--- a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/AbstractMessageDecoder.java
+++ b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/AbstractMessageDecoder.java
@@ -49,7 +49,7 @@ public abstract class AbstractMessageDecoder extends AbstractInitializableCompon
     /** {@inheritDoc} */
     @Override
     public void decode() throws MessageDecodingException {
-        throwComponentStateExceptions();
+        checkComponentActive();
         doDecode();
     }
     
diff --git a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/httpclient/AbstractHttpClientResponseMessageDecoder.java b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/httpclient/AbstractHttpClientResponseMessageDecoder.java
index d125733bf..a241cabe4 100644
--- a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/httpclient/AbstractHttpClientResponseMessageDecoder.java
+++ b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/httpclient/AbstractHttpClientResponseMessageDecoder.java
@@ -41,7 +41,7 @@ public abstract class AbstractHttpClientResponseMessageDecoder extends AbstractM
 
     /** {@inheritDoc} */
     public synchronized void setHttpResponse(@Nullable final HttpResponse clientResponse) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         response = clientResponse;
     }
diff --git a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/servlet/AbstractHttpServletRequestMessageDecoder.java b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/servlet/AbstractHttpServletRequestMessageDecoder.java
index 4bea6dacd..dd9f91885 100644
--- a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/servlet/AbstractHttpServletRequestMessageDecoder.java
+++ b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/decoder/servlet/AbstractHttpServletRequestMessageDecoder.java
@@ -41,7 +41,7 @@ public abstract class AbstractHttpServletRequestMessageDecoder extends AbstractM
 
     /** {@inheritDoc} */
     public synchronized void setHttpServletRequest(@Nullable final HttpServletRequest servletRequest) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         request = servletRequest;
     }
diff --git a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/encoder/AbstractMessageEncoder.java b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/encoder/AbstractMessageEncoder.java
index dfba3ad7c..2ec2177a0 100644
--- a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/encoder/AbstractMessageEncoder.java
+++ b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/encoder/AbstractMessageEncoder.java
@@ -37,7 +37,7 @@ public abstract class AbstractMessageEncoder extends AbstractInitializableCompon
     /** {@inheritDoc} */
     @Override
     public synchronized void setMessageContext(@Nullable final MessageContext context) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         messageContext = context;
     }
@@ -45,7 +45,7 @@ public abstract class AbstractMessageEncoder extends AbstractInitializableCompon
     /** {@inheritDoc} */
     @Override
     public void encode() throws MessageEncodingException {
-        throwComponentStateExceptions();
+        checkComponentActive();
         doEncode();
     }
 
diff --git a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/encoder/httpclient/AbstractHttpClientRequestMessageEncoder.java b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/encoder/httpclient/AbstractHttpClientRequestMessageEncoder.java
index 89dc2f3c1..d6c3f5300 100644
--- a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/encoder/httpclient/AbstractHttpClientRequestMessageEncoder.java
+++ b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/encoder/httpclient/AbstractHttpClientRequestMessageEncoder.java
@@ -41,7 +41,7 @@ public abstract class AbstractHttpClientRequestMessageEncoder extends AbstractMe
 
     /** {@inheritDoc} */
     public synchronized void setHttpRequest(@Nullable final HttpRequest httpRequest) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         request = httpRequest;
     }
diff --git a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/encoder/servlet/AbstractHttpServletResponseMessageEncoder.java b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/encoder/servlet/AbstractHttpServletResponseMessageEncoder.java
index 1c9015556..cc9844f89 100644
--- a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/encoder/servlet/AbstractHttpServletResponseMessageEncoder.java
+++ b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/encoder/servlet/AbstractHttpServletResponseMessageEncoder.java
@@ -40,7 +40,7 @@ public abstract class AbstractHttpServletResponseMessageEncoder extends Abstract
 
     /** {@inheritDoc} */
     public synchronized void setHttpServletResponse(@Nullable final HttpServletResponse servletResponse) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         response = servletResponse;
     }
diff --git a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/handler/AbstractMessageHandler.java b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/handler/AbstractMessageHandler.java
index 0ed5ae8b8..e0d231956 100644
--- a/opensaml-messaging-api/src/main/java/org/opensaml/messaging/handler/AbstractMessageHandler.java
+++ b/opensaml-messaging-api/src/main/java/org/opensaml/messaging/handler/AbstractMessageHandler.java
@@ -72,7 +72,7 @@ public abstract class AbstractMessageHandler extends AbstractInitializableCompon
      * @param condition predicate to apply
      */
     public void setActivationCondition(@Nonnull final Predicate<MessageContext> condition) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         activationCondition = Constraint.isNotNull(condition, "Predicate cannot be null");
     }
diff --git a/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/AbstractMessageChannelSecurity.java b/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/AbstractMessageChannelSecurity.java
index b16b79819..ecdb52241 100644
--- a/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/AbstractMessageChannelSecurity.java
+++ b/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/AbstractMessageChannelSecurity.java
@@ -63,7 +63,7 @@ public abstract class AbstractMessageChannelSecurity extends AbstractMessageHand
      *          the {@link org.opensaml.messaging.context.MessageChannelSecurityContext}
      */
     public void setParentContextLookupStrategy(@Nonnull final Function<MessageContext, BaseContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         parentContextLookupStrategy = Constraint.isNotNull(strategy, "Parent context lookup strategy cannot be null");
     }
diff --git a/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/CheckExpectedIssuer.java b/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/CheckExpectedIssuer.java
index 8c1031765..656874a7c 100644
--- a/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/CheckExpectedIssuer.java
+++ b/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/CheckExpectedIssuer.java
@@ -52,7 +52,7 @@ public final class CheckExpectedIssuer extends AbstractMessageHandler {
      * @param strategy lookup strategy
      */
     public void setIssuerLookupStrategy(@Nonnull final Function<MessageContext,String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         issuerLookupStrategy = Constraint.isNotNull(strategy, "Message context issuer lookup strategy cannot be null");
     }
@@ -63,7 +63,7 @@ public final class CheckExpectedIssuer extends AbstractMessageHandler {
      * @param strategy lookup strategy
      */
     public void setExpectedIssuerLookupStrategy(@Nonnull final Function<MessageContext,String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         expectedIssuerLookupStrategy = Constraint.isNotNull(strategy, 
                 "Message context expected issuer lookup strategy cannot be null");
diff --git a/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/CheckMandatoryAuthentication.java b/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/CheckMandatoryAuthentication.java
index 8d82f8e51..6dcaf0c32 100644
--- a/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/CheckMandatoryAuthentication.java
+++ b/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/CheckMandatoryAuthentication.java
@@ -43,7 +43,7 @@ public final class CheckMandatoryAuthentication extends AbstractMessageHandler {
      * @param strategy lookup strategy
      */
     public void setAuthenticationLookupStrategy(@Nonnull final Function<MessageContext,Boolean> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         authenticationLookupStrategy = Constraint.isNotNull(strategy,
                 "Message context authentication lookup strategy cannot be null");
diff --git a/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/CheckMandatoryIssuer.java b/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/CheckMandatoryIssuer.java
index b4746b8ff..485be21c8 100644
--- a/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/CheckMandatoryIssuer.java
+++ b/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/CheckMandatoryIssuer.java
@@ -43,7 +43,7 @@ public final class CheckMandatoryIssuer extends AbstractMessageHandler {
      * @param strategy lookup strategy
      */
     public void setIssuerLookupStrategy(@Nonnull final Function<MessageContext,String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         issuerLookupStrategy = Constraint.isNotNull(strategy, "Message context issuer lookup strategy cannot be null");
     }
diff --git a/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/FunctionMessageHandler.java b/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/FunctionMessageHandler.java
index 0821985ba..c52b22acb 100644
--- a/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/FunctionMessageHandler.java
+++ b/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/FunctionMessageHandler.java
@@ -44,7 +44,7 @@ public final class FunctionMessageHandler extends AbstractMessageHandler {
      * @param function the function to use
      */
     public void setFunction(@Nullable final Function<MessageContext,Exception> function) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         messageContextConsumer = function;
     }
diff --git a/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/HTTPRequestValidationHandler.java b/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/HTTPRequestValidationHandler.java
index 398357514..2bc663704 100644
--- a/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/HTTPRequestValidationHandler.java
+++ b/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/HTTPRequestValidationHandler.java
@@ -67,7 +67,7 @@ public class HTTPRequestValidationHandler extends AbstractMessageHandler {
      * @param contentType the content type
      */
     public void setRequiredContentType(final String contentType) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         requiredContentType = contentType;
     }
 
@@ -86,7 +86,7 @@ public class HTTPRequestValidationHandler extends AbstractMessageHandler {
      * @param requestMethod the required request method
      */
     public void setRequiredRequestMethod(final String requestMethod) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         requiredRequestMethod = StringSupport.trimOrNull(requestMethod);
     }
 
@@ -105,7 +105,7 @@ public class HTTPRequestValidationHandler extends AbstractMessageHandler {
      * @param secured true if required to be secure, false otherwise
      */
     public void setRequireSecured(final boolean secured) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         requireSecured = secured;
     }
 
@@ -124,7 +124,7 @@ public class HTTPRequestValidationHandler extends AbstractMessageHandler {
      * @param request the request instance
      */
     public void setHttpServletRequest(final HttpServletRequest request) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         httpServletRequest = Constraint.isNotNull(request, "HttpServletRequest may not be null");
     }
 
diff --git a/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/URLEvaluatingMessageChannelSecurity.java b/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/URLEvaluatingMessageChannelSecurity.java
index 7f14ce98d..e3fc4ebdf 100644
--- a/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/URLEvaluatingMessageChannelSecurity.java
+++ b/opensaml-messaging-impl/src/main/java/org/opensaml/messaging/handler/impl/URLEvaluatingMessageChannelSecurity.java
@@ -72,7 +72,7 @@ public class URLEvaluatingMessageChannelSecurity extends AbstractMessageChannelS
      * @param flag flag to set
      */
     public void setDefaultPortInsecure(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         defaultPortInsecure = flag;
     }
diff --git a/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractConditionalProfileAction.java b/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractConditionalProfileAction.java
index f4d205926..9705b5519 100644
--- a/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractConditionalProfileAction.java
+++ b/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractConditionalProfileAction.java
@@ -60,7 +60,7 @@ public abstract class AbstractConditionalProfileAction extends AbstractProfileAc
      * @param condition predicate to apply
      */
     public void setActivationCondition(@Nonnull final Predicate<ProfileRequestContext> condition) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         activationCondition = Constraint.isNotNull(condition, "Predicate cannot be null");
     }
diff --git a/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractProfileAction.java b/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractProfileAction.java
index 7b0807be3..f7d8ba16f 100644
--- a/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractProfileAction.java
+++ b/opensaml-profile-api/src/main/java/org/opensaml/profile/action/AbstractProfileAction.java
@@ -64,7 +64,7 @@ public abstract class AbstractProfileAction extends AbstractInitializableCompone
      * @param request current HTTP request
      */
     public void setHttpServletRequest(@Nullable final HttpServletRequest request) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         httpServletRequest = request;
     }
@@ -84,7 +84,7 @@ public abstract class AbstractProfileAction extends AbstractInitializableCompone
      * @param response current HTTP response
      */
     public void setHttpServletResponse(@Nullable final HttpServletResponse response) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         httpServletResponse = response;
     }
diff --git a/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/AbstractMessageChannelSecurity.java b/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/AbstractMessageChannelSecurity.java
index 946cbf648..53f6e114c 100644
--- a/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/AbstractMessageChannelSecurity.java
+++ b/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/AbstractMessageChannelSecurity.java
@@ -59,7 +59,7 @@ public abstract class AbstractMessageChannelSecurity extends AbstractProfileActi
      */
     public void setParentContextLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,BaseContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         parentContextLookupStrategy = Constraint.isNotNull(strategy, "Parent context lookup strategy cannot be null");
     }
diff --git a/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/CheckAccess.java b/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/CheckAccess.java
index ad177f006..92f5502e1 100644
--- a/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/CheckAccess.java
+++ b/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/CheckAccess.java
@@ -74,7 +74,7 @@ public class CheckAccess extends AbstractProfileAction {
      * @param acs service to use
      */
     public void setAccessControlService(@Nonnull final AccessControlService acs) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         service = Constraint.isNotNull(acs, "AccessControlService cannot be null");
     }
@@ -87,7 +87,7 @@ public class CheckAccess extends AbstractProfileAction {
      * @since 3.3.0
      */
     public void setPolicyNameLookupStrategy(@Nonnull final Function<ProfileRequestContext,String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         policyNameLookupStrategy = Constraint.isNotNull(strategy, "Policy lookup strategy cannot be null");
     }
@@ -98,7 +98,7 @@ public class CheckAccess extends AbstractProfileAction {
      * @param name  policy name
      */
     public void setPolicyName(@Nonnull @NotEmpty final String name) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         policyNameLookupStrategy = FunctionSupport.constant(
                 Constraint.isNotNull(StringSupport.trimOrNull(name), "Policy name cannot be null or empty"));
@@ -112,7 +112,7 @@ public class CheckAccess extends AbstractProfileAction {
      * @since 3.3.0
      */
     public void setOperationLookupStrategy(@Nonnull final Function<ProfileRequestContext,String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         operationLookupStrategy = Constraint.isNotNull(strategy, "Policy lookup strategy cannot be null");
     }
@@ -123,7 +123,7 @@ public class CheckAccess extends AbstractProfileAction {
      * @param op operation
      */
     public void setOperation(@Nullable final String op) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         operationLookupStrategy = FunctionSupport.constant(StringSupport.trimOrNull(op));
     }
@@ -136,7 +136,7 @@ public class CheckAccess extends AbstractProfileAction {
      * @since 3.3.0
      */
     public void setResourceLookupStrategy(@Nonnull final Function<ProfileRequestContext,String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         resourceLookupStrategy = Constraint.isNotNull(strategy, "Policy lookup strategy cannot be null");
     }
@@ -147,7 +147,7 @@ public class CheckAccess extends AbstractProfileAction {
      * @param res resource
      */
     public void setResource(@Nullable final String res) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         resourceLookupStrategy = FunctionSupport.constant(StringSupport.trimOrNull(res));
     }
diff --git a/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/HttpServletRequestMessageChannelSecurity.java b/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/HttpServletRequestMessageChannelSecurity.java
index e0fa03ed8..a1e4a0108 100644
--- a/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/HttpServletRequestMessageChannelSecurity.java
+++ b/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/HttpServletRequestMessageChannelSecurity.java
@@ -50,7 +50,7 @@ public class HttpServletRequestMessageChannelSecurity extends AbstractMessageCha
      * @param flag flag to set
      */
     public void setDefaultPortInsecure(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         defaultPortInsecure = flag;
     }
diff --git a/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/LogEvent.java b/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/LogEvent.java
index b719b3711..e5fadc9be 100644
--- a/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/LogEvent.java
+++ b/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/LogEvent.java
@@ -66,7 +66,7 @@ public class LogEvent extends AbstractProfileAction {
      * @param strategy  lookup strategy
      */
     public void setEventContextLookupStrategy(@Nonnull final Function<ProfileRequestContext,EventContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         eventContextLookupStrategy = Constraint.isNotNull(strategy, "EventContext lookup strategy cannot be null");
     }
@@ -77,7 +77,7 @@ public class LogEvent extends AbstractProfileAction {
      * @param events events to ignore
      */
     public void setSuppressedEvents(@Nullable @NotEmpty final Collection<String> events) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         if (events != null) {
             suppressedEvents = new HashSet<>(StringSupport.normalizeStringCollection(events));
diff --git a/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/PopulateClientTLSValidationParameters.java b/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/PopulateClientTLSValidationParameters.java
index c0f98f3d0..62d7c61ce 100644
--- a/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/PopulateClientTLSValidationParameters.java
+++ b/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/PopulateClientTLSValidationParameters.java
@@ -86,7 +86,7 @@ public class PopulateClientTLSValidationParameters extends AbstractProfileAction
      */
     public void setSecurityParametersContextLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,ClientTLSSecurityParametersContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         securityParametersContextLookupStrategy = Constraint.isNotNull(strategy,
                 "ClientTLSSecurityParametersContext lookup strategy cannot be null");
@@ -99,7 +99,7 @@ public class PopulateClientTLSValidationParameters extends AbstractProfileAction
      */
     public void setConfigurationLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,List<ClientTLSValidationConfiguration>> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         configurationLookupStrategy = Constraint.isNotNull(strategy,
                 "ClientTLSValidationConfiguration lookup strategy cannot be null");
@@ -112,7 +112,7 @@ public class PopulateClientTLSValidationParameters extends AbstractProfileAction
      */
     public void setClientTLSValidationParametersResolver(
             @Nonnull final ClientTLSValidationParametersResolver newResolver) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         resolver = Constraint.isNotNull(newResolver, "ClientTLSValidationParametersResolver cannot be null");
     }
diff --git a/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/PopulateDecryptionParameters.java b/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/PopulateDecryptionParameters.java
index 30e2215a7..949956a08 100644
--- a/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/PopulateDecryptionParameters.java
+++ b/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/PopulateDecryptionParameters.java
@@ -83,7 +83,7 @@ public class PopulateDecryptionParameters extends AbstractConditionalProfileActi
      */
     public void setSecurityParametersContextLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,SecurityParametersContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         securityParametersContextLookupStrategy = Constraint.isNotNull(strategy,
                 "SecurityParametersContext lookup strategy cannot be null");
@@ -96,7 +96,7 @@ public class PopulateDecryptionParameters extends AbstractConditionalProfileActi
      */
     public void setConfigurationLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,List<DecryptionConfiguration>> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         configurationLookupStrategy = Constraint.isNotNull(strategy,
                 "DecryptionConfiguration lookup strategy cannot be null");
@@ -108,7 +108,7 @@ public class PopulateDecryptionParameters extends AbstractConditionalProfileActi
      * @param newResolver   resolver to use
      */
     public void setDecryptionParametersResolver(@Nonnull final DecryptionParametersResolver newResolver) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         resolver = Constraint.isNotNull(newResolver, "DecryptionParametersResolver cannot be null");
     }
diff --git a/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/PopulateMetricContext.java b/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/PopulateMetricContext.java
index 7d293821c..dc99297a6 100644
--- a/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/PopulateMetricContext.java
+++ b/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/PopulateMetricContext.java
@@ -58,7 +58,7 @@ public class PopulateMetricContext extends AbstractProfileAction {
      * @param strategy  timer mapping strategy
      */
     public void setMetricStrategy(@Nullable final Function<ProfileRequestContext,Boolean> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         metricStrategy = strategy;
     }
diff --git a/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/PopulateSignatureValidationParameters.java b/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/PopulateSignatureValidationParameters.java
index 3672db2d9..a20da12d4 100644
--- a/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/PopulateSignatureValidationParameters.java
+++ b/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/PopulateSignatureValidationParameters.java
@@ -84,7 +84,7 @@ public class PopulateSignatureValidationParameters
      */
     public void setSecurityParametersContextLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,SecurityParametersContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         securityParametersContextLookupStrategy = Constraint.isNotNull(strategy,
                 "SecurityParametersContext lookup strategy cannot be null");
@@ -97,7 +97,7 @@ public class PopulateSignatureValidationParameters
      */
     public void setConfigurationLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,List<SignatureValidationConfiguration>> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         configurationLookupStrategy = Constraint.isNotNull(strategy,
                 "SignatureValidationConfiguration lookup strategy cannot be null");
@@ -110,7 +110,7 @@ public class PopulateSignatureValidationParameters
      */
     public void setSignatureValidationParametersResolver(
             @Nonnull final SignatureValidationParametersResolver newResolver) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         resolver = Constraint.isNotNull(newResolver, "SignatureValidationParametersResolver cannot be null");
     }
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/AbstractEndpointResolver.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/AbstractEndpointResolver.java
index 8979ef69e..7026377f2 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/AbstractEndpointResolver.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/AbstractEndpointResolver.java
@@ -116,7 +116,7 @@ public abstract class AbstractEndpointResolver<EndpointType extends Endpoint>
      * @since 4.1.0
      */
     public void setInMetadataOrder(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         inMetadataOrder = flag;
     }
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/AbstractNameIdentifierGenerator.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/AbstractNameIdentifierGenerator.java
index 5f170edd3..66462376a 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/AbstractNameIdentifierGenerator.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/AbstractNameIdentifierGenerator.java
@@ -91,7 +91,7 @@ public abstract class AbstractNameIdentifierGenerator<NameIdType extends SAMLObj
      * @param condition an activation condition
      */
     public void setActivationCondition(@Nonnull final Predicate<ProfileRequestContext> condition) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         activationCondition = Constraint.isNotNull(condition, "Predicate cannot be null");
     }
@@ -112,7 +112,7 @@ public abstract class AbstractNameIdentifierGenerator<NameIdType extends SAMLObj
      */
     public void setDefaultIdPNameQualifierLookupStrategy(
             @Nullable final Function<ProfileRequestContext,String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         defaultIdPNameQualifierLookupStrategy = strategy;
     }
@@ -133,7 +133,7 @@ public abstract class AbstractNameIdentifierGenerator<NameIdType extends SAMLObj
      */
     public void setDefaultSPNameQualifierLookupStrategy(
             @Nullable final Function<ProfileRequestContext,String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         defaultSPNameQualifierLookupStrategy = strategy;
     }
@@ -155,7 +155,7 @@ public abstract class AbstractNameIdentifierGenerator<NameIdType extends SAMLObj
      * @param flag flag to set
      */
     public void setOmitQualifiers(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         omitQualifiers = flag;
     }
@@ -171,7 +171,7 @@ public abstract class AbstractNameIdentifierGenerator<NameIdType extends SAMLObj
      * @param f format to set
      */
     public void setFormat(@Nonnull @NotEmpty final String f) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         format = Constraint.isNotNull(StringSupport.trimOrNull(f), "Format cannot be null or empty");
     }
@@ -195,7 +195,7 @@ public abstract class AbstractNameIdentifierGenerator<NameIdType extends SAMLObj
      * @param qualifier qualifier to set
      */
     public void setIdPNameQualifier(@Nullable final String qualifier) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         idpNameQualifier = StringSupport.trimOrNull(qualifier);
     }
@@ -220,7 +220,7 @@ public abstract class AbstractNameIdentifierGenerator<NameIdType extends SAMLObj
      * @param qualifier qualifier to set
      */
     public void setSPNameQualifier(@Nullable final String qualifier) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         spNameQualifier = StringSupport.trimOrNull(qualifier);
     }
@@ -240,7 +240,7 @@ public abstract class AbstractNameIdentifierGenerator<NameIdType extends SAMLObj
      * @param id value to set
      */
     public void setSPProvidedId(@Nullable final String id) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         spProvidedId = id;
     }
@@ -264,7 +264,7 @@ public abstract class AbstractNameIdentifierGenerator<NameIdType extends SAMLObj
     @Override
     @Nullable public NameIdType generate(@Nonnull final ProfileRequestContext profileRequestContext,
             @Nonnull @NotEmpty final String theFormat) throws SAMLException {
-        throwComponentStateExceptions();
+        checkComponentActive();
 
         if (!Objects.equals(format, theFormat)) {
             throw new SAMLException("The format to generate does not match the value configured");
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AbstractNameIDPolicyPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AbstractNameIDPolicyPredicate.java
index 4d752355c..5629c6f27 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AbstractNameIDPolicyPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AbstractNameIDPolicyPredicate.java
@@ -75,7 +75,7 @@ public abstract class AbstractNameIDPolicyPredicate extends AbstractInitializabl
      * @param strategy lookup strategy
      */
     public void setRequesterIdLookupStrategy(@Nullable final Function<ProfileRequestContext,String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         requesterIdLookupStrategy = strategy;
     }
@@ -86,7 +86,7 @@ public abstract class AbstractNameIDPolicyPredicate extends AbstractInitializabl
      * @param strategy lookup strategy
      */
     public void setResponderIdLookupStrategy(@Nullable final Function<ProfileRequestContext,String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         responderIdLookupStrategy = strategy;
     }
@@ -97,7 +97,7 @@ public abstract class AbstractNameIDPolicyPredicate extends AbstractInitializabl
      * @param strategy lookup function
      */
     public void setObjectLookupStrategy(@Nullable final Function<ProfileRequestContext,SAMLObject> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         objectLookupStrategy = Constraint.isNotNull(strategy, "Object lookup strategy cannot be null");
     }
@@ -108,7 +108,7 @@ public abstract class AbstractNameIDPolicyPredicate extends AbstractInitializabl
      * @param newFormats    formats to apply predicate to
      */
     public void setFormats(@Nullable final Collection<String> newFormats) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         formats = new HashSet<>(StringSupport.normalizeStringCollection(newFormats));
     }
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AffiliationNameIDPolicyPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AffiliationNameIDPolicyPredicate.java
index a8ce19245..beaddb6b0 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AffiliationNameIDPolicyPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/logic/AffiliationNameIDPolicyPredicate.java
@@ -57,7 +57,7 @@ public class AffiliationNameIDPolicyPredicate extends DefaultNameIDPolicyPredica
      * @param resolver  resolver to use
      */
     public void setMetadataResolver(@Nonnull final MetadataResolver resolver) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         metadataResolver = Constraint.isNotNull(resolver, "MetadataResolver cannot be null");
     }
@@ -77,7 +77,7 @@ public class AffiliationNameIDPolicyPredicate extends DefaultNameIDPolicyPredica
     protected boolean doApply(@Nullable final String requesterId, @Nullable final String responderId,
             @Nullable final String format, @Nullable final String nameQualifier,
             @Nullable final String spNameQualifier) {
-        throwComponentStateExceptions();
+        checkComponentActive();
         
         if (super.doApply(requesterId, responderId, format, nameQualifier, spNameQualifier)) {
             return true;
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/resolver/ChainingMetadataResolver.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/resolver/ChainingMetadataResolver.java
index 588796e45..e921b4ca3 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/resolver/ChainingMetadataResolver.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/metadata/resolver/ChainingMetadataResolver.java
@@ -85,7 +85,7 @@ public class ChainingMetadataResolver extends AbstractIdentifiableInitializableC
      */
     public void setResolvers(@Nonnull @NonnullElements final List<? extends MetadataResolver> newResolvers)
             throws ResolverException {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         if (newResolvers == null || newResolvers.isEmpty()) {
             resolvers = Collections.emptyList();
@@ -138,7 +138,7 @@ public class ChainingMetadataResolver extends AbstractIdentifiableInitializableC
     /** {@inheritDoc} */
     @Override
     @Nullable public EntityDescriptor resolveSingle(@Nullable final CriteriaSet criteria) throws ResolverException {
-        throwComponentStateExceptions();
+        checkComponentActive();
 
         final Iterable<EntityDescriptor> iterable = resolve(criteria);
         if (iterable != null) {
@@ -153,7 +153,7 @@ public class ChainingMetadataResolver extends AbstractIdentifiableInitializableC
     /** {@inheritDoc} */
     @Override
     @Nonnull public Iterable<EntityDescriptor> resolve(@Nullable final CriteriaSet criteria) throws ResolverException {
-        throwComponentStateExceptions();
+        checkComponentActive();
 
         DetectDuplicateEntityIDs detectDuplicates = getDetectDuplicateEntityIDs();
         if (criteria.contains(DetectDuplicateEntityIDsCriterion.class)) {
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/profile/AbstractSAML2NameIDGenerator.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/profile/AbstractSAML2NameIDGenerator.java
index 00c1e9034..93495863d 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/profile/AbstractSAML2NameIDGenerator.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/profile/AbstractSAML2NameIDGenerator.java
@@ -75,7 +75,7 @@ public abstract class AbstractSAML2NameIDGenerator extends AbstractNameIdentifie
      */
     public void setRequestLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,AuthnRequest> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
     
         requestLookupStrategy = Constraint.isNotNull(strategy, "AuthnRequest lookup strategy cannot be null");
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java
index 60391f72d..59a2c3713 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/BasicSAMLArtifactMap.java
@@ -122,7 +122,7 @@ public class BasicSAMLArtifactMap extends AbstractInitializableComponent impleme
      * @param lifetime artifact entry lifetime
      */
     public void setArtifactLifetime(@Nonnull final Duration lifetime) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         Constraint.isNotNull(lifetime, "Lifetime cannot be null");
         Constraint.isFalse(lifetime.isNegative() || lifetime.isZero(), "Lifetime must be positive");
         
@@ -135,7 +135,7 @@ public class BasicSAMLArtifactMap extends AbstractInitializableComponent impleme
      * @param interval  cleanup interval
      */
     public void setCleanupInterval(@Nonnull final Duration interval) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         Constraint.isNotNull(interval, "Interval cannot be null");
         Constraint.isFalse(interval.isNegative(), "Interval cannot be negative");
 
@@ -148,7 +148,7 @@ public class BasicSAMLArtifactMap extends AbstractInitializableComponent impleme
      * @param factory map entry factory
      */
     public void setEntryFactory(@Nonnull final SAMLArtifactMapEntryFactory factory) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         entryFactory = Constraint.isNotNull(factory, "SAMLArtifactMapEntryFactory cannot be null");
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMap.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMap.java
index 93218b790..b12998fc7 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMap.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/artifact/impl/StorageServiceSAMLArtifactMap.java
@@ -111,7 +111,7 @@ public class StorageServiceSAMLArtifactMap extends AbstractInitializableComponen
      * @param store the artifact store
      */
     public void setStorageService(@Nonnull final StorageService store) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         artifactStore = Constraint.isNotNull(store, "StorageService cannot be null");
     }
@@ -122,7 +122,7 @@ public class StorageServiceSAMLArtifactMap extends AbstractInitializableComponen
      * @param lifetime artifact entry lifetime
      */
     public void setArtifactLifetime(@Nonnull final Duration lifetime) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         Constraint.isNotNull(lifetime, "Lifetime cannot be null");
         Constraint.isFalse(lifetime.isNegative() || lifetime.isZero(), "Lifetime must be positive");
         
@@ -141,7 +141,7 @@ public class StorageServiceSAMLArtifactMap extends AbstractInitializableComponen
      * @param factory map entry factory
      */
     public void setEntryFactory(@Nonnull final SAMLArtifactMapEntryFactory factory) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         Constraint.isTrue(factory != null && factory instanceof StorageSerializer<?>,
                 "SAMLArtifactMapEntryFactory cannot be null and must support the StorageSerializer interface");
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 1e1fe484b..a4da539cf 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
@@ -84,7 +84,7 @@ public class StorageServiceSAMLArtifactMapEntryFactory extends AbstractInitializ
      * @param pool parser pool used to parse serialized data
      */
     public void setParserPool(@Nonnull final ParserPool pool) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         parserPool = Constraint.isNotNull(pool, "ParserPool cannot be null");
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/AddChannelBindingsHeaderHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/AddChannelBindingsHeaderHandler.java
index b219c5dd2..ec6bb2d61 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/AddChannelBindingsHeaderHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/AddChannelBindingsHeaderHandler.java
@@ -64,7 +64,7 @@ public class AddChannelBindingsHeaderHandler extends AbstractMessageHandler {
      */
     public void setChannelBindingsContextLookupStrategy(
             @Nonnull final Function<MessageContext,ChannelBindingsContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         channelBindingsContextLookupStrategy = Constraint.isNotNull(strategy,
                 "ChannelBindingsContext lookup strategy cannot be null");
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/CheckMessageVersionHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/CheckMessageVersionHandler.java
index e68241e04..665fad86e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/CheckMessageVersionHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/CheckMessageVersionHandler.java
@@ -43,7 +43,7 @@ public class CheckMessageVersionHandler extends AbstractMessageHandler {
      * @param flag  flag to set
      */
     public void setIgnoreMissingOrUnrecognized(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         ignoreMissingOrUnrecognized = flag;
     }
     
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/PopulateSignatureSigningParametersHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/PopulateSignatureSigningParametersHandler.java
index fa5c6e649..313fd532a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/PopulateSignatureSigningParametersHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/PopulateSignatureSigningParametersHandler.java
@@ -95,7 +95,7 @@ public class PopulateSignatureSigningParametersHandler extends AbstractMessageHa
      */
     public void setSecurityParametersContextLookupStrategy(
             @Nonnull final Function<MessageContext,SecurityParametersContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         securityParametersContextLookupStrategy = Constraint.isNotNull(strategy,
                 "SecurityParametersContext lookup strategy cannot be null");
@@ -109,7 +109,7 @@ public class PopulateSignatureSigningParametersHandler extends AbstractMessageHa
      */
     public void setExistingParametersContextLookupStrategy(
             @Nullable final Function<MessageContext,SecurityParametersContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         existingParametersContextLookupStrategy = strategy;
     }
     
@@ -120,7 +120,7 @@ public class PopulateSignatureSigningParametersHandler extends AbstractMessageHa
      */
     public void setMetadataContextLookupStrategy(
             @Nullable final Function<MessageContext,SAMLMetadataContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         metadataContextLookupStrategy = strategy;
     }
 
@@ -131,7 +131,7 @@ public class PopulateSignatureSigningParametersHandler extends AbstractMessageHa
      */
     public void setConfigurationLookupStrategy(
             @Nonnull final Function<MessageContext,List<SignatureSigningConfiguration>> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         configurationLookupStrategy = Constraint.isNotNull(strategy,
                 "SignatureSigningConfiguration lookup strategy cannot be null");
     }
@@ -143,7 +143,7 @@ public class PopulateSignatureSigningParametersHandler extends AbstractMessageHa
      */
     public void setSignatureSigningParametersResolver(
             @Nonnull final SignatureSigningParametersResolver newResolver) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         resolver = Constraint.isNotNull(newResolver, "SignatureSigningParametersResolver cannot be null");
     }
 
@@ -157,7 +157,7 @@ public class PopulateSignatureSigningParametersHandler extends AbstractMessageHa
      * @since 3.4.0
      */
     public void setNoResultIsError(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         noResultIsError = flag;
     }
     
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLMetadataLookupHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLMetadataLookupHandler.java
index 8907ab9ec..acb88d212 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLMetadataLookupHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLMetadataLookupHandler.java
@@ -91,7 +91,7 @@ public class SAMLMetadataLookupHandler extends AbstractMessageHandler {
      * @param strategy the strategy function
      */
     public void setCopyContextStrategy(@Nullable final Function<MessageContext, SAMLMetadataContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         copyContextStrategy = strategy;
     }
 
@@ -103,7 +103,7 @@ public class SAMLMetadataLookupHandler extends AbstractMessageHandler {
      * @param clazz the entity context class type
      */
     public void setEntityContextClass(@Nonnull final Class<? extends AbstractSAMLEntityContext> clazz) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         entityContextClass = Constraint.isNotNull(clazz, "SAML entity context class may not be null");
     }
 
@@ -113,7 +113,7 @@ public class SAMLMetadataLookupHandler extends AbstractMessageHandler {
      * @param resolver  the resolver to use
      */
     public void setRoleDescriptorResolver(@Nonnull final RoleDescriptorResolver resolver) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         metadataResolver = Constraint.isNotNull(resolver, "RoleDescriptorResolver cannot be null");
     }
     
@@ -130,7 +130,7 @@ public class SAMLMetadataLookupHandler extends AbstractMessageHandler {
     /** {@inheritDoc} */
     @Override
     protected void doInvoke(@Nonnull final MessageContext messageContext) throws MessageHandlerException {
-        throwComponentStateExceptions();
+        checkComponentActive();
 
         final AbstractSAMLEntityContext entityCtx = messageContext.getSubcontext(entityContextClass);
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLProtocolAndRoleHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLProtocolAndRoleHandler.java
index 325518106..9a65eb74f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLProtocolAndRoleHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/impl/SAMLProtocolAndRoleHandler.java
@@ -80,7 +80,7 @@ public class SAMLProtocolAndRoleHandler extends AbstractMessageHandler {
      * @param clazz the entity context class type
      */
     public void setEntityContextClass(@Nonnull final Class<? extends AbstractSAMLEntityContext> clazz) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         entityContextClass = Constraint.isNotNull(clazz, "SAML entity context class may not be null");
     }
 
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 0fca9acff..e83dca71a 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
@@ -98,7 +98,7 @@ public abstract class BaseSAMLSimpleSignatureSecurityHandler extends AbstractMes
      * @param request The to set.
      */
     public void setHttpServletRequest(@Nonnull final HttpServletRequest request) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         httpServletRequest = Constraint.isNotNull(request, "HttpServletRequest cannot be null");
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/CheckAndRecordServerTLSEntityAuthenticationtHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/CheckAndRecordServerTLSEntityAuthenticationtHandler.java
index 30f7a2595..3b8780925 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/CheckAndRecordServerTLSEntityAuthenticationtHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/CheckAndRecordServerTLSEntityAuthenticationtHandler.java
@@ -79,7 +79,7 @@ public class CheckAndRecordServerTLSEntityAuthenticationtHandler extends Abstrac
      */
     public void setHttpClientContextLookup(
             @Nonnull final ContextDataLookupFunction<MessageContext, HttpClientContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         httpClientContextLookup = Constraint.isNotNull(strategy, 
                 "The HttpClientContext lookup strategy may not be null");
     }
@@ -92,7 +92,7 @@ public class CheckAndRecordServerTLSEntityAuthenticationtHandler extends Abstrac
      * @param clazz the entity context class type
      */
     public void setEntityContextClass(@Nonnull final Class<? extends AbstractAuthenticatableSAMLEntityContext> clazz) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         entityContextClass = Constraint.isNotNull(clazz, "The SAML entity context class may not be null");
     }
 
@@ -102,7 +102,7 @@ public class CheckAndRecordServerTLSEntityAuthenticationtHandler extends Abstrac
      * @param strategy the new strategy function, or null
      */
     public void setEntityIDLookup(@Nullable final ContextDataLookupFunction<MessageContext, String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         entityIDLookup = strategy;
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/MessageLifetimeSecurityHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/MessageLifetimeSecurityHandler.java
index bc4365238..46e7da19a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/MessageLifetimeSecurityHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/MessageLifetimeSecurityHandler.java
@@ -72,7 +72,7 @@ public class MessageLifetimeSecurityHandler extends AbstractMessageHandler {
      * @param skew clock skew to set
      */
     public void setClockSkew(@Nonnull final Duration skew) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
                 
         clockSkew = Constraint.isNotNull(skew, "Clock skew cannot be null");
     }
@@ -92,7 +92,7 @@ public class MessageLifetimeSecurityHandler extends AbstractMessageHandler {
      * @param lifetime amount of time for which a message is valid
      */
     public synchronized void setMessageLifetime(@Nonnull final Duration lifetime) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         Constraint.isNotNull(lifetime, "Lifetime cannot be null");
         Constraint.isFalse(lifetime.isNegative(), "Lifetime cannot be negative");
         
@@ -114,7 +114,7 @@ public class MessageLifetimeSecurityHandler extends AbstractMessageHandler {
      * @param required whether this rule is required to be met
      */
     public void setRequiredRule(final boolean required) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         requiredRule = required;
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/MessageReplaySecurityHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/MessageReplaySecurityHandler.java
index ae86f6f39..c2752e13f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/MessageReplaySecurityHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/MessageReplaySecurityHandler.java
@@ -74,7 +74,7 @@ public class MessageReplaySecurityHandler extends AbstractMessageHandler {
      * @param cache The replayCache to set.
      */
     public void setReplayCache(@Nonnull final ReplayCache cache) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         replayCache = Constraint.isNotNull(cache, "ReplayCache cannot be null");
     }
@@ -85,7 +85,7 @@ public class MessageReplaySecurityHandler extends AbstractMessageHandler {
      * @param flag  flag to set
      */
     public void setRequiredRule(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         requiredRule = flag;
     }
 
@@ -104,7 +104,7 @@ public class MessageReplaySecurityHandler extends AbstractMessageHandler {
      * @param exp lifetime of entries
      */
     public void setExpires(@Nonnull final Duration exp) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         Constraint.isNotNull(exp, "Lifetime cannot be null");
         Constraint.isFalse(exp.isNegative(), "Lifetime cannot be negative");
         
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 25d0a2bca..74b7a82ba 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
@@ -73,7 +73,7 @@ public class ReceivedEndpointSecurityHandler extends AbstractMessageHandler {
      * @param comparator the new URI comparator to use
      */
     public void setURIComparator(@Nonnull final URIComparator comparator) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         uriComparator = Constraint.isNotNull(comparator, "URIComparator cannot be null");
     }
     
@@ -92,7 +92,7 @@ public class ReceivedEndpointSecurityHandler extends AbstractMessageHandler {
      * @param request The to set.
      */
     public void setHttpServletRequest(@Nonnull final HttpServletRequest request) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         httpServletRequest = Constraint.isNotNull(request, "HttpServletRequest cannot be null");
     }
 
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 9c389bd49..0c05fe561 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
@@ -80,7 +80,7 @@ public class SAMLMDClientCertAuthSecurityHandler extends BaseClientCertAuthSecur
      * @param clazz the entity context class type
      */
     public void setEntityContextClass(@Nonnull final Class<? extends AbstractAuthenticatableSAMLEntityContext> clazz) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         entityContextClass = Constraint.isNotNull(clazz, "The SAML entity context class may not be null");
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/SAMLOutboundProtocolMessageSigningHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/SAMLOutboundProtocolMessageSigningHandler.java
index 202aefb8b..915f71502 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/SAMLOutboundProtocolMessageSigningHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/SAMLOutboundProtocolMessageSigningHandler.java
@@ -58,7 +58,7 @@ public class SAMLOutboundProtocolMessageSigningHandler extends AbstractMessageHa
      * @param flag  flag to set
      */
     public void setSignErrorResponses(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         signErrorResponses = flag;
     }
     
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/SAMLProtocolMessageXMLSignatureSecurityHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/SAMLProtocolMessageXMLSignatureSecurityHandler.java
index 9c4ba267a..bd96d094c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/SAMLProtocolMessageXMLSignatureSecurityHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/impl/SAMLProtocolMessageXMLSignatureSecurityHandler.java
@@ -81,7 +81,7 @@ public class SAMLProtocolMessageXMLSignatureSecurityHandler extends BaseSAMLXMLS
      * @param validator The prevalidator to set.
      */
     public void setSignaturePrevalidator(@Nullable final SignaturePrevalidator validator) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         signaturePrevalidator = validator;
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddAudienceRestrictionToAssertions.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddAudienceRestrictionToAssertions.java
index 52740de3b..a442600a7 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddAudienceRestrictionToAssertions.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddAudienceRestrictionToAssertions.java
@@ -88,7 +88,7 @@ public class AddAudienceRestrictionToAssertions extends AbstractConditionalProfi
      * @param strategy lookup strategy
      */
     public void setResponseLookupStrategy(@Nonnull final Function<ProfileRequestContext,SAMLObject> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         responseLookupStrategy = Constraint.isNotNull(strategy, "Response lookup strategy cannot be null");
     }
     
@@ -100,7 +100,7 @@ public class AddAudienceRestrictionToAssertions extends AbstractConditionalProfi
      *            another one
      */
     public void setAddingAudiencesToExistingRestriction(final boolean addingToExistingRestriction) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         addingAudiencesToExistingRestriction = addingToExistingRestriction;
     }
 
@@ -111,7 +111,7 @@ public class AddAudienceRestrictionToAssertions extends AbstractConditionalProfi
      */
     public void setAudienceRestrictionsLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,Collection<String>> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         audienceRestrictionsLookupStrategy =
                 Constraint.isNotNull(strategy, "Audience restriction lookup strategy cannot be null");
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponse.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponse.java
index 6371e0383..752799d0d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponse.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddInResponseToToResponse.java
@@ -83,7 +83,7 @@ public class AddInResponseToToResponse extends AbstractConditionalProfileAction
      * @param strategy strategy used to locate the message to operate on
      */
     public void setResponseLookupStrategy(@Nonnull final Function<ProfileRequestContext,SAMLObject> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         responseLookupStrategy = Constraint.isNotNull(strategy, "Response lookup strategy cannot be null");
     }
     
@@ -93,7 +93,7 @@ public class AddInResponseToToResponse extends AbstractConditionalProfileAction
      * @param strategy lookup strategy
      */
     public void setRequestIdLookupStrategy(@Nonnull final Function<ProfileRequestContext,String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         requestIdLookupStrategy = Constraint.isNotNull(strategy, "Request ID lookup strategy cannot be null");
     }
     
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddNotBeforeConditionToAssertions.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddNotBeforeConditionToAssertions.java
index c4ad72012..e4d1c19aa 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddNotBeforeConditionToAssertions.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddNotBeforeConditionToAssertions.java
@@ -65,7 +65,7 @@ public class AddNotBeforeConditionToAssertions extends AbstractConditionalProfil
      * @param strategy lookup strategy
      */
     public void setResponseLookupStrategy(@Nonnull final Function<ProfileRequestContext,SAMLObject> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         responseLookupStrategy = Constraint.isNotNull(strategy, "Response lookup strategy cannot be null");
     }
     
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddNotOnOrAfterConditionToAssertions.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddNotOnOrAfterConditionToAssertions.java
index 8d92d30d7..7566eeaed 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddNotOnOrAfterConditionToAssertions.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/AddNotOnOrAfterConditionToAssertions.java
@@ -75,7 +75,7 @@ public class AddNotOnOrAfterConditionToAssertions extends AbstractConditionalPro
      * @param strategy lookup strategy
      */
     public void setResponseLookupStrategy(@Nonnull final Function<ProfileRequestContext,SAMLObject> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         responseLookupStrategy = Constraint.isNotNull(strategy, "Response lookup strategy cannot be null");
     }
     
@@ -85,7 +85,7 @@ public class AddNotOnOrAfterConditionToAssertions extends AbstractConditionalPro
      * @param strategy strategy function
      */
     public void setAssertionLifetimeStrategy(@Nullable final Function<ProfileRequestContext,Duration> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         assertionLifetimeStrategy = strategy;
     }
     
@@ -95,7 +95,7 @@ public class AddNotOnOrAfterConditionToAssertions extends AbstractConditionalPro
      * @param lifetime  default lifetime
      */
     public void setDefaultAssertionLifetime(@Nonnull final Duration lifetime) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         Constraint.isNotNull(lifetime, "Lifetime cannot be null");
         Constraint.isFalse(lifetime.isNegative(), "Lifetime cannot be negative");
         
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/PopulateSignatureSigningParameters.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/PopulateSignatureSigningParameters.java
index 787ac0335..14d6b990d 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/PopulateSignatureSigningParameters.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/PopulateSignatureSigningParameters.java
@@ -104,7 +104,7 @@ public class PopulateSignatureSigningParameters
      */
     public void setSecurityParametersContextLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,SecurityParametersContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         securityParametersContextLookupStrategy = Constraint.isNotNull(strategy,
                 "SecurityParametersContext lookup strategy cannot be null");
     }
@@ -117,7 +117,7 @@ public class PopulateSignatureSigningParameters
      */
     public void setExistingParametersContextLookupStrategy(
             @Nullable final Function<ProfileRequestContext,SecurityParametersContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         existingParametersContextLookupStrategy = strategy;
     }
     
@@ -128,7 +128,7 @@ public class PopulateSignatureSigningParameters
      */
     public void setMetadataContextLookupStrategy(
             @Nullable final Function<ProfileRequestContext,SAMLMetadataContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         metadataContextLookupStrategy = strategy;
     }
 
@@ -139,7 +139,7 @@ public class PopulateSignatureSigningParameters
      */
     public void setConfigurationLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,List<SignatureSigningConfiguration>> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         configurationLookupStrategy = Constraint.isNotNull(strategy,
                 "SignatureSigningConfiguration lookup strategy cannot be null");
     }
@@ -151,7 +151,7 @@ public class PopulateSignatureSigningParameters
      */
     public void setSignatureSigningParametersResolver(
             @Nonnull final SignatureSigningParametersResolver newResolver) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         resolver = Constraint.isNotNull(newResolver, "SignatureSigningParametersResolver cannot be null");
     }
 
@@ -165,7 +165,7 @@ public class PopulateSignatureSigningParameters
      * @since 3.4.0
      */
     public void setNoResultIsError(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         noResultIsError = flag;
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/SignAssertions.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/SignAssertions.java
index 4280f31a4..66f316b06 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/SignAssertions.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/SignAssertions.java
@@ -84,7 +84,7 @@ public class SignAssertions extends AbstractProfileAction {
      * @param strategy lookup strategy
      */
     public void setResponseLookupStrategy(@Nonnull final Function<ProfileRequestContext,SAMLObject> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         responseLookupStrategy = Constraint.isNotNull(strategy, "Response lookup strategy cannot be null");
     }
 
@@ -95,7 +95,7 @@ public class SignAssertions extends AbstractProfileAction {
      */
     public void setSecurityParametersLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,SecurityParametersContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         securityParametersLookupStrategy = Constraint.isNotNull(strategy,
                 "SecurityParameterContext lookup strategy cannot be null");
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindings.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindings.java
index e00b13263..4fff6a297 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindings.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/profile/impl/VerifyChannelBindings.java
@@ -100,7 +100,7 @@ public class VerifyChannelBindings extends AbstractProfileAction {
      */
     public void setChannelBindingsLookupStrategy1(
             @Nonnull final Function<ProfileRequestContext,ChannelBindingsContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         channelBindingsLookupStrategy1 = Constraint.isNotNull(strategy,
                 "First ChannelBindingsContext lookup strategy cannot be null");
     }
@@ -112,7 +112,7 @@ public class VerifyChannelBindings extends AbstractProfileAction {
      */
     public void setChannelBindingsLookupStrategy2(
             @Nonnull final Function<ProfileRequestContext,ChannelBindingsContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         channelBindingsLookupStrategy2 = Constraint.isNotNull(strategy,
                 "Second ChannelBindingsContext lookup strategy cannot be null");
     }
@@ -124,7 +124,7 @@ public class VerifyChannelBindings extends AbstractProfileAction {
      */
     public void setChannelBindingsCreationStrategy(
             @Nonnull final Function<ProfileRequestContext,ChannelBindingsContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         channelBindingsCreationStrategy = Constraint.isNotNull(strategy,
                 "ChannelBindingsContext creation strategy cannot be null");
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/AlgorithmFilter.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/AlgorithmFilter.java
index eb99a5f72..a56899298 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/AlgorithmFilter.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/AlgorithmFilter.java
@@ -98,7 +98,7 @@ public class AlgorithmFilter extends AbstractInitializableComponent implements M
      * @param rules rules to apply
      */
     public void setRules(@Nonnull @NonnullElements final Map<Predicate<EntityDescriptor>,Collection<XMLObject>> rules) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         Constraint.isNotNull(rules, "Rules map cannot be null");
 
         rules.values().stream()
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityAttributesFilter.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityAttributesFilter.java
index ab1edf459..fa3bad2e0 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityAttributesFilter.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityAttributesFilter.java
@@ -97,7 +97,7 @@ public class EntityAttributesFilter extends AbstractInitializableComponent imple
      * @param rules rules to apply
      */
     public void setRules(@Nonnull @NonnullElements final Map<Predicate<EntityDescriptor>,Collection<Attribute>> rules) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         Constraint.isNotNull(rules, "Rules map cannot be null");
         
         applyMap = ArrayListMultimap.create(rules.size(), 1);
@@ -119,7 +119,7 @@ public class EntityAttributesFilter extends AbstractInitializableComponent imple
      * @since 3.4.0
      */
     public void setAttributeFilter(@Nullable final Predicate<Attribute> condition) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         attributeFilter = condition;
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/NameIDFormatFilter.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/NameIDFormatFilter.java
index b04090c27..1e40cf862 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/NameIDFormatFilter.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/NameIDFormatFilter.java
@@ -88,7 +88,7 @@ public class NameIDFormatFilter extends AbstractInitializableComponent implement
      * @param flag flag to set
      */
     public void setRemoveExistingFormats(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         removeExistingFormats = flag;
     }
     
@@ -98,7 +98,7 @@ public class NameIDFormatFilter extends AbstractInitializableComponent implement
      * @param rules rules to apply
      */
     public void setRules(@Nonnull @NonnullElements final Map<Predicate<EntityDescriptor>,Collection<String>> rules) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         Constraint.isNotNull(rules, "Rules map cannot be null");
         
         applyMap = ArrayListMultimap.create(rules.size(), 1);
@@ -113,7 +113,7 @@ public class NameIDFormatFilter extends AbstractInitializableComponent implement
     @Override
     @Nullable public XMLObject filter(@Nullable final XMLObject metadata, @Nonnull final MetadataFilterContext context)
             throws FilterException {
-        throwComponentStateExceptions();
+        checkComponentActive();
         if (metadata == null) {
             return null;
         }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/NodeProcessingMetadataFilter.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/NodeProcessingMetadataFilter.java
index a4e0ac3c9..a12b8c9da 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/NodeProcessingMetadataFilter.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/NodeProcessingMetadataFilter.java
@@ -64,7 +64,7 @@ public class NodeProcessingMetadataFilter extends AbstractInitializableComponent
      * @param newProcessors the new list of processors to set.
      */
     public void setNodeProcessors(@Nonnull @NonnullElements final List<MetadataNodeProcessor> newProcessors) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         Constraint.isNotNull(newProcessors, "MetadataNodeProcessor list cannot be null");
 
         processors = new ArrayList<>(List.copyOf(newProcessors));
@@ -74,7 +74,7 @@ public class NodeProcessingMetadataFilter extends AbstractInitializableComponent
     @Override
     @Nullable public XMLObject filter(@Nullable final XMLObject metadata, @Nonnull final MetadataFilterContext context)
             throws FilterException {
-        throwComponentStateExceptions();
+        checkComponentActive();
 
         if (metadata == null) {
             return null;
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 7b43116d4..68c750ee2 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
@@ -79,7 +79,7 @@ public abstract class AbstractBatchMetadataResolver extends AbstractMetadataReso
     
     /** {@inheritDoc} */
     @Override public Iterator<EntityDescriptor> iterator() {
-        throwComponentStateExceptions();
+        checkComponentActive();
         return Collections.unmodifiableList(getBackingStore().getOrderedDescriptors()).iterator();
     }
 
@@ -98,7 +98,7 @@ public abstract class AbstractBatchMetadataResolver extends AbstractMetadataReso
      * @param flag true if source should be cached, false otherwise
      */
     protected void setCacheSourceMetadata(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         cacheSourceMetadata = flag; 
     }
     
@@ -117,7 +117,7 @@ public abstract class AbstractBatchMetadataResolver extends AbstractMetadataReso
      * @param newIndexes the new indexes to set
      */
     public void setIndexes(@Nullable final Set<MetadataIndex> newIndexes) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         if (newIndexes == null) {
             indexes = Collections.emptySet();
         } else {
@@ -142,7 +142,7 @@ public abstract class AbstractBatchMetadataResolver extends AbstractMetadataReso
      * @param flag true if resolution may be attempted solely via predicates, false if not
      */
     public void setResolveViaPredicatesOnly(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         resolveViaPredicatesOnly = flag;
     }
 
@@ -166,7 +166,7 @@ public abstract class AbstractBatchMetadataResolver extends AbstractMetadataReso
 
     /** {@inheritDoc} */
     @Override @Nonnull public Iterable<EntityDescriptor> resolve(final CriteriaSet criteria) throws ResolverException {
-        throwComponentStateExceptions();
+        checkComponentActive();
         
         final EntityIdCriterion entityIdCriterion = criteria.get(EntityIdCriterion.class);
         if (entityIdCriterion != null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java
index 451f5caf9..0f133ce4c 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
@@ -168,7 +168,7 @@ public abstract class AbstractDynamicHTTPMetadataResolver extends AbstractDynami
      * @param params the security parameters
      */
     public void setHttpClientSecurityParameters(@Nullable final HttpClientSecurityParameters params) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         httpClientSecurityParameters = params;
     }
     
@@ -205,7 +205,7 @@ public abstract class AbstractDynamicHTTPMetadataResolver extends AbstractDynami
      * @param types the new supported content types to set
      */
     public void setSupportedContentTypes(@Nullable final List<String> types) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         if (types == null) {
             supportedContentTypes = Collections.emptyList();
         } else {
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 07a290878..93ea44e43 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
@@ -244,7 +244,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
      * @param flag true if should init from the cache in the background, false otherwise
      */
     public void setInitializeFromPersistentCacheInBackground(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         initializeFromPersistentCacheInBackground = flag;
     }
 
@@ -271,7 +271,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
      * @since 3.3.0
      */
     public void setBackgroundInitializationFromCacheDelay(@Nonnull final Duration delay) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         Constraint.isNotNull(delay, "Delay cannot be null");
         Constraint.isFalse(delay.isNegative(), "Delay cannot be negative");
@@ -295,7 +295,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
      * @param manager the cache manager, may be null
      */
     public void setPersistentCacheManager(@Nullable final XMLObjectLoadSaveManager<EntityDescriptor> manager) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         persistentCacheManager = manager;
     }
     
@@ -323,7 +323,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
      * @param generator the new generator to set, may be null
      */
     public void setPersistentCacheKeyGenerator(@Nullable final Function<EntityDescriptor, String> generator) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         persistentCacheKeyGenerator = generator;
     }
 
@@ -344,7 +344,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
      * @param predicate the cache initialization predicate
      */
     public void setInitializationFromCachePredicate(@Nullable final Predicate<EntityDescriptor> predicate) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         initializationFromCachePredicate = predicate;
     }
 
@@ -367,7 +367,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
      * @param duration the minimum cache duration
      */
     public void setMinCacheDuration(@Nonnull final Duration duration) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         Constraint.isNotNull(duration, "Duration cannot be null");
         Constraint.isFalse(duration.isNegative(), "Duration cannot be negative");
@@ -394,7 +394,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
      * @param duration the maximum cache duration
      */
     public void setMaxCacheDuration(@Nonnull final Duration duration) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         Constraint.isNotNull(duration, "Duration cannot be null");
         Constraint.isFalse(duration.isNegative(), "Duration cannot be negative");
@@ -421,7 +421,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
      * @param duration the negative lookup cache duration
      */
     public void setNegativeLookupCacheDuration(@Nonnull final Duration duration) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         Constraint.isNotNull(duration, "Duration cannot be null");
         Constraint.isFalse(duration.isNegative(), "Duration cannot be negative");
@@ -448,7 +448,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
      * @param factor delay factor used to compute the next refresh time
      */
     public void setRefreshDelayFactor(@Nonnull final Float factor) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         if (factor <= 0 || factor >= 1) {
             throw new IllegalArgumentException("Refresh delay factor must be a number between 0.0 and 1.0, exclusive");
@@ -472,7 +472,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
      * @param flag true if idle entity data should be removed, false otherwise
      */
     public void setRemoveIdleEntityData(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         removeIdleEntityData = flag;
     }
 
@@ -497,7 +497,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
      * @param max the maximum entity data idle time
      */
     public void setMaxIdleEntityData(@Nonnull final Duration max) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         Constraint.isNotNull(max, "Max idle time cannot be null");
         Constraint.isFalse(max.isNegative(), "Max idle time cannot be negative");
@@ -520,7 +520,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
      * @param threshold the threshold for logging a warning if live metadata will soon expire
      */
     public void setExpirationWarningThreshold(@Nullable final Duration threshold) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         if (threshold == null) {
             expirationWarningThreshold = Duration.ZERO;
@@ -550,7 +550,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
      * @param interval the interval to set
      */
     public void setCleanupTaskInterval(@Nonnull final Duration interval) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         Constraint.isNotNull(interval, "Cleanup task interval may not be null");
         Constraint.isFalse(interval.isNegative() || interval.isZero(), "Cleanup task interval must be positive");
@@ -573,7 +573,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
      * @param baseName the Metrics base name
      */
     public void setMetricsBaseName(@Nullable final String baseName) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         metricsBaseName = StringSupport.trimOrNull(baseName);
     }
     
@@ -592,7 +592,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
      * @param newIndexes the new indexes to set
      */
     public void setIndexes(@Nullable final Set<MetadataIndex> newIndexes) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         if (newIndexes == null) {
             indexes = Collections.emptySet();
@@ -641,7 +641,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
     /** {@inheritDoc} */
     @Override
     @Nonnull public Iterable<EntityDescriptor> resolve(@Nonnull final CriteriaSet criteria) throws ResolverException {
-        throwComponentStateExceptions();
+        checkComponentActive();
         
         final Context contextResolve = MetricsSupport.startTimer(timerResolve);
         try {
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 9a5649841..d655d0815 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
@@ -125,7 +125,7 @@ public abstract class AbstractMetadataResolver extends AbstractIdentifiableIniti
 
     /** {@inheritDoc} */
     @Override public void setRequireValidMetadata(final boolean require) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         requireValidMetadata = require;
     }
 
@@ -136,7 +136,7 @@ public abstract class AbstractMetadataResolver extends AbstractIdentifiableIniti
 
     /** {@inheritDoc} */
     @Override public void setMetadataFilter(@Nullable final MetadataFilter newFilter) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         mdFilter = newFilter;
     }
 
@@ -157,7 +157,7 @@ public abstract class AbstractMetadataResolver extends AbstractIdentifiableIniti
      * @param failFast whether problems during initialization should cause the provider to fail
      */
     public void setFailFastInitialization(final boolean failFast) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         failFastInitialization = failFast;
     }
 
@@ -176,7 +176,7 @@ public abstract class AbstractMetadataResolver extends AbstractIdentifiableIniti
      * @param pool pool of parsers to use to parse XML
      */
     public void setParserPool(@Nonnull final ParserPool pool) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         parser = Constraint.isNotNull(pool, "ParserPool may not be null");
     }
 
@@ -201,7 +201,7 @@ public abstract class AbstractMetadataResolver extends AbstractIdentifiableIniti
      * @param flag true if must satisfy all, false otherwise
      */
     public void setSatisfyAnyPredicates(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         satisfyAnyPredicates = flag;
     }
 
@@ -220,7 +220,7 @@ public abstract class AbstractMetadataResolver extends AbstractIdentifiableIniti
      * @param registry the registry instance to use
      */
     public void setCriterionPredicateRegistry(@Nullable final CriterionPredicateRegistry<EntityDescriptor> registry) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         criterionPredicateRegistry = registry;
     }
 
@@ -245,13 +245,13 @@ public abstract class AbstractMetadataResolver extends AbstractIdentifiableIniti
      * @param flag true if should use default registry, false otherwise
      */
     public void setUseDefaultPredicateRegistry(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         useDefaultPredicateRegistry = flag;
     }
 
     /** {@inheritDoc} */
     @Override @Nullable public EntityDescriptor resolveSingle(final CriteriaSet criteria) throws ResolverException {
-        throwComponentStateExceptions();
+        checkComponentActive();
         final Iterable<EntityDescriptor> iterable = resolve(criteria);
         if (iterable != null) {
             final Iterator<EntityDescriptor> iterator = iterable.iterator();
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 5bb852a65..336b85a5e 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
@@ -143,7 +143,7 @@ public abstract class AbstractReloadingMetadataResolver extends AbstractBatchMet
     /** {@inheritDoc} */
     @Override
     protected void setCacheSourceMetadata(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         if (!flag) {
             log.warn("{} Caching of source metadata may not be disabled for reloading metadata resolvers", 
@@ -212,7 +212,7 @@ public abstract class AbstractReloadingMetadataResolver extends AbstractBatchMet
      * @param threshold the threshold for logging a warning if live metadata will soon expire
      */
     public void setExpirationWarningThreshold(@Nonnull final Duration threshold) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         Constraint.isNotNull(threshold, "Expiration warning threshold cannot be null");
         Constraint.isFalse(threshold.isNegative(), "Expiration warning threshold cannot be negative");
@@ -235,7 +235,7 @@ public abstract class AbstractReloadingMetadataResolver extends AbstractBatchMet
      * @param delay maximum amount of time between refresh intervals
      */
     public void setMaxRefreshDelay(@Nonnull final Duration delay) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         Constraint.isNotNull(delay, "Maximum refresh delay cannot be null");
         Constraint.isFalse(delay.isNegative() || delay.isZero(), "Maximum refresh delay must be greater than 0");
@@ -258,7 +258,7 @@ public abstract class AbstractReloadingMetadataResolver extends AbstractBatchMet
      * @param factor delay factor used to compute the next refresh time
      */
     public void setRefreshDelayFactor(final float factor) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         if (factor <= 0 || factor >= 1) {
             throw new IllegalArgumentException("Refresh delay factor must be a number between 0.0 and 1.0, exclusive");
@@ -282,7 +282,7 @@ public abstract class AbstractReloadingMetadataResolver extends AbstractBatchMet
      * @param delay minimum amount of time between refreshes
      */
     public void setMinRefreshDelay(@Nonnull final Duration delay) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         Constraint.isNotNull(delay, "Minimum refresh delay cannot be null");
         Constraint.isFalse(delay.isNegative() || delay.isZero(), "Minimum refresh delay must be greater than 0");
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/CompositeMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/CompositeMetadataResolver.java
index d23ff8500..3361dbae6 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/CompositeMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/CompositeMetadataResolver.java
@@ -78,7 +78,7 @@ public class CompositeMetadataResolver extends AbstractIdentifiedInitializableCo
      */
     public void setResolvers(@Nonnull @NonnullElements final List<MetadataResolver> newResolvers) 
             throws ResolverException {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         if (newResolvers == null || newResolvers.isEmpty()) {
             resolvers = Collections.emptyList();
@@ -111,13 +111,13 @@ public class CompositeMetadataResolver extends AbstractIdentifiedInitializableCo
 
     /** {@inheritDoc} */
     @Override public Iterable<EntityDescriptor> resolve(@Nullable final CriteriaSet criteria) throws ResolverException {
-        throwComponentStateExceptions();
+        checkComponentActive();
         return new CompositeMetadataResolverIterable(resolvers, criteria);
     }
 
     /** {@inheritDoc} */
     @Override public EntityDescriptor resolveSingle(@Nullable final CriteriaSet criteria) throws ResolverException {
-        throwComponentStateExceptions();
+        checkComponentActive();
         EntityDescriptor metadata = null;
         for (final MetadataResolver resolver : resolvers) {
             metadata = resolver.resolveSingle(criteria);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolver.java
index dfeb158e9..44c443373 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolver.java
@@ -147,7 +147,7 @@ public class FileBackedHTTPMetadataResolver extends HTTPMetadataResolver {
      * @param flag true if should initialize from backup file, false otherwise
      */
     public void setInitializeFromBackupFile(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         initializeFromBackupFile = flag;
     }
@@ -171,7 +171,7 @@ public class FileBackedHTTPMetadataResolver extends HTTPMetadataResolver {
      * @param delay the next refresh delay
      */
     public void setBackupFileInitNextRefreshDelay(@Nonnull final Duration delay) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         Constraint.isNotNull(delay, "Backup file init next refresh delay cannot be null");
         Constraint.isFalse(delay.isNegative() || delay.isZero(),
@@ -219,7 +219,7 @@ public class FileBackedHTTPMetadataResolver extends HTTPMetadataResolver {
      * @throws ResolverException thrown if the backup file is not read/writable or creatable
      */
     protected void setBackupFile(final String backupFilePath) throws ResolverException {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         final File backingFile = new File(backupFilePath);
         metadataBackupFile = backingFile;
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolver.java
index 382a0ac3e..e47edb40f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FilesystemMetadataResolver.java
@@ -89,7 +89,7 @@ public class FilesystemMetadataResolver extends AbstractReloadingMetadataResolve
      * @throws ResolverException this exception is no longer thrown
      */
     protected void setMetadataFile(@Nonnull final File file) throws ResolverException {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         metadataFile = Constraint.isNotNull(file, "Metadata file cannot be null");
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolver.java
index e6f423a70..964858fb9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolver.java
@@ -89,7 +89,7 @@ public class FunctionDrivenDynamicHTTPMetadataResolver extends AbstractDynamicHT
      * @param builder the request URL builder function instance
      */
     public void setRequestURLBuilder(@Nonnull final Function<CriteriaSet, String> builder) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         requestURLBuilder = Constraint.isNotNull(builder, "Request URL builder function was null");
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java
index a083f56d1..753dbcaa6 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java
@@ -168,7 +168,7 @@ public class HTTPMetadataResolver extends AbstractReloadingMetadataResolver {
      * @param params the security parameters
      */
     public void setHttpClientSecurityParameters(@Nullable final HttpClientSecurityParameters params) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         httpClientSecurityParameters = params;
     }
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 93fcf801f..80230738a 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
@@ -121,7 +121,7 @@ public class PredicateRoleDescriptorResolver extends AbstractIdentifiedInitializ
     /** {@inheritDoc} */
     @Override
     public void setRequireValidMetadata(final boolean require) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         requireValidMetadata = require;
     }
     
@@ -146,7 +146,7 @@ public class PredicateRoleDescriptorResolver extends AbstractIdentifiedInitializ
      * @param flag true if must satisfy all, false otherwise
      */
     public void setSatisfyAnyPredicates(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         satisfyAnyPredicates = flag;
     }
 
@@ -165,7 +165,7 @@ public class PredicateRoleDescriptorResolver extends AbstractIdentifiedInitializ
      * @param registry the registry instance to use
      */
     public void setCriterionPredicateRegistry(@Nullable final CriterionPredicateRegistry<RoleDescriptor> registry) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         criterionPredicateRegistry = registry;
     }
 
@@ -190,7 +190,7 @@ public class PredicateRoleDescriptorResolver extends AbstractIdentifiedInitializ
      * @param flag true if should use default registry, false otherwise
      */
     public void setUseDefaultPredicateRegistry(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         useDefaultPredicateRegistry = flag;
     }
     
@@ -212,7 +212,7 @@ public class PredicateRoleDescriptorResolver extends AbstractIdentifiedInitializ
      * @param flag true if resolution may be attempted solely via predicates, false if not
      */
     public void setResolveViaPredicatesOnly(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         resolveViaPredicatesOnly = flag;
     }
     
@@ -234,7 +234,7 @@ public class PredicateRoleDescriptorResolver extends AbstractIdentifiedInitializ
     /** {@inheritDoc} */
     @Override
     @Nullable public RoleDescriptor resolveSingle(final CriteriaSet criteria) throws ResolverException {
-        throwComponentStateExceptions();
+        checkComponentActive();
         final Iterable<RoleDescriptor> iterable = resolve(criteria);
         if (iterable != null) {
             final Iterator<RoleDescriptor> iterator = iterable.iterator();
@@ -248,7 +248,7 @@ public class PredicateRoleDescriptorResolver extends AbstractIdentifiedInitializ
     /** {@inheritDoc} */
     @Override
     @Nonnull public Iterable<RoleDescriptor> resolve(final CriteriaSet criteria) throws ResolverException {
-        throwComponentStateExceptions();
+        checkComponentActive();
         
         final Iterable<EntityDescriptor> entityDescriptorsSource = entityDescriptorResolver.resolve(criteria);
         if (!entityDescriptorsSource.iterator().hasNext()) {
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 763121abd..4c6d800f3 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
@@ -91,7 +91,7 @@ public class HTTPArtifactEncoder extends BaseSAML1MessageEncoder {
      * @param newArtifactMap the new artifactMap 
      */
     public void setArtifactMap(@Nonnull final SAMLArtifactMap newArtifactMap) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         artifactMap = Constraint.isNotNull(newArtifactMap, "SAMLArtifactMap cannot be null");
     }
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 35483542f..9ba9104dd 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
@@ -83,7 +83,7 @@ public class HTTPPostEncoder extends BaseSAML1MessageEncoder {
      * @param newVelocityEngine the new VelocityEngine instane
      */
     public void setVelocityEngine(final VelocityEngine newVelocityEngine) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         velocityEngine = newVelocityEngine;
     }
     
@@ -106,7 +106,7 @@ public class HTTPPostEncoder extends BaseSAML1MessageEncoder {
      * @param newVelocityTemplateId the new Velocity template id
      */
     public void setVelocityTemplateId(final String newVelocityTemplateId) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         velocityTemplateId = newVelocityTemplateId;
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddDoNotCacheConditionToAssertions.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddDoNotCacheConditionToAssertions.java
index c0596b12b..7ca546e0c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddDoNotCacheConditionToAssertions.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddDoNotCacheConditionToAssertions.java
@@ -70,7 +70,7 @@ public class AddDoNotCacheConditionToAssertions extends AbstractConditionalProfi
      * @param strategy strategy used to locate the {@link Response} to operate on
      */
     public void setResponseLookupStrategy(@Nonnull final Function<ProfileRequestContext, Response> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         responseLookupStrategy = Constraint.isNotNull(strategy, "Response lookup strategy cannot be null");
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjects.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjects.java
index 0e549fdf9..e77af4957 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjects.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddNameIdentifierToSubjects.java
@@ -109,7 +109,7 @@ public class AddNameIdentifierToSubjects extends AbstractProfileAction {
      * @param flag  true iff the action should overwrite any existing objects
      */
     public void setOverwriteExisting(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         overwriteExisting = flag;
     }
     
@@ -119,7 +119,7 @@ public class AddNameIdentifierToSubjects extends AbstractProfileAction {
      * @param strategy lookup strategy
      */
     public void setAssertionsLookupStrategy(@Nonnull final Function<ProfileRequestContext,List<Assertion>> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         assertionsLookupStrategy = Constraint.isNotNull(strategy, "Assertions lookup strategy cannot be null");
     }
 
@@ -129,7 +129,7 @@ public class AddNameIdentifierToSubjects extends AbstractProfileAction {
      * @param strategy  format lookup strategy
      */
     public void setFormatLookupStrategy(@Nonnull final Function<ProfileRequestContext,List<String>> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         formatLookupStrategy = Constraint.isNotNull(strategy, "Format lookup strategy cannot be null");
     }
 
@@ -139,7 +139,7 @@ public class AddNameIdentifierToSubjects extends AbstractProfileAction {
      * @param theGenerator the generator to use
      */
     public void setNameIdentifierGenerator(@Nonnull final SAML1NameIdentifierGenerator theGenerator) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         generator = Constraint.isNotNull(theGenerator, "SAML1NameIdentifierGenerator cannot be null");
     }
     
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddResponseShell.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddResponseShell.java
index a8274a499..e83388dbb 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddResponseShell.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddResponseShell.java
@@ -81,7 +81,7 @@ public class AddResponseShell extends AbstractProfileAction {
      * @param flag flag to set
      */
     public void setOverwriteExisting(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         overwriteExisting = flag;
     }
     
@@ -92,7 +92,7 @@ public class AddResponseShell extends AbstractProfileAction {
      */
     public void setIdentifierGeneratorLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,IdentifierGenerationStrategy> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         idGeneratorLookupStrategy =
                 Constraint.isNotNull(strategy, "IdentifierGenerationStrategy lookup strategy cannot be null");
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddStatusToResponse.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddStatusToResponse.java
index f5669584a..34259d4bb 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddStatusToResponse.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddStatusToResponse.java
@@ -108,7 +108,7 @@ public class AddStatusToResponse extends AbstractProfileAction {
      * @param condition predicate for detailed errors condition
      */
     public void setDetailedErrorsCondition(@Nonnull final Predicate<ProfileRequestContext> condition) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         detailedErrorsCondition =
                 Constraint.isNotNull(condition, "Detailed errors condition cannot be null");
     }
@@ -119,7 +119,7 @@ public class AddStatusToResponse extends AbstractProfileAction {
      * @param strategy strategy used to obtain status codes
      */
     public void setStatusCodesLookupStrategy(@Nullable final Function<ProfileRequestContext,List<QName>> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         statusCodesLookupStrategy = strategy;
     }
     
@@ -129,7 +129,7 @@ public class AddStatusToResponse extends AbstractProfileAction {
      * @param strategy strategy used to obtain a status message
      */
     public void setStatusMessageLookupStrategy(@Nullable final Function<ProfileRequestContext,String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         statusMessageLookupStrategy = strategy;
     }
     
@@ -139,7 +139,7 @@ public class AddStatusToResponse extends AbstractProfileAction {
      * @param strategy strategy used to locate the {@link Response} to operate on
      */
     public void setResponseLookupStrategy(@Nonnull final Function<ProfileRequestContext,Response> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         responseLookupStrategy = Constraint.isNotNull(strategy, "Response lookup strategy cannot be null");
     }
     
@@ -150,7 +150,7 @@ public class AddStatusToResponse extends AbstractProfileAction {
      * @param codes list of status code values to insert
      */
     public void setStatusCodes(@Nonnull @NonnullElements final List<QName> codes) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         defaultStatusCodes = List.copyOf(Constraint.isNotNull(codes, "Status code list cannot be null"));
     }
     
@@ -161,14 +161,14 @@ public class AddStatusToResponse extends AbstractProfileAction {
      * @param message default status message
      */
     public void setStatusMessage(@Nullable final String message) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         statusMessage = StringSupport.trimOrNull(message);
     }
     
     /** {@inheritDoc} */
     @Override
     protected boolean doPreExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
-        throwComponentStateExceptions();
+        checkComponentActive();
         response = responseLookupStrategy.apply(profileRequestContext);
         if (response == null) {
             log.debug("{} Response message was not returned by lookup strategy", getLogPrefix());
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 62de5ffca..9de478f81 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
@@ -114,7 +114,7 @@ public class AddSubjectConfirmationToSubjects extends AbstractProfileAction {
      * @param flag  true iff the action should overwrite any existing objects
      */
     public void setOverwriteExisting(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         overwriteExisting = flag;
     }
     
@@ -124,7 +124,7 @@ public class AddSubjectConfirmationToSubjects extends AbstractProfileAction {
      * @param strategy strategy used to locate the {@link Response} to operate on
      */
     public void setResponseLookupStrategy(@Nonnull final Function<ProfileRequestContext,Response> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         responseLookupStrategy = Constraint.isNotNull(strategy, "Response lookup strategy cannot be null");
     }
     
@@ -134,7 +134,7 @@ public class AddSubjectConfirmationToSubjects extends AbstractProfileAction {
      * @param methods   confirmation methods to use
      */
     public void setMethods(@Nonnull @NonnullElements final Collection<String> methods) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         Constraint.isNotEmpty(methods, "Confirmation method collection cannot be null or empty");
         
         confirmationMethods = List.copyOf(methods);
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/CopyNameIdentifierFromRequest.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/CopyNameIdentifierFromRequest.java
index f929df9bd..733b15abf 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/CopyNameIdentifierFromRequest.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/CopyNameIdentifierFromRequest.java
@@ -109,7 +109,7 @@ public class CopyNameIdentifierFromRequest extends AbstractProfileAction {
      * @param flag  true iff the action should overwrite any existing objects
      */
     public void setOverwriteExisting(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         overwriteExisting = flag;
     }
     
@@ -120,7 +120,7 @@ public class CopyNameIdentifierFromRequest extends AbstractProfileAction {
      */
     public void setNameIdentifierContextLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,SAMLSubjectNameIdentifierContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         nameIdentifierContextLookupStrategy = Constraint.isNotNull(strategy,
                 "SAMLSubjectNameIdentifierContext lookup strategy cannot be null");
     }
@@ -131,7 +131,7 @@ public class CopyNameIdentifierFromRequest extends AbstractProfileAction {
      * @param strategy lookup strategy
      */
     public void setResponseLookupStrategy(@Nonnull final Function<ProfileRequestContext,Response> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         responseLookupStrategy = Constraint.isNotNull(strategy, "Response lookup strategy cannot be null");
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/ResolveArtifacts.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/ResolveArtifacts.java
index 2d3ca20e2..cc91df310 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/ResolveArtifacts.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/ResolveArtifacts.java
@@ -103,7 +103,7 @@ public class ResolveArtifacts extends AbstractProfileAction {
      */
     public synchronized void setRequestLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,Request> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         requestLookupStrategy = Constraint.isNotNull(strategy, "Request lookup strategy cannot be null");
     }
@@ -115,7 +115,7 @@ public class ResolveArtifacts extends AbstractProfileAction {
      */
     public synchronized void setResponseLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,Response> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         responseLookupStrategy = Constraint.isNotNull(strategy, "Response lookup strategy cannot be null");
     }
@@ -127,7 +127,7 @@ public class ResolveArtifacts extends AbstractProfileAction {
      */
     public synchronized void setIssuerLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
     
         issuerLookupStrategy = Constraint.isNotNull(strategy, "Issuer lookup strategy cannot be null");
     }
@@ -139,7 +139,7 @@ public class ResolveArtifacts extends AbstractProfileAction {
      */
     public synchronized void setRequesterLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         requesterLookupStrategy = Constraint.isNotNull(strategy, "Requester lookup strategy cannot be null");
     }
@@ -150,7 +150,7 @@ public class ResolveArtifacts extends AbstractProfileAction {
      * @param map   artifact map
      */
     public synchronized void setArtifactMap(@Nonnull final SAMLArtifactMap map) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         artifactMap = Constraint.isNotNull(map, "SAMLArtifactMap cannot be null");
     }
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 ba8968304..f9e2af6bd 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
@@ -179,7 +179,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      * @param strategy the identifier generation strategy
      */
     public void setIdentifierGenerationStrategy(@Nullable final IdentifierGenerationStrategy strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         idStrategy = strategy;
     }
     
@@ -198,7 +198,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      * @param resolver the resolver instance
      */
     public void setSelfEntityIDResolver(@Nonnull final Resolver<String, CriteriaSet> resolver) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         selfEntityIDResolver = resolver;
     }
 
@@ -217,7 +217,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      * @param role  the peer entity role
      */
     public void setPeerEntityRole(@Nonnull final QName role) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         peerEntityRole = role;
     }
 
@@ -236,7 +236,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      * @param resolver the new resolver
      */
     public void setArtifactEndpointResolver(@Nullable final EndpointResolver<ArtifactResolutionService> resolver) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         artifactEndpointResolver = resolver;
     }
 
@@ -263,7 +263,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      * @param resolver the role descriptor resolver
      */
     public void setRoleDescriptorResolver(@Nullable final RoleDescriptorResolver resolver) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         roleDescriptorResolver = resolver;
     }
 
@@ -282,7 +282,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      * @param factory the artifact builder factory
      */
     public void setArtifactBuilderFactory(@Nullable final SAML2ArtifactBuilderFactory factory) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         artifactBuilderFactory = factory;
     }
 
@@ -301,7 +301,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      * @param client the SOAP client
      */
     public void setSOAPClient(@Nonnull final SOAPClient client) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         soapClient = client;
     }
     
@@ -322,7 +322,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      * @param name the pipeline name, or null
      */
     public void setSOAPPipelineName(@Nullable final String name) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         soapPipelineName = StringSupport.trimOrNull(name);
     }
     
@@ -364,7 +364,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
      * @param descriptor a binding descriptor
      */
     public void setBindingDescriptor(@Nullable final BindingDescriptor descriptor) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         bindingDescriptor = descriptor;
     }
     
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPArtifactEncoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPArtifactEncoder.java
index 6b64aee7e..ea5c6f7c7 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPArtifactEncoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPArtifactEncoder.java
@@ -108,7 +108,7 @@ public class HTTPArtifactEncoder extends BaseSAML2MessageEncoder {
      * @param post true if POST encoding will be used, false if GET encoding will be used
      */
     public void setPostEncoding(final boolean post) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         postEncoding = post;
     }
@@ -128,7 +128,7 @@ public class HTTPArtifactEncoder extends BaseSAML2MessageEncoder {
      * @param newVelocityEngine the new VelocityEngine instane
      */
     public void setVelocityEngine(@Nullable final VelocityEngine newVelocityEngine) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         velocityEngine = newVelocityEngine;
     }
@@ -152,7 +152,7 @@ public class HTTPArtifactEncoder extends BaseSAML2MessageEncoder {
      * @param newVelocityTemplateId the new Velocity template id
      */
     public void setVelocityTemplateId(@Nonnull @NotEmpty final String newVelocityTemplateId) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         velocityTemplateId = Constraint.isNotNull(StringSupport.trimOrNull(newVelocityTemplateId),
                 "Velocity template ID cannot be null or empty");
@@ -173,7 +173,7 @@ public class HTTPArtifactEncoder extends BaseSAML2MessageEncoder {
      * @param newArtifactMap the new artifactMap 
      */
     public void setArtifactMap(@Nonnull final SAMLArtifactMap newArtifactMap) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         artifactMap = Constraint.isNotNull(newArtifactMap, "SAMLArtifactMap cannot be null");
     }
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 e47e07098..1840ee0cd 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostEncoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/impl/HTTPPostEncoder.java
@@ -84,7 +84,7 @@ public class HTTPPostEncoder extends BaseSAML2MessageEncoder {
      * @param newVelocityEngine the new VelocityEngine instane
      */
     public void setVelocityEngine(final VelocityEngine newVelocityEngine) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         velocityEngine = newVelocityEngine;
     }
     
@@ -107,7 +107,7 @@ public class HTTPPostEncoder extends BaseSAML2MessageEncoder {
      * @param newVelocityTemplateId the new Velocity template id
      */
     public void setVelocityTemplateId(final String newVelocityTemplateId) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         velocityTemplateId = newVelocityTemplateId;
     }
     
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/impl/ExtractChannelBindingsHeadersHandler.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/impl/ExtractChannelBindingsHeadersHandler.java
index 8b830b059..6f9f9eea9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/impl/ExtractChannelBindingsHeadersHandler.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/impl/ExtractChannelBindingsHeadersHandler.java
@@ -62,7 +62,7 @@ public class ExtractChannelBindingsHeadersHandler extends AbstractMessageHandler
      * @param flag flag to set
      */
     public void setFinalDestination(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         finalDestination = flag;
     }
@@ -73,7 +73,7 @@ public class ExtractChannelBindingsHeadersHandler extends AbstractMessageHandler
      * @param flag flag to set
      */
     public void setNextDestination(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         nextDestination = flag;
     }
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 23503fcb8..92882fe58 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
@@ -83,7 +83,7 @@ public class SAML2HTTPPostSimpleSignSecurityHandler extends BaseSAMLSimpleSignat
      * @param newParserPool The parser to set.
      */
     public void setParser(@Nonnull final ParserPool newParserPool) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         parserPool = Constraint.isNotNull(newParserPool, "ParserPool cannot be null");
     }
 
@@ -102,7 +102,7 @@ public class SAML2HTTPPostSimpleSignSecurityHandler extends BaseSAMLSimpleSignat
      * @param newKeyInfoResolver The keyInfoResolver to set.
      */
     public void setKeyInfoResolver(@Nonnull final KeyInfoCredentialResolver newKeyInfoResolver) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         keyInfoResolver = Constraint.isNotNull(newKeyInfoResolver, "KeyInfoCredentialResolver cannot be null");
     }
 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AbstractDecryptAction.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AbstractDecryptAction.java
index 12dc1cfb8..d76e16d9e 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AbstractDecryptAction.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AbstractDecryptAction.java
@@ -102,7 +102,7 @@ public abstract class AbstractDecryptAction extends AbstractProfileAction {
      * @param flag  true iff decryption failure should be fatal
      */
     public void setErrorFatal(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         errorFatal = flag;
     }
@@ -116,7 +116,7 @@ public abstract class AbstractDecryptAction extends AbstractProfileAction {
      */
     public void setSecurityParametersContextLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,SecurityParametersContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         securityParamsLookupStrategy =
                 Constraint.isNotNull(strategy, "SecurityParametersContext lookup strategy cannot be null");
@@ -128,7 +128,7 @@ public abstract class AbstractDecryptAction extends AbstractProfileAction {
      * @param strategy strategy used to locate the {@link SAMLObject} to operate on
      */
     public void setMessageLookupStrategy(@Nonnull final Function<ProfileRequestContext,Object> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         messageLookupStrategy = Constraint.isNotNull(strategy, "Message lookup strategy cannot be null");
     }
@@ -149,7 +149,7 @@ public abstract class AbstractDecryptAction extends AbstractProfileAction {
      */
     public void setDecryptionPredicate(
             @Nonnull final Predicate<Pair<ProfileRequestContext,EncryptedElementType>> predicate) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         decryptionPredicate = Constraint.isNotNull(predicate, "Decryption predicate cannot be null");
     }
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 d95b0a09b..411c5d905 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
@@ -99,7 +99,7 @@ public abstract class AbstractEncryptAction extends AbstractConditionalProfileAc
      */
     public void setEncryptionContextLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,EncryptionContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         encryptionCtxLookupStrategy =
                 Constraint.isNotNull(strategy, "EncryptionContext lookup strategy cannot be null");
@@ -111,7 +111,7 @@ public abstract class AbstractEncryptAction extends AbstractConditionalProfileAc
      * @param strategy lookup strategy
      */
     public void setRecipientLookupStrategy(@Nonnull final Function<ProfileRequestContext,String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         recipientLookupStrategy = Constraint.isNotNull(strategy, "Recipient lookup strategy cannot be null");
     }
@@ -122,7 +122,7 @@ public abstract class AbstractEncryptAction extends AbstractConditionalProfileAc
      * @param strategy  lookup strategy
      */
     public void setKeyPlacementLookupStrategy(@Nonnull final Function<ProfileRequestContext,KeyPlacement> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         keyPlacementLookupStrategy = Constraint.isNotNull(strategy, "Key placement lookup strategy cannot be null");
     }
@@ -133,7 +133,7 @@ public abstract class AbstractEncryptAction extends AbstractConditionalProfileAc
      * @param predicate the encrypt-to-self predicate
      */
     public void setEncryptToSelf(@Nonnull final Predicate<ProfileRequestContext> predicate) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         encryptToSelf = Constraint.isNotNull(predicate, "Encrypt-to-self predicate cannot be null");
     }
@@ -146,7 +146,7 @@ public abstract class AbstractEncryptAction extends AbstractConditionalProfileAc
     public void setEncryptToSelfParametersStrategy(
             @Nullable final Function<Pair<ProfileRequestContext, EncryptionParameters>, 
             List<EncryptionParameters>> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         encryptToSelfParametersStrategy = strategy;
     }
@@ -157,7 +157,7 @@ public abstract class AbstractEncryptAction extends AbstractConditionalProfileAc
      * @param strategy lookup strategy
      */
     public void setSelfRecipientLookupStrategy(@Nullable final Function<ProfileRequestContext, String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         selfRecipientLookupStrategy = strategy;
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AbstractResponseShellAction.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AbstractResponseShellAction.java
index 49f8b0499..5741fa7c0 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AbstractResponseShellAction.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AbstractResponseShellAction.java
@@ -93,7 +93,7 @@ public abstract class AbstractResponseShellAction<MessageType extends StatusResp
      * @param flag flag to set
      */
     public void setOverwriteExisting(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         overwriteExisting = flag;
     }
@@ -105,7 +105,7 @@ public abstract class AbstractResponseShellAction<MessageType extends StatusResp
      */
     public void setIdentifierGeneratorLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,IdentifierGenerationStrategy> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         idGeneratorLookupStrategy =
                 Constraint.isNotNull(strategy, "IdentifierGenerationStrategy lookup strategy cannot be null");
@@ -117,7 +117,7 @@ public abstract class AbstractResponseShellAction<MessageType extends StatusResp
      * @param strategy lookup strategy
      */
     public void setIssuerLookupStrategy(@Nullable final Function<ProfileRequestContext,String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         issuerLookupStrategy = strategy;
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddChannelBindingsToAssertions.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddChannelBindingsToAssertions.java
index 9549e04c6..d4f6165c4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddChannelBindingsToAssertions.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddChannelBindingsToAssertions.java
@@ -85,7 +85,7 @@ public class AddChannelBindingsToAssertions extends AbstractConditionalProfileAc
      */
     public void setChannelBindingsContextLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,ChannelBindingsContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         channelBindingsContextLookupStrategy = Constraint.isNotNull(strategy,
                 "ChannelBindingsContext lookup strategy cannot be null");
@@ -97,7 +97,7 @@ public class AddChannelBindingsToAssertions extends AbstractConditionalProfileAc
      * @param strategy lookup strategy
      */
     public void setResponseLookupStrategy(@Nonnull final Function<ProfileRequestContext,Response> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         responseLookupStrategy = Constraint.isNotNull(strategy, "Response lookup strategy cannot be null");
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddGeneratedKeyToAssertions.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddGeneratedKeyToAssertions.java
index 707e6fda2..332b7c215 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddGeneratedKeyToAssertions.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddGeneratedKeyToAssertions.java
@@ -88,7 +88,7 @@ public class AddGeneratedKeyToAssertions extends AbstractConditionalProfileActio
      */
     public void setECPContextLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,ECPContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         ecpContextLookupStrategy = Constraint.isNotNull(strategy, "ECPContext lookup strategy cannot be null");
     }
@@ -99,7 +99,7 @@ public class AddGeneratedKeyToAssertions extends AbstractConditionalProfileActio
      * @param strategy lookup strategy
      */
     public void setResponseLookupStrategy(@Nonnull final Function<ProfileRequestContext,Response> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         responseLookupStrategy = Constraint.isNotNull(strategy, "Response lookup strategy cannot be null");
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjects.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjects.java
index 8cd332bfc..72752e502 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjects.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddNameIDToSubjects.java
@@ -177,7 +177,7 @@ public class AddNameIDToSubjects extends AbstractProfileAction {
      * @param flag  true iff the action should overwrite any existing objects
      */
     public void setOverwriteExisting(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         overwriteExisting = flag;
     }
@@ -188,7 +188,7 @@ public class AddNameIDToSubjects extends AbstractProfileAction {
      * @param strategy strategy used to locate the {@link AuthnRequest}
      */
     public void setRequestLookupStrategy(@Nonnull final Function<ProfileRequestContext,AuthnRequest> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         requestLookupStrategy = Constraint.isNotNull(strategy, "AuthnRequest lookup strategy cannot be null");
     }
@@ -199,7 +199,7 @@ public class AddNameIDToSubjects extends AbstractProfileAction {
      * @param strategy lookup strategy
      */
     public void setAssertionsLookupStrategy(@Nonnull final Function<ProfileRequestContext,List<Assertion>> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         assertionsLookupStrategy = Constraint.isNotNull(strategy, "Assertions lookup strategy cannot be null");
     }
@@ -211,7 +211,7 @@ public class AddNameIDToSubjects extends AbstractProfileAction {
      */
     public void setIdentifierGeneratorLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,IdentifierGenerationStrategy> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         idGeneratorLookupStrategy =
                 Constraint.isNotNull(strategy, "IdentifierGenerationStrategy lookup strategy cannot be null");
@@ -223,7 +223,7 @@ public class AddNameIDToSubjects extends AbstractProfileAction {
      * @param strategy lookup strategy
      */
     public void setIssuerLookupStrategy(@Nullable final Function<ProfileRequestContext,String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         issuerLookupStrategy = strategy;
     }
@@ -234,7 +234,7 @@ public class AddNameIDToSubjects extends AbstractProfileAction {
      * @param predicate predicate used to evaluate the {@link NameIDPolicy}
      */
     public void setNameIDPolicyPredicate(@Nonnull final Predicate<ProfileRequestContext> predicate) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         nameIDPolicyPredicate = Constraint.isNotNull(predicate, "NameIDPolicy predicate cannot be null");
     }
@@ -245,7 +245,7 @@ public class AddNameIDToSubjects extends AbstractProfileAction {
      * @param strategy  format lookup strategy
      */
     public void setFormatLookupStrategy(@Nonnull final Function<ProfileRequestContext,List<String>> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         formatLookupStrategy = Constraint.isNotNull(strategy, "Format lookup strategy cannot be null");
     }
@@ -256,7 +256,7 @@ public class AddNameIDToSubjects extends AbstractProfileAction {
      * @param theGenerator the generator to use
      */
     public void setNameIDGenerator(@Nullable final SAML2NameIDGenerator theGenerator) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         generator = Constraint.isNotNull(theGenerator, "SAML2NameIDGenerator cannot be null");
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddOneTimeUseConditionToAssertions.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddOneTimeUseConditionToAssertions.java
index 4e4f39163..fcd8dd83a 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddOneTimeUseConditionToAssertions.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddOneTimeUseConditionToAssertions.java
@@ -69,7 +69,7 @@ public class AddOneTimeUseConditionToAssertions extends AbstractConditionalProfi
      * @param strategy strategy used to locate the {@link Response} to operate on
      */
     public void setResponseLookupStrategy(@Nonnull final Function<ProfileRequestContext,Response> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         responseLookupStrategy = Constraint.isNotNull(strategy, "Response lookup strategy cannot be null");
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddProxyRestrictionToAssertions.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddProxyRestrictionToAssertions.java
index 4f0ab0af2..0c7f7a9c2 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddProxyRestrictionToAssertions.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddProxyRestrictionToAssertions.java
@@ -83,7 +83,7 @@ public class AddProxyRestrictionToAssertions extends AbstractConditionalProfileA
      * @param strategy lookup strategy
      */
     public void setResponseLookupStrategy(@Nonnull final Function<ProfileRequestContext,Response> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         responseLookupStrategy = Constraint.isNotNull(strategy, "Response lookup strategy cannot be null");
     }
@@ -95,7 +95,7 @@ public class AddProxyRestrictionToAssertions extends AbstractConditionalProfileA
      */
     public void setProxyRestrictionLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,Pair<Integer,Set<String>>> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         proxyRestrictionLookupStrategy =
                 Constraint.isNotNull(strategy, "Proxy restriction lookup strategy cannot be null");
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddStatusResponseShell.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddStatusResponseShell.java
index 1398c3528..c3e6df4db 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddStatusResponseShell.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddStatusResponseShell.java
@@ -105,7 +105,7 @@ public class AddStatusResponseShell extends AbstractProfileAction {
      * @param flag flag to set
      */
     public void setOverwriteExisting(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         overwriteExisting = flag;
     }
@@ -117,7 +117,7 @@ public class AddStatusResponseShell extends AbstractProfileAction {
      */
     public void setIdentifierGeneratorLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,IdentifierGenerationStrategy> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         idGeneratorLookupStrategy =
                 Constraint.isNotNull(strategy, "IdentifierGenerationStrategy lookup strategy cannot be null");
@@ -129,7 +129,7 @@ public class AddStatusResponseShell extends AbstractProfileAction {
      * @param strategy lookup strategy
      */
     public void setIssuerLookupStrategy(@Nullable final Function<ProfileRequestContext,String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         issuerLookupStrategy = strategy;
     }
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 34cc93e5c..ef36c5c7b 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
@@ -108,7 +108,7 @@ public class AddStatusToResponse extends AbstractProfileAction {
      * @param strategy strategy used to locate the {@link StatusResponseType} to operate on
      */
     public void setResponseLookupStrategy(@Nonnull final Function<ProfileRequestContext,StatusResponseType> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         responseLookupStrategy = Constraint.isNotNull(strategy, "Response lookup strategy cannot be null");
     }
@@ -120,7 +120,7 @@ public class AddStatusToResponse extends AbstractProfileAction {
      * @param condition predicate for detailed errors condition
      */
     public void setDetailedErrorsCondition(@Nonnull final Predicate<ProfileRequestContext> condition) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         detailedErrorsCondition =
                 Constraint.isNotNull(condition, "Detailed errors condition cannot be null");
@@ -132,7 +132,7 @@ public class AddStatusToResponse extends AbstractProfileAction {
      * @param strategy strategy used to obtain status codes
      */
     public void setStatusCodesLookupStrategy(@Nullable final Function<ProfileRequestContext,List<String>> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         statusCodesLookupStrategy = strategy;
     }
@@ -143,7 +143,7 @@ public class AddStatusToResponse extends AbstractProfileAction {
      * @param strategy strategy used to obtain a status message
      */
     public void setStatusMessageLookupStrategy(@Nullable final Function<ProfileRequestContext, String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         statusMessageLookupStrategy = strategy;
     }
@@ -155,7 +155,7 @@ public class AddStatusToResponse extends AbstractProfileAction {
      * @param codes list of status code values to insert
      */
     public void setStatusCodes(@Nonnull @NonnullElements final List<String> codes) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         defaultStatusCodes = List.copyOf(Constraint.isNotNull(codes, "Status code list cannot be null"));
     }
@@ -167,7 +167,7 @@ public class AddStatusToResponse extends AbstractProfileAction {
      * @param message default status message
      */
     public void setStatusMessage(@Nullable final String message) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         statusMessage = StringSupport.trimOrNull(message);
     }
@@ -175,7 +175,7 @@ public class AddStatusToResponse extends AbstractProfileAction {
     /** {@inheritDoc} */
     @Override
     protected boolean doPreExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
-        throwComponentStateExceptions();
+        checkComponentActive();
 
         response = responseLookupStrategy.apply(profileRequestContext);
         if (response == null) {
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjects.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjects.java
index e621e234a..53f86dcc8 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjects.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjects.java
@@ -164,7 +164,7 @@ public class AddSubjectConfirmationToSubjects extends AbstractProfileAction {
      * @param flag  true iff the action should overwrite any existing objects
      */
     public void setOverwriteExisting(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         overwriteExisting = flag;
     }
@@ -176,7 +176,7 @@ public class AddSubjectConfirmationToSubjects extends AbstractProfileAction {
      */
     public void setResponseLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,Response> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         responseLookupStrategy = Constraint.isNotNull(strategy, "Response lookup strategy cannot be null");
     }
@@ -187,7 +187,7 @@ public class AddSubjectConfirmationToSubjects extends AbstractProfileAction {
      * @param strategy lookup strategy
      */
     public void setAddressLookupStrategy(@Nullable final Function<ProfileRequestContext,String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         addressLookupStrategy = strategy;
     }
@@ -198,7 +198,7 @@ public class AddSubjectConfirmationToSubjects extends AbstractProfileAction {
      * @param strategy lookup strategy
      */
     public void setInResponseToLookupStrategy(@Nullable final Function<ProfileRequestContext,String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         inResponseToLookupStrategy = strategy;
     }
@@ -209,7 +209,7 @@ public class AddSubjectConfirmationToSubjects extends AbstractProfileAction {
      * @param strategy lookup strategy
      */
     public void setRecipientLookupStrategy(@Nullable final Function<ProfileRequestContext,String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         recipientLookupStrategy = strategy;
     }
@@ -220,7 +220,7 @@ public class AddSubjectConfirmationToSubjects extends AbstractProfileAction {
      * @param strategy lookup strategy
      */
     public void setLifetimeLookupStrategy(@Nullable final Function<ProfileRequestContext,Long> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         lifetimeLookupStrategy = strategy;
     }
@@ -231,7 +231,7 @@ public class AddSubjectConfirmationToSubjects extends AbstractProfileAction {
      * @param method   confirmation method to use
      */
     public void setMethod(@Nonnull @NotEmpty final String method) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         confirmationMethod = Constraint.isNotNull(StringSupport.trimOrNull(method),
                 "Confirmation method cannot be null or empty"); 
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/CopyNameIDFromRequest.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/CopyNameIDFromRequest.java
index bd1d6937c..1081c9112 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/CopyNameIDFromRequest.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/CopyNameIDFromRequest.java
@@ -107,7 +107,7 @@ public class CopyNameIDFromRequest extends AbstractProfileAction {
      * @param flag  true iff the action should overwrite any existing objects
      */
     public void setOverwriteExisting(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         overwriteExisting = flag;
     }
@@ -119,7 +119,7 @@ public class CopyNameIDFromRequest extends AbstractProfileAction {
      */
     public void setNameIDContextLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,SAMLSubjectNameIdentifierContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         nameIdentifierContextLookupStrategy = Constraint.isNotNull(strategy,
                 "SAMLSubjectNameIdentifierContext lookup strategy cannot be null");
@@ -131,7 +131,7 @@ public class CopyNameIDFromRequest extends AbstractProfileAction {
      * @param strategy lookup strategy
      */
     public void setResponseLookupStrategy(@Nonnull final Function<ProfileRequestContext,Response> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         responseLookupStrategy = Constraint.isNotNull(strategy, "Response lookup strategy cannot be null");
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptAssertions.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptAssertions.java
index a7da7d155..c814c5243 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptAssertions.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptAssertions.java
@@ -83,7 +83,7 @@ public class EncryptAssertions extends AbstractEncryptAction {
      * @param strategy strategy used to locate the {@link Response} to operate on
      */
     public void setResponseLookupStrategy(@Nonnull final Function<ProfileRequestContext,StatusResponseType> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         responseLookupStrategy = Constraint.isNotNull(strategy, "Response lookup strategy cannot be null");
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptAttributes.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptAttributes.java
index 23dbbbe8a..5e7163169 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptAttributes.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptAttributes.java
@@ -83,7 +83,7 @@ public class EncryptAttributes extends AbstractEncryptAction {
      * @param strategy strategy used to locate the {@link Response} to operate on
      */
     public void setResponseLookupStrategy(@Nonnull final Function<ProfileRequestContext,StatusResponseType> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         responseLookupStrategy = Constraint.isNotNull(strategy, "Response lookup strategy cannot be null");
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptNameIDs.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptNameIDs.java
index 84e9451b3..da53fd5d9 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptNameIDs.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/EncryptNameIDs.java
@@ -100,7 +100,7 @@ public class EncryptNameIDs extends AbstractEncryptAction {
      * @param strategy strategy used to locate the {@link Response} to operate on
      */
     public void setMessageLookupStrategy(@Nonnull final Function<ProfileRequestContext,SAMLObject> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         messageLookupStrategy = Constraint.isNotNull(strategy, "Message lookup strategy cannot be null");
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/PopulateECPContext.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/PopulateECPContext.java
index e31b8793f..b7c41fc83 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/PopulateECPContext.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/PopulateECPContext.java
@@ -90,7 +90,7 @@ public class PopulateECPContext extends AbstractConditionalProfileAction {
      */
     public void setECPContextCreationStrategy(
             @Nonnull final Function<ProfileRequestContext,ECPContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         ecpContextCreationStrategy = Constraint.isNotNull(strategy, "ECPContext creation strategy cannot be null");
     }
@@ -102,7 +102,7 @@ public class PopulateECPContext extends AbstractConditionalProfileAction {
      */
     public void setEncryptionContextLookupStrategy(
             @Nonnull final Function<ProfileRequestContext,EncryptionContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         encryptionContextLookupStrategy = Constraint.isNotNull(strategy,
                 "EncryptionContext lookup strategy cannot be null");
@@ -114,7 +114,7 @@ public class PopulateECPContext extends AbstractConditionalProfileAction {
      * @param generator random number generator
      */
     public void setRandomGenerator(@Nullable final SecureRandom generator) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         randomGenerator = generator;
     }
@@ -125,7 +125,7 @@ public class PopulateECPContext extends AbstractConditionalProfileAction {
      * @param flag  flag to set
      */
     public void setRequireEncryption(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         requireEncryption = flag;
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/ResolveArtifact.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/ResolveArtifact.java
index 1e7d9045a..ef62051bc 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/ResolveArtifact.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/ResolveArtifact.java
@@ -102,7 +102,7 @@ public class ResolveArtifact extends AbstractProfileAction {
      * @param strategy lookup strategy
      */
     public void setRequestLookupStrategy(@Nonnull final Function<ProfileRequestContext,ArtifactResolve> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         requestLookupStrategy = Constraint.isNotNull(strategy, "Request lookup strategy cannot be null");
     }
@@ -113,7 +113,7 @@ public class ResolveArtifact extends AbstractProfileAction {
      * @param strategy lookup strategy
      */
     public void setResponseLookupStrategy(@Nonnull final Function<ProfileRequestContext,ArtifactResponse> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         responseLookupStrategy = Constraint.isNotNull(strategy, "Response lookup strategy cannot be null");
     }
@@ -124,7 +124,7 @@ public class ResolveArtifact extends AbstractProfileAction {
      * @param strategy lookup strategy
      */
     public void setIssuerLookupStrategy(@Nonnull final Function<ProfileRequestContext,String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
     
         issuerLookupStrategy = Constraint.isNotNull(strategy, "Issuer lookup strategy cannot be null");
     }
@@ -135,7 +135,7 @@ public class ResolveArtifact extends AbstractProfileAction {
      * @param strategy lookup strategy
      */
     public void setRequesterLookupStrategy(@Nonnull final Function<ProfileRequestContext,String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         requesterLookupStrategy = Constraint.isNotNull(strategy, "Requester lookup strategy cannot be null");
     }
@@ -146,7 +146,7 @@ public class ResolveArtifact extends AbstractProfileAction {
      * @param map   artifact map
      */
     public void setArtifactMap(@Nonnull final SAMLArtifactMap map) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         artifactMap = Constraint.isNotNull(map, "SAMLArtifactMap cannot be null");
     }
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertions.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertions.java
index 9e2663b82..1b763a41c 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertions.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/ValidateAssertions.java
@@ -106,7 +106,7 @@ public class ValidateAssertions extends AbstractProfileAction {
      * @param function the new assertion resolver function
      */
     public void setAssertionResolver(@Nonnull final Function<ProfileRequestContext, List<Assertion>> function) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         assertionResolver = function;
     }
 
@@ -137,7 +137,7 @@ public class ValidateAssertions extends AbstractProfileAction {
      */
     public void setValidationContextBuilder(
             @Nonnull final Function<AssertionValidationInput, ValidationContext> builder) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         validationContextBuilder = builder;
     }
 
@@ -156,7 +156,7 @@ public class ValidateAssertions extends AbstractProfileAction {
      * @param request The HTTP servlet request
      */
     public void setHttpServletRequest(@Nonnull final HttpServletRequest request) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         httpServletRequest = request;
     }
     
@@ -183,7 +183,7 @@ public class ValidateAssertions extends AbstractProfileAction {
      * @param flag The invalidFatal to set.
      */
     public void setInvalidFatal(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         invalidFatal = flag;
     }
     
@@ -202,7 +202,7 @@ public class ValidateAssertions extends AbstractProfileAction {
      * @param validator the local Assertion validator, may be null
      */
     public void setAssertionValidator(@Nullable final SAML20AssertionValidator validator) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         assertionValidator = validator;
     }
     
@@ -223,7 +223,7 @@ public class ValidateAssertions extends AbstractProfileAction {
      */
     public void setAssertionValidatorLookup(
             @Nullable final Function<Pair<ProfileRequestContext, Assertion>, SAML20AssertionValidator> function) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         assertionValidatorLookup = function;
     }
 
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 9b4d9bf34..11cce1217 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
@@ -114,7 +114,7 @@ public class WSSecuritySAML20AssertionTokenSecurityHandler extends AbstractMessa
      */
     public void setValidationContextBuilder(
             @Nonnull final Function<SAML20AssertionTokenValidationInput, ValidationContext> builder) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         validationContextBuilder = Constraint.isNotNull(builder, "Validation context builder may not be null");
     }
 
@@ -133,7 +133,7 @@ public class WSSecuritySAML20AssertionTokenSecurityHandler extends AbstractMessa
      * @param request The HTTP servlet request
      */
     public void setHttpServletRequest(@Nonnull final HttpServletRequest request) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         httpServletRequest = Constraint.isNotNull(request, "HttpServletRequest cannot be null");
     }
     
@@ -160,7 +160,7 @@ public class WSSecuritySAML20AssertionTokenSecurityHandler extends AbstractMessa
      * @param flag The invalidFatal to set.
      */
     public void setInvalidFatal(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         invalidFatal = flag;
     }
     
@@ -179,7 +179,7 @@ public class WSSecuritySAML20AssertionTokenSecurityHandler extends AbstractMessa
      * @param validator the local Assertion validator, may be null
      */
     public void setAssertionValidator(@Nullable final SAML20AssertionValidator validator) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         assertionValidator = validator;
     }
     
@@ -199,7 +199,7 @@ public class WSSecuritySAML20AssertionTokenSecurityHandler extends AbstractMessa
      */
     public void setAssertionValidatorLookup(
             @Nullable final Function<Pair<MessageContext, Assertion>, SAML20AssertionValidator> function) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         assertionValidatorLookup = function;
     }
 
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/crypto/ec/curves/AbstractNamedCurve.java b/opensaml-security-api/src/main/java/org/opensaml/security/crypto/ec/curves/AbstractNamedCurve.java
index 45feea92f..2322065bd 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/crypto/ec/curves/AbstractNamedCurve.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/crypto/ec/curves/AbstractNamedCurve.java
@@ -50,7 +50,7 @@ public abstract class AbstractNamedCurve extends AbstractInitializableComponent
     
     /** {@inheritDoc} */
     @NonnullAfterInit public ECParameterSpec getParameterSpec() {
-        throwComponentStateExceptions();
+        checkComponentActive();
         return paramSpec;
     }
 
diff --git a/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecurityContextHandler.java b/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecurityContextHandler.java
index 4e35605cc..3e3a13c09 100644
--- a/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecurityContextHandler.java
+++ b/opensaml-security-api/src/main/java/org/opensaml/security/httpclient/HttpClientSecurityContextHandler.java
@@ -53,14 +53,14 @@ public class HttpClientSecurityContextHandler extends AbstractInitializableCompo
      * @param params the new client security parameters
      */
     public void setHttpClientSecurityParameters(@Nullable final HttpClientSecurityParameters params) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         httpClientSecurityParameters = params;
     }
     
     /** {@inheritDoc} */
     public void invokeBefore(final HttpClientContext context, final HttpUriRequest request) throws IOException {
-        throwComponentStateExceptions();
+        checkComponentActive();
         
         HttpClientSecuritySupport.marshalSecurityParameters(context, httpClientSecurityParameters, false);
         HttpClientSecuritySupport.addDefaultTLSTrustEngineCriteria(context, request);
@@ -68,7 +68,7 @@ public class HttpClientSecurityContextHandler extends AbstractInitializableCompo
 
     /** {@inheritDoc} */
     public void invokeAfter(final HttpClientContext context, final HttpUriRequest request) throws IOException {
-        throwComponentStateExceptions();
+        checkComponentActive();
         
         HttpClientSecuritySupport.checkTLSCredentialEvaluated(context, request.getURI().getScheme());
     }
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/messaging/impl/BaseClientCertAuthSecurityHandler.java b/opensaml-security-impl/src/main/java/org/opensaml/security/messaging/impl/BaseClientCertAuthSecurityHandler.java
index 9d6ca0fff..d0764803c 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/messaging/impl/BaseClientCertAuthSecurityHandler.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/messaging/impl/BaseClientCertAuthSecurityHandler.java
@@ -115,7 +115,7 @@ public abstract class BaseClientCertAuthSecurityHandler extends BaseTrustEngineS
      * @param request The to set.
      */
     public void setHttpServletRequest(@Nonnull final HttpServletRequest request) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         httpServletRequest = Constraint.isNotNull(request, "HttpServletRequest cannot be null");
     }
 
diff --git a/opensaml-security-impl/src/main/java/org/opensaml/security/messaging/impl/PopulateHttpClientSecurityParametersHandler.java b/opensaml-security-impl/src/main/java/org/opensaml/security/messaging/impl/PopulateHttpClientSecurityParametersHandler.java
index 8a2b711da..9b0283f69 100644
--- a/opensaml-security-impl/src/main/java/org/opensaml/security/messaging/impl/PopulateHttpClientSecurityParametersHandler.java
+++ b/opensaml-security-impl/src/main/java/org/opensaml/security/messaging/impl/PopulateHttpClientSecurityParametersHandler.java
@@ -85,7 +85,7 @@ public class PopulateHttpClientSecurityParametersHandler extends AbstractMessage
      * @param predicate clientTLS predicate
      */
     public void setClientTLSPredicate(@Nullable final Predicate<MessageContext> predicate) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         clientTLSPredicate = predicate;
     }
@@ -97,7 +97,7 @@ public class PopulateHttpClientSecurityParametersHandler extends AbstractMessage
      */
     public void setSecurityParametersContextLookupStrategy(
             @Nonnull final Function<MessageContext,HttpClientSecurityContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         securityParametersContextLookupStrategy = Constraint.isNotNull(strategy,
                 "HttpClientSecurityContext lookup strategy cannot be null");
@@ -111,7 +111,7 @@ public class PopulateHttpClientSecurityParametersHandler extends AbstractMessage
      */
     public void setExistingParametersContextLookupStrategy(
             @Nullable final Function<MessageContext,HttpClientSecurityContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         existingParametersContextLookupStrategy = strategy;
     }
@@ -123,7 +123,7 @@ public class PopulateHttpClientSecurityParametersHandler extends AbstractMessage
      */
     public void setConfigurationLookupStrategy(
             @Nonnull final Function<MessageContext,List<HttpClientSecurityConfiguration>> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         configurationLookupStrategy = Constraint.isNotNull(strategy,
                 "HttpClientSecurityConfiguration lookup strategy cannot be null");
@@ -136,7 +136,7 @@ public class PopulateHttpClientSecurityParametersHandler extends AbstractMessage
      */
     public void setHttpClientSecurityParametersResolver(
             @Nonnull final HttpClientSecurityParametersResolver newResolver) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         resolver = Constraint.isNotNull(newResolver, "HttpClientSecurityParametersResolver cannot be null");
     }
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/AbstractPipelineHttpSOAPClient.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/AbstractPipelineHttpSOAPClient.java
index 003bffaa0..5ccc4daaa 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/AbstractPipelineHttpSOAPClient.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/AbstractPipelineHttpSOAPClient.java
@@ -125,7 +125,7 @@ public abstract class AbstractPipelineHttpSOAPClient
      * @param client client object
      */
     public void setHttpClient(@Nonnull final HttpClient client) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         httpClient = Constraint.isNotNull(client, "HttpClient cannot be null");
     }
@@ -145,7 +145,7 @@ public abstract class AbstractPipelineHttpSOAPClient
      * @param params the new client security parameters
      */
     public void setHttpClientSecurityParameters(@Nullable final HttpClientSecurityParameters params) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         httpClientSecurityParameters = params;
     }
@@ -169,7 +169,7 @@ public abstract class AbstractPipelineHttpSOAPClient
      * @param function the strategy function, or null
      */
     public void setTLSCriteriaSetStrategy(@Nullable final Function<InOutOperationContext,CriteriaSet> function) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         tlsCriteriaSetStrategy = function;
     }
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/HttpSOAPClient.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/HttpSOAPClient.java
index a3ef64e91..65f7b75a0 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/HttpSOAPClient.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/HttpSOAPClient.java
@@ -120,7 +120,7 @@ public class HttpSOAPClient extends AbstractInitializableComponent implements SO
      * @param client client object
      */
     public void setHttpClient(@Nonnull final HttpClient client) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         httpClient = Constraint.isNotNull(client, "HttpClient cannot be null");
     }
@@ -131,7 +131,7 @@ public class HttpSOAPClient extends AbstractInitializableComponent implements SO
      * @param parser parser pool
      */
     public void setParserPool(@Nonnull final ParserPool parser) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         parserPool = Constraint.isNotNull(parser, "ParserPool cannot be null");
     }
@@ -158,7 +158,7 @@ public class HttpSOAPClient extends AbstractInitializableComponent implements SO
      *            message context
      */
     public void setSOAPClientContextLookupStrategy(@Nonnull final Function<MessageContext,SOAPClientContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         soapClientContextLookupStrategy =
                 Constraint.isNotNull(strategy, "SOAP client context lookup strategy cannot be null");
@@ -183,7 +183,7 @@ public class HttpSOAPClient extends AbstractInitializableComponent implements SO
      *            message context
      */
     public void setSOAP11ContextLookupStrategy(@Nonnull final Function<MessageContext,SOAP11Context> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         soap11ContextLookupStrategy =
                 Constraint.isNotNull(strategy, "SOAP 1.1 context lookup strategy cannot be null");
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/PipelineFactoryHttpSOAPClient.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/PipelineFactoryHttpSOAPClient.java
index 5a336c6a3..fe3d112d7 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/PipelineFactoryHttpSOAPClient.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/client/http/PipelineFactoryHttpSOAPClient.java
@@ -57,7 +57,7 @@ public class PipelineFactoryHttpSOAPClient extends AbstractPipelineHttpSOAPClien
      */
     public void setPipelineFactory(
             @Nonnull final HttpClientMessagePipelineFactory factory) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         pipelineFactory = Constraint.isNotNull(factory, "HttpClientPipelineFactory cannot be null"); 
     }
@@ -68,7 +68,7 @@ public class PipelineFactoryHttpSOAPClient extends AbstractPipelineHttpSOAPClien
      * @param function the strategy function, or null
      */
     public void setPipelineNameStrategy(@Nullable final Function<InOutOperationContext,String> function) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         pipelineNameStrategy = function;
     }
diff --git a/opensaml-soap-api/src/main/java/org/opensaml/soap/messaging/AbstractHeaderGeneratingMessageHandler.java b/opensaml-soap-api/src/main/java/org/opensaml/soap/messaging/AbstractHeaderGeneratingMessageHandler.java
index f2f0041a5..468a9e5f1 100644
--- a/opensaml-soap-api/src/main/java/org/opensaml/soap/messaging/AbstractHeaderGeneratingMessageHandler.java
+++ b/opensaml-soap-api/src/main/java/org/opensaml/soap/messaging/AbstractHeaderGeneratingMessageHandler.java
@@ -59,7 +59,7 @@ public abstract class AbstractHeaderGeneratingMessageHandler extends AbstractMes
      * @param flag true if header must be understood, false if not
      */
     public void setMustUnderstand(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         mustUnderstand = flag;
     }
     
@@ -69,7 +69,7 @@ public abstract class AbstractHeaderGeneratingMessageHandler extends AbstractMes
      * @param strategy the predicate strategy
      */
     public void setMustUnderstandStrategy(@Nullable final Predicate<MessageContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         mustUnderstandStrategy = strategy;
     }
     
@@ -88,7 +88,7 @@ public abstract class AbstractHeaderGeneratingMessageHandler extends AbstractMes
      * @param node the target node, may be null
      */
     public void setTargetNode(@Nullable final String node) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         targetNode = StringSupport.trimOrNull(node);
     }
     
@@ -98,7 +98,7 @@ public abstract class AbstractHeaderGeneratingMessageHandler extends AbstractMes
      * @param strategy the predicate strategy
      */
     public void setTargetNodeStrategy(@Nullable final Function<MessageContext,String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         targetNodeStrategy = strategy;
     }
     
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/profile/impl/AddSOAPFault.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/profile/impl/AddSOAPFault.java
index ac46d205f..69b454992 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/profile/impl/AddSOAPFault.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/soap11/profile/impl/AddSOAPFault.java
@@ -120,7 +120,7 @@ public class AddSOAPFault extends AbstractProfileAction {
      * @param strategy strategy used to resolve the fault instance
      */
     public void setContextFaultStrategy(@Nullable final Function<ProfileRequestContext,Fault> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         contextFaultStrategy = strategy;
     }
@@ -131,7 +131,7 @@ public class AddSOAPFault extends AbstractProfileAction {
      * @param condition predicate for detailed errors condition
      */
     public void setDetailedErrorsCondition(@Nonnull final Predicate<ProfileRequestContext> condition) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         detailedErrorsCondition = Constraint.isNotNull(condition, "Detailed errors condition cannot be null");
     }
@@ -142,7 +142,7 @@ public class AddSOAPFault extends AbstractProfileAction {
      * @param strategy strategy used to obtain faultcode
      */
     public void setFaultCodeLookupStrategy(@Nullable final Function<ProfileRequestContext,QName> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         faultCodeLookupStrategy = strategy;
     }
@@ -153,7 +153,7 @@ public class AddSOAPFault extends AbstractProfileAction {
      * @param strategy strategy used to obtain a fault string
      */
     public void setFaultStringLookupStrategy(@Nullable final Function<ProfileRequestContext,String> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         faultStringLookupStrategy = strategy;
     }
@@ -164,7 +164,7 @@ public class AddSOAPFault extends AbstractProfileAction {
      * @param code faultcode
      */
     public void setFaultCode(@Nonnull final QName code) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         defaultFaultCode = Constraint.isNotNull(code, "Faultcode cannot be null");
     }
@@ -176,7 +176,7 @@ public class AddSOAPFault extends AbstractProfileAction {
      * @param message default faultstring
      */
     public void setFaultString(@Nullable final String message) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         faultString = StringSupport.trimOrNull(message);
     }
@@ -184,7 +184,7 @@ public class AddSOAPFault extends AbstractProfileAction {
     /** {@inheritDoc} */
     @Override
     protected boolean doPreExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
-        throwComponentStateExceptions();
+        checkComponentActive();
 
         detailedErrors = detailedErrorsCondition.test(profileRequestContext);
         
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandler.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandler.java
index 3f5ed26f8..c8d4f17cb 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandler.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandler.java
@@ -81,7 +81,7 @@ public class AddActionHandler extends AbstractHeaderGeneratingMessageHandler {
      * @param uri the new URI value
      */
     public void setActionURI(@Nullable final String uri) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         actionURI = StringSupport.trimOrNull(uri);
     }
     
@@ -100,7 +100,7 @@ public class AddActionHandler extends AbstractHeaderGeneratingMessageHandler {
      * @param uri the new URI value
      */
     public void setFaultActionURI(@Nullable final String uri) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         faultActionURI = StringSupport.trimOrNull(uri);
     }
     
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddMessageIDHandler.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddMessageIDHandler.java
index 1216653f3..fece09acc 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddMessageIDHandler.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddMessageIDHandler.java
@@ -67,7 +67,7 @@ public class AddMessageIDHandler extends AbstractHeaderGeneratingMessageHandler
      * @param strategy the new strategy
      */
     public void setIdentifierGenerationStrategy(@Nullable final IdentifierGenerationStrategy strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         identifierGenerationStrategy = strategy;
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddRelatesToHandler.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddRelatesToHandler.java
index c4237943b..d6fb9ea3b 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddRelatesToHandler.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddRelatesToHandler.java
@@ -64,7 +64,7 @@ public class AddRelatesToHandler extends AbstractHeaderGeneratingMessageHandler
      * @param lookup the lookup function
      */
     public void setRelatesToURILookup(final ContextDataLookupFunction<MessageContext, String> lookup) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         relatesToURILookup = lookup;
     }
 
@@ -83,7 +83,7 @@ public class AddRelatesToHandler extends AbstractHeaderGeneratingMessageHandler
      * @param value the relationship type
      */
     public void setRelationshipType(final String value) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         relationshipType = StringSupport.trimOrNull(value);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/ValidateActionHandler.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/ValidateActionHandler.java
index b4c88ca72..8282c1663 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/ValidateActionHandler.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/ValidateActionHandler.java
@@ -68,7 +68,7 @@ public class ValidateActionHandler extends AbstractMessageHandler {
      * @param uri the new URI value
      */
     public void setExpectedActionURI(@Nullable final String uri) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         expectedActionURI = StringSupport.trimOrNull(uri);
     }
 
diff --git a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/messaging/impl/AddTimestampHandler.java b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/messaging/impl/AddTimestampHandler.java
index 8051b9fae..5b2b6c7d7 100644
--- a/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/messaging/impl/AddTimestampHandler.java
+++ b/opensaml-soap-impl/src/main/java/org/opensaml/soap/wssecurity/messaging/impl/AddTimestampHandler.java
@@ -80,7 +80,7 @@ public class AddTimestampHandler extends AbstractHeaderGeneratingMessageHandler
      * @param lookup the lookup function
      */
     public void setCreatedLookup(@Nullable final Function<MessageContext,Instant> lookup) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         createdLookup = lookup;
     }
 
@@ -99,7 +99,7 @@ public class AddTimestampHandler extends AbstractHeaderGeneratingMessageHandler
      * @param lookup the lookup function
      */
     public void setExpiresLookup(@Nullable final Function<MessageContext,Instant> lookup) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         expiresLookup = lookup;
     }
 
@@ -120,7 +120,7 @@ public class AddTimestampHandler extends AbstractHeaderGeneratingMessageHandler
      * @param flag true if should use currnet time, false if not
      */
     public void setUseCurrentTimeAsDefaultCreated(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         useCurrentTimeAsDefaultCreated = flag;
     }
     
@@ -141,7 +141,7 @@ public class AddTimestampHandler extends AbstractHeaderGeneratingMessageHandler
      * @param value the expires offset, or null
      */
     public void setExpiresOffsetFromCreated(@Nullable final Duration value) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         expiresOffsetFromCreated = value;
     }
 
diff --git a/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractStorageService.java b/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractStorageService.java
index 3edd2eee3..268108f83 100644
--- a/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractStorageService.java
+++ b/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractStorageService.java
@@ -89,7 +89,7 @@ public abstract class AbstractStorageService extends AbstractIdentifiableInitial
      * @param interval time between one cleanup and another
      */
     public void setCleanupInterval(@Nonnull final Duration interval) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         Constraint.isNotNull(interval, "Interval cannot be null");
         Constraint.isFalse(interval.isNegative(), "Interval cannot be negative");
@@ -114,7 +114,7 @@ public abstract class AbstractStorageService extends AbstractIdentifiableInitial
      * @param timer timer used to schedule configuration reload tasks
      */
     public void setCleanupTaskTimer(@Nullable final Timer timer) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         cleanupTaskTimer = timer;
     }
@@ -138,7 +138,7 @@ public abstract class AbstractStorageService extends AbstractIdentifiableInitial
      * @param size limit on context size in characters
      */
     public void setContextSize(@Positive final int size) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         contextSize = Constraint.isGreaterThan(0, size, "Size must be greater than zero");
     }
@@ -149,7 +149,7 @@ public abstract class AbstractStorageService extends AbstractIdentifiableInitial
      * @param size size limit on key size in characters
      */
     public void setKeySize(@Positive final int size) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         keySize = Constraint.isGreaterThan(0, size, "Size must be greater than zero");
     }
@@ -160,7 +160,7 @@ public abstract class AbstractStorageService extends AbstractIdentifiableInitial
      * @param size size limit on value size in characters
      */
     public void setValueSize(@Positive final int size) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         valueSize = Constraint.isGreaterThan(0, size, "Size must be greater than zero");
     }
diff --git a/opensaml-storage-api/src/main/java/org/opensaml/storage/ReplayCache.java b/opensaml-storage-api/src/main/java/org/opensaml/storage/ReplayCache.java
index 5740636ec..fece6681a 100644
--- a/opensaml-storage-api/src/main/java/org/opensaml/storage/ReplayCache.java
+++ b/opensaml-storage-api/src/main/java/org/opensaml/storage/ReplayCache.java
@@ -71,7 +71,7 @@ public class ReplayCache extends AbstractIdentifiableInitializableComponent {
      * @param storageService backing store to use
      */
     public void setStorage(@Nonnull final StorageService storageService) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         storage = Constraint.isNotNull(storageService, "StorageService cannot be null");
         final StorageCapabilities caps = storage.getCapabilities();
@@ -95,7 +95,7 @@ public class ReplayCache extends AbstractIdentifiableInitializableComponent {
      * @param flag true iff we should treat storage failures as a replay
      */
     public void setStrict(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         strict = flag;
     }
diff --git a/opensaml-storage-api/src/main/java/org/opensaml/storage/RevocationCache.java b/opensaml-storage-api/src/main/java/org/opensaml/storage/RevocationCache.java
index 3352cc077..a2cf12180 100644
--- a/opensaml-storage-api/src/main/java/org/opensaml/storage/RevocationCache.java
+++ b/opensaml-storage-api/src/main/java/org/opensaml/storage/RevocationCache.java
@@ -73,7 +73,7 @@ public class RevocationCache extends AbstractIdentifiableInitializableComponent
      * @param entryExpiration lifetime of an revocation entry in milliseconds
      */
     public void setEntryExpiration(@Positive final Duration entryExpiration) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         Constraint.isTrue(entryExpiration != null && !entryExpiration.isNegative() && !entryExpiration.isZero(),
                 "Revocation cache default entry expiration must be greater than 0");
@@ -95,7 +95,7 @@ public class RevocationCache extends AbstractIdentifiableInitializableComponent
      * @param storageService backing store to use
      */
     public void setStorage(@Nonnull final StorageService storageService) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         storage = Constraint.isNotNull(storageService, "StorageService cannot be null");
         final StorageCapabilities caps = storage.getCapabilities();
@@ -119,7 +119,7 @@ public class RevocationCache extends AbstractIdentifiableInitializableComponent
      * @param flag true iff we should treat storage failures as a replay
      */
     public void setStrict(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         strict = flag;
     }
diff --git a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/ClientStorageService.java b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/ClientStorageService.java
index a37252ab0..f723ec7f0 100644
--- a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/ClientStorageService.java
+++ b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/ClientStorageService.java
@@ -140,7 +140,7 @@ public class ClientStorageService extends AbstractMapBackedStorageService implem
      * @param map capability map
      */
     public void setCapabilityMap(@Nonnull @NonnullElements final Map<ClientStorageSource,Integer> map) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         Constraint.isNotNull(map, "Capability map cannot be null");
         
         for (final Map.Entry<ClientStorageSource,Integer> entry : map.entrySet()) {
@@ -169,7 +169,7 @@ public class ClientStorageService extends AbstractMapBackedStorageService implem
      * @param request servlet request in which to manage data
      */
     public void setHttpServletRequest(@Nonnull final HttpServletRequest request) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         httpServletRequest = Constraint.isNotNull(request, "HttpServletRequest cannot be null");
     }
@@ -189,7 +189,7 @@ public class ClientStorageService extends AbstractMapBackedStorageService implem
      * @param manager the CookieManager to use.
      */
     public void setCookieManager(@Nonnull final CookieManager manager) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         cookieManager = Constraint.isNotNull(manager, "CookieManager cannot be null");
     }
@@ -209,7 +209,7 @@ public class ClientStorageService extends AbstractMapBackedStorageService implem
      * @param name label to use
      */
     public void setStorageName(@Nonnull @NotEmpty final String name) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         storageName = Constraint.isNotNull(StringSupport.trimOrNull(name), "Storage name cannot be null or empty");
     }
@@ -229,7 +229,7 @@ public class ClientStorageService extends AbstractMapBackedStorageService implem
      * @param sealer {@link DataSealer} to use for data security
      */
     public void setDataSealer(@Nonnull final DataSealer sealer) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         dataSealer = Constraint.isNotNull(sealer, "DataSealer cannot be null");
     }
@@ -240,7 +240,7 @@ public class ClientStorageService extends AbstractMapBackedStorageService implem
      * @param strategy {@link DataSealerKeyStrategy} to use for stale key detection
      */
     public void setKeyStrategy(@Nullable final DataSealerKeyStrategy strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         keyStrategy = strategy;
     }
@@ -251,7 +251,7 @@ public class ClientStorageService extends AbstractMapBackedStorageService implem
      * @param factory factory to use
      */
     public void setClientStorageServiceStoreFactory(@Nonnull final Factory factory) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         storeFactory = Constraint.isNotNull(factory, "Factory cannot be null");
     }
diff --git a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/LoadClientStorageServices.java b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/LoadClientStorageServices.java
index fa9dd1ade..5528b7c55 100644
--- a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/LoadClientStorageServices.java
+++ b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/LoadClientStorageServices.java
@@ -90,7 +90,7 @@ public class LoadClientStorageServices extends AbstractProfileAction {
      * @param flag flag to set
      */
     public void setUseLocalStorage(final boolean flag) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         useLocalStorage = flag;
     }
@@ -101,7 +101,7 @@ public class LoadClientStorageServices extends AbstractProfileAction {
      * @param services instances to check for loading
      */
     public void setStorageServices(@Nonnull @NonnullElements final Collection<ClientStorageService> services) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         Constraint.isNotNull(services, "StorageService collection cannot be null");
         storageServices = new HashMap<>(services.size());
diff --git a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/PopulateClientStorageLoadContext.java b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/PopulateClientStorageLoadContext.java
index 998be0229..4ed2bf230 100644
--- a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/PopulateClientStorageLoadContext.java
+++ b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/PopulateClientStorageLoadContext.java
@@ -67,7 +67,7 @@ public class PopulateClientStorageLoadContext extends AbstractProfileAction {
      * @param services instances to check for loading
      */
     public void setStorageServices(@Nonnull @NonnullElements final Collection<ClientStorageService> services) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         storageServices = List.copyOf(Constraint.isNotNull(services, "StorageService collection cannot be null"));
     }
diff --git a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/PopulateClientStorageSaveContext.java b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/PopulateClientStorageSaveContext.java
index 4cfcba972..925af22ff 100644
--- a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/PopulateClientStorageSaveContext.java
+++ b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/PopulateClientStorageSaveContext.java
@@ -66,7 +66,7 @@ public class PopulateClientStorageSaveContext extends AbstractProfileAction {
      * @param services instances to check for saving
      */
     public void setStorageServices(@Nonnull @NonnullElements final Collection<ClientStorageService> services) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         storageServices = List.copyOf(Constraint.isNotNull(services, "StorageService collection cannot be null"));
     }
diff --git a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/SaveCookieBackedClientStorageServices.java b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/SaveCookieBackedClientStorageServices.java
index 412375c1e..98811dc6d 100644
--- a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/SaveCookieBackedClientStorageServices.java
+++ b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/SaveCookieBackedClientStorageServices.java
@@ -77,7 +77,7 @@ public class SaveCookieBackedClientStorageServices
      * @param services instances to check for loading
      */
     public void setStorageServices(@Nonnull @NonnullElements final Collection<ClientStorageService> services) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         Constraint.isNotNull(services, "StorageService collection cannot be null");
         storageServices = new HashMap<>(services.size());
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/agreement/impl/DigestMethod.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/agreement/impl/DigestMethod.java
index 08b3fa3c4..b4802f0c5 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/agreement/impl/DigestMethod.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/agreement/impl/DigestMethod.java
@@ -63,7 +63,7 @@ public class DigestMethod extends AbstractInitializableComponent
      * @param newAlgorithm the algorithm URI
      */
     public void setAlgorithm(@Nullable final String newAlgorithm) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         algorithm = StringSupport.trimOrNull(newAlgorithm);
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/agreement/impl/KANonce.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/agreement/impl/KANonce.java
index f9bcd0b3a..2159cc92c 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/agreement/impl/KANonce.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/agreement/impl/KANonce.java
@@ -75,7 +75,7 @@ public class KANonce extends AbstractInitializableComponent
      * @param newValue the nonce value
      */
     public void setValue(@Nullable final String newValue) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         value = StringSupport.trimOrNull(newValue);
     }
     
@@ -94,7 +94,7 @@ public class KANonce extends AbstractInitializableComponent
      * @param length the generated length
      */
     public void setGeneratedLength(@Nullable final Integer length) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         generatedLength = length;
     }
     
@@ -121,7 +121,7 @@ public class KANonce extends AbstractInitializableComponent
      * @param sr the secure random generator to set
      */
     public void setRandom(@Nullable final SecureRandom sr) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         secureRandom = sr;
     }
 
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/derivation/impl/ConcatKDF.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/derivation/impl/ConcatKDF.java
index 54d71c167..d892481d4 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/derivation/impl/ConcatKDF.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/derivation/impl/ConcatKDF.java
@@ -131,7 +131,7 @@ public class ConcatKDF extends AbstractInitializableComponent
      * @param newDigestMethod the algorithm URI
      */
     public void setDigestMethod(@Nullable final String newDigestMethod) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         digestMethod = StringSupport.trimOrNull(newDigestMethod);
     }
 
@@ -150,7 +150,7 @@ public class ConcatKDF extends AbstractInitializableComponent
      * @param newAlgorithmID the AlgorithmID
      */
     public void setAlgorithmID(@Nullable final String newAlgorithmID) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         algorithmID = StringSupport.trimOrNull(newAlgorithmID);
     }
 
@@ -169,7 +169,7 @@ public class ConcatKDF extends AbstractInitializableComponent
      * @param newPartyUInfo the PartyUInfo
      */
     public void setPartyUInfo(@Nullable final String newPartyUInfo) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         partyUInfo = StringSupport.trimOrNull(newPartyUInfo);
     }
 
@@ -188,7 +188,7 @@ public class ConcatKDF extends AbstractInitializableComponent
      * @param newPartyVInfo the PartyVInfo
      */
     public void setPartyVInfo(@Nullable final String newPartyVInfo) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         partyVInfo = StringSupport.trimOrNull(newPartyVInfo);
     }
 
@@ -207,7 +207,7 @@ public class ConcatKDF extends AbstractInitializableComponent
      * @param newSuppPubInfo the SuppPubInfo
      */
     public void setSuppPubInfo(@Nullable final String newSuppPubInfo) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         suppPubInfo = StringSupport.trimOrNull(newSuppPubInfo);
     }
 
@@ -226,7 +226,7 @@ public class ConcatKDF extends AbstractInitializableComponent
      * @param newSuppPrivInfo the SuppPrivInfo
      */
     public void setSuppPrivInfo(@Nullable final String newSuppPrivInfo) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         suppPrivInfo = StringSupport.trimOrNull(newSuppPrivInfo);
     }
 
@@ -268,7 +268,7 @@ public class ConcatKDF extends AbstractInitializableComponent
             @Nullable final Integer keyLength) throws KeyDerivationException {
         Constraint.isNotNull(secret, "Secret byte[] was null");
         Constraint.isNotNull(keyAlgorithm, "Key algorithm was null");
-        throwComponentStateExceptions();
+        checkComponentActive();
         
         final String jcaKeyAlgorithm = KeyDerivationSupport.getJCAKeyAlgorithm(keyAlgorithm);
         
@@ -457,7 +457,7 @@ public class ConcatKDF extends AbstractInitializableComponent
     
     /** {@inheritDoc} */
     public XMLObject buildXMLObject() {
-        throwComponentStateExceptions();
+        checkComponentActive();
         
         final KeyDerivationMethod method =
                 (KeyDerivationMethod) XMLObjectSupport.buildXMLObject(KeyDerivationMethod.DEFAULT_ELEMENT_NAME);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/derivation/impl/PBKDF2.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/derivation/impl/PBKDF2.java
index ac5205f08..fe77ec4fd 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/derivation/impl/PBKDF2.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/derivation/impl/PBKDF2.java
@@ -118,7 +118,7 @@ public class PBKDF2 extends AbstractInitializableComponent
      * @param value the salt
      */
     public void setSalt(@Nullable final String value) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         salt = StringSupport.trimOrNull(value);
     }
     
@@ -137,7 +137,7 @@ public class PBKDF2 extends AbstractInitializableComponent
      * @param length the generated salt length
      */
     public void setGeneratedSaltLength(@Nullable final Integer length) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         generatedSaltLength = length;
     }
     
@@ -164,7 +164,7 @@ public class PBKDF2 extends AbstractInitializableComponent
      * @param sr the secure random generator to set
      */
     public void setRandom(@Nullable final SecureRandom sr) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         secureRandom = sr;
     }
@@ -184,7 +184,7 @@ public class PBKDF2 extends AbstractInitializableComponent
      * @param count the iteration count
      */
     public void setIterationCount(@Nullable final Integer count) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         iterationCount = count;
     }
     
@@ -211,7 +211,7 @@ public class PBKDF2 extends AbstractInitializableComponent
      * @param length the key length
      */
     public void setKeyLength(@Nullable final Integer length) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         keyLength = length;
     }
     
@@ -230,7 +230,7 @@ public class PBKDF2 extends AbstractInitializableComponent
      * @param uri the PRF URI
      */
     public void setPRF(@Nullable final String uri) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         prf = StringSupport.trimOrNull(uri);
     }
 
@@ -280,7 +280,7 @@ public class PBKDF2 extends AbstractInitializableComponent
             @Nullable final Integer specifiedKeyLength) throws KeyDerivationException {
         Constraint.isNotNull(secret, "Secret byte[] was null");
         Constraint.isNotNull(keyAlgorithm, "Key algorithm was null");
-        throwComponentStateExceptions();
+        checkComponentActive();
         
         final String jcaKeyAlgorithm = KeyDerivationSupport.getJCAKeyAlgorithm(keyAlgorithm);
         
@@ -373,7 +373,7 @@ public class PBKDF2 extends AbstractInitializableComponent
 
     /** {@inheritDoc} */
     public XMLObject buildXMLObject() {
-        throwComponentStateExceptions();
+        checkComponentActive();
         
         // If initialized, iterationCount and PRF are guaranteed to be non-null.
         // These 2 would happen if initialized but derive(...) hasn't been called.
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/messaging/impl/PopulateSignatureValidationParametersHandler.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/messaging/impl/PopulateSignatureValidationParametersHandler.java
index 708fef2f4..be25f1ab2 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/messaging/impl/PopulateSignatureValidationParametersHandler.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/messaging/impl/PopulateSignatureValidationParametersHandler.java
@@ -77,7 +77,7 @@ public class PopulateSignatureValidationParametersHandler extends AbstractMessag
      */
     public void setSecurityParametersContextLookupStrategy(
             @Nonnull final Function<MessageContext,SecurityParametersContext> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
 
         securityParametersContextLookupStrategy = Constraint.isNotNull(strategy,
                 "SecurityParametersContext lookup strategy cannot be null");
@@ -90,7 +90,7 @@ public class PopulateSignatureValidationParametersHandler extends AbstractMessag
      */
     public void setConfigurationLookupStrategy(
             @Nonnull final Function<MessageContext,List<SignatureValidationConfiguration>> strategy) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         configurationLookupStrategy = Constraint.isNotNull(strategy,
                 "SignatureValidationConfiguration lookup strategy cannot be null");
@@ -103,7 +103,7 @@ public class PopulateSignatureValidationParametersHandler extends AbstractMessag
      */
     public void setSignatureValidationParametersResolver(
             @Nonnull final SignatureValidationParametersResolver newResolver) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         
         resolver = Constraint.isNotNull(newResolver, "SignatureValidationParametersResolver cannot be null");
     }

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


More information about the commits mailing list