[java-identity-provider] 06/06: 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 main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=97a47847fe64302ddb426bb20de9abbd722f22e5

commit 97a47847fe64302ddb426bb20de9abbd722f22e5
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Jul 14 16:49: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:
    
        idp-ui
---
 .../ui/csrf/impl/CSRFTokenFlowExecutionListener.java   | 18 +++++-------------
 .../net/shibboleth/idp/ui/impl/SetRPUIInformation.java | 12 ++++--------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/idp-ui/src/main/java/net/shibboleth/idp/ui/csrf/impl/CSRFTokenFlowExecutionListener.java b/idp-ui/src/main/java/net/shibboleth/idp/ui/csrf/impl/CSRFTokenFlowExecutionListener.java
index 653748ecc..b9b504075 100644
--- a/idp-ui/src/main/java/net/shibboleth/idp/ui/csrf/impl/CSRFTokenFlowExecutionListener.java
+++ b/idp-ui/src/main/java/net/shibboleth/idp/ui/csrf/impl/CSRFTokenFlowExecutionListener.java
@@ -36,7 +36,6 @@ import net.shibboleth.idp.ui.csrf.InvalidCSRFTokenException;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 
@@ -79,9 +78,8 @@ public class CSRFTokenFlowExecutionListener extends AbstractInitializableCompone
      * 
      * @param enable enabled/disable CSRF protection (default is {@literal false}).
      */
-    public void setEnabled(@Nonnull final boolean enable) { 
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
-        ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
+    public void setEnabled(@Nonnull final boolean enable) {
+        throwSetterPreconditionExceptions();
         enabled = enable;
     }
     
@@ -91,9 +89,7 @@ public class CSRFTokenFlowExecutionListener extends AbstractInitializableCompone
      * @param condition the condition to apply.
      */
     public void setViewRequiresCSRFTokenPredicate(@Nonnull final Predicate<RequestContext> condition) {
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
-        ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
-        
+        throwSetterPreconditionExceptions();
         viewRequiresCSRFTokenPredicate = Constraint.isNotNull(condition, 
                         "Does view require CSRF token predicate can not be null");
     }
@@ -105,9 +101,7 @@ public class CSRFTokenFlowExecutionListener extends AbstractInitializableCompone
      */
     public void setEventRequiresCSRFTokenValidationPredicate(
             @Nonnull final BiPredicate<RequestContext,Event> condition) {
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
-        ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
-        
+        throwSetterPreconditionExceptions();
         eventRequiresCSRFTokenValidationPredicate = Constraint.isNotNull(condition, 
                 "Validate CSRF token condition cannot be null");
     }
@@ -119,9 +113,7 @@ public class CSRFTokenFlowExecutionListener extends AbstractInitializableCompone
      * @param tokenManager the CSRF token manager.
      */
     public void setCsrfTokenManager(@Nonnull final CSRFTokenManager tokenManager) {    
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
-        ComponentSupport.ifDestroyedThrowDestroyedComponentException(this);
-        
+        throwSetterPreconditionExceptions();
         csrfTokenManager = Constraint.isNotNull(tokenManager, "CSRF Token manager can not be null");
     }
 
diff --git a/idp-ui/src/main/java/net/shibboleth/idp/ui/impl/SetRPUIInformation.java b/idp-ui/src/main/java/net/shibboleth/idp/ui/impl/SetRPUIInformation.java
index e67dcea18..37a65b46b 100644
--- a/idp-ui/src/main/java/net/shibboleth/idp/ui/impl/SetRPUIInformation.java
+++ b/idp-ui/src/main/java/net/shibboleth/idp/ui/impl/SetRPUIInformation.java
@@ -23,7 +23,6 @@ import java.util.function.Supplier;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import jakarta.servlet.http.HttpServletRequest;
 
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.messaging.context.navigate.ChildContextLookup;
@@ -41,13 +40,13 @@ import org.opensaml.saml.saml2.metadata.SPSSODescriptor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.servlet.http.HttpServletRequest;
 import net.shibboleth.ext.spring.util.SpringSupport;
 import net.shibboleth.idp.authn.context.AuthenticationContext;
 import net.shibboleth.idp.profile.AbstractProfileAction;
 import net.shibboleth.idp.saml.profile.context.navigate.SAMLMetadataContextLookupFunction;
 import net.shibboleth.idp.ui.context.RelyingPartyUIContext;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletRequestProxy;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -115,8 +114,7 @@ public class SetRPUIInformation extends AbstractProfileAction {
      */
     public void setMetadataContextLookupStrategy(
             @Nonnull final Function<ProfileRequestContext, SAMLMetadataContext> strgy) {
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
-        
+        throwSetterPreconditionExceptions();
         metadataContextLookupStrategy = Constraint.isNotNull(strgy, "Injected Metadata Strategy cannot be null");
     }
 
@@ -136,8 +134,7 @@ public class SetRPUIInformation extends AbstractProfileAction {
      */
     public void setRPUIContextCreateStrategy(
             @Nonnull final Function<ProfileRequestContext, RelyingPartyUIContext> strategy) {
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
-        
+        throwSetterPreconditionExceptions();
         rpUIContextCreateStrategy = Constraint.isNotNull(strategy, "Injected RPUI Strategy cannot be null");
     }
 
@@ -147,8 +144,7 @@ public class SetRPUIInformation extends AbstractProfileAction {
      * @param langs a semi-colon separated string.
      */
     public void setFallbackLanguages(@Nonnull @NonnullElements final List<String> langs) {
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
-        
+        throwSetterPreconditionExceptions();
         fallbackLanguages = List.copyOf(StringSupport.normalizeStringCollection(langs));
     }
 

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