[java-opensaml] 04/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=f6d86d48f6cd3e2ef4f1b776fc332c55ea609fd7

commit f6d86d48f6cd3e2ef4f1b776fc332c55ea609fd7
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Jun 12 15:26:28 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: profile-api
---
 .../opensaml/profile/action/AbstractConditionalProfileAction.java  | 7 +++----
 .../java/org/opensaml/profile/action/AbstractProfileAction.java    | 5 ++---
 2 files changed, 5 insertions(+), 7 deletions(-)

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 79e85af6b..f4d205926 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
@@ -21,14 +21,13 @@ import java.util.function.Predicate;
 
 import javax.annotation.Nonnull;
 
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Predicates;
 
+import net.shibboleth.utilities.java.support.logic.Constraint;
+
 /**
  * Base class for conditional profile actions.
  * 
@@ -61,7 +60,7 @@ public abstract class AbstractConditionalProfileAction extends AbstractProfileAc
      * @param condition predicate to apply
      */
     public void setActivationCondition(@Nonnull final Predicate<ProfileRequestContext> condition) {
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+        throwSetterPreconditionExceptions();
         
         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 18712deac..7b0807be3 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
@@ -31,7 +31,6 @@ import jakarta.servlet.http.HttpServletResponse;
 import net.shibboleth.utilities.java.support.annotation.Prototype;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
 
 /**
  * Base class for profile actions.
@@ -65,7 +64,7 @@ public abstract class AbstractProfileAction extends AbstractInitializableCompone
      * @param request current HTTP request
      */
     public void setHttpServletRequest(@Nullable final HttpServletRequest request) {
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+        throwSetterPreconditionExceptions();
 
         httpServletRequest = request;
     }
@@ -85,7 +84,7 @@ public abstract class AbstractProfileAction extends AbstractInitializableCompone
      * @param response current HTTP response
      */
     public void setHttpServletResponse(@Nullable final HttpServletResponse response) {
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+        throwSetterPreconditionExceptions();
 
         httpServletResponse = response;
     }

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