[java-opensaml] 02/09: 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=fc8d7a30dd032fd48d6835b56c4af0a75e85aba4

commit fc8d7a30dd032fd48d6835b56c4af0a75e85aba4
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Jun 13 19:54:26 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-api
---
 .../org/opensaml/security/crypto/ec/curves/AbstractNamedCurve.java | 3 +--
 .../security/httpclient/HttpClientSecurityContextHandler.java      | 7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

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 e36aa5105..45feea92f 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
@@ -36,7 +36,6 @@ import com.google.common.base.MoreObjects;
 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;
 
 /**
  * Abstract base class for implementations of {@link NamedCurve}.
@@ -51,7 +50,7 @@ public abstract class AbstractNamedCurve extends AbstractInitializableComponent
     
     /** {@inheritDoc} */
     @NonnullAfterInit public ECParameterSpec getParameterSpec() {
-        ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
+        throwComponentStateExceptions();
         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 6571b2572..4e35605cc 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
@@ -25,7 +25,6 @@ import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.client.protocol.HttpClientContext;
 
 import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.httpclient.HttpClientContextHandler;
 
 /**
@@ -54,14 +53,14 @@ public class HttpClientSecurityContextHandler extends AbstractInitializableCompo
      * @param params the new client security parameters
      */
     public void setHttpClientSecurityParameters(@Nullable final HttpClientSecurityParameters params) {
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+        throwSetterPreconditionExceptions();
 
         httpClientSecurityParameters = params;
     }
     
     /** {@inheritDoc} */
     public void invokeBefore(final HttpClientContext context, final HttpUriRequest request) throws IOException {
-        ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
+        throwComponentStateExceptions();
         
         HttpClientSecuritySupport.marshalSecurityParameters(context, httpClientSecurityParameters, false);
         HttpClientSecuritySupport.addDefaultTLSTrustEngineCriteria(context, request);
@@ -69,7 +68,7 @@ public class HttpClientSecurityContextHandler extends AbstractInitializableCompo
 
     /** {@inheritDoc} */
     public void invokeAfter(final HttpClientContext context, final HttpUriRequest request) throws IOException {
-        ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
+        throwComponentStateExceptions();
         
         HttpClientSecuritySupport.checkTLSCredentialEvaluated(context, request.getURI().getScheme());
     }

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