[java-opensaml] 08/14: JSPT-98 Integrate lifecycle checking methods in base classes

[Rod Widdowson]

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

rdw pushed a commit to branch dev/JSPT-98
in repository java-opensaml.

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

commit c09daaf0a3855cc33b4abf40de6bfd605ea2e489
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Jun 13 20:08:03 2022 +0100

    JSPT-98 Integrate lifecycle checking methods in base classes
    
    https://shibboleth.atlassian.net/browse/JSPT-98
    
    Stop using ComponentSupport and use the appropriate methods instead: security-impl
---
 .../messaging/impl/BaseClientCertAuthSecurityHandler.java     |  3 +--
 .../impl/PopulateHttpClientSecurityParametersHandler.java     | 11 +++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

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 716175f6e..9d6ca0fff 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
@@ -48,7 +48,6 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElemen
 import net.shibboleth.utilities.java.support.codec.Base64Support;
 import net.shibboleth.utilities.java.support.codec.EncodingException;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 
@@ -116,7 +115,7 @@ public abstract class BaseClientCertAuthSecurityHandler extends BaseTrustEngineS
      * @param request The to set.
      */
     public void setHttpServletRequest(@Nonnull final HttpServletRequest request) {
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+        throwSetterPreconditionExceptions();
         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 32a7db2fb..8a2b711da 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
@@ -41,7 +41,6 @@ import org.slf4j.LoggerFactory;
 
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
@@ -86,7 +85,7 @@ public class PopulateHttpClientSecurityParametersHandler extends AbstractMessage
      * @param predicate clientTLS predicate
      */
     public void setClientTLSPredicate(@Nullable final Predicate<MessageContext> predicate) {
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+        throwSetterPreconditionExceptions();
         
         clientTLSPredicate = predicate;
     }
@@ -98,7 +97,7 @@ public class PopulateHttpClientSecurityParametersHandler extends AbstractMessage
      */
     public void setSecurityParametersContextLookupStrategy(
             @Nonnull final Function<MessageContext,HttpClientSecurityContext> strategy) {
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+        throwSetterPreconditionExceptions();
 
         securityParametersContextLookupStrategy = Constraint.isNotNull(strategy,
                 "HttpClientSecurityContext lookup strategy cannot be null");
@@ -112,7 +111,7 @@ public class PopulateHttpClientSecurityParametersHandler extends AbstractMessage
      */
     public void setExistingParametersContextLookupStrategy(
             @Nullable final Function<MessageContext,HttpClientSecurityContext> strategy) {
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+        throwSetterPreconditionExceptions();
 
         existingParametersContextLookupStrategy = strategy;
     }
@@ -124,7 +123,7 @@ public class PopulateHttpClientSecurityParametersHandler extends AbstractMessage
      */
     public void setConfigurationLookupStrategy(
             @Nonnull final Function<MessageContext,List<HttpClientSecurityConfiguration>> strategy) {
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+        throwSetterPreconditionExceptions();
         
         configurationLookupStrategy = Constraint.isNotNull(strategy,
                 "HttpClientSecurityConfiguration lookup strategy cannot be null");
@@ -137,7 +136,7 @@ public class PopulateHttpClientSecurityParametersHandler extends AbstractMessage
      */
     public void setHttpClientSecurityParametersResolver(
             @Nonnull final HttpClientSecurityParametersResolver newResolver) {
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+        throwSetterPreconditionExceptions();
         
         resolver = Constraint.isNotNull(newResolver, "HttpClientSecurityParametersResolver cannot be null");
     }

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