[java-shib-metadata] branch main updated: 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-shib-metadata.

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

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

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

    JSPT-98 Integrate lifecycle checking methods in base classes
    
    https://shibboleth.atlassian.net/browse/JSPT-98
    
    rename methods
            throwSetterPreconditionExceptions -> checkSetterPreconditions
            throwComponentStateExceptions -> checkComponentActive
---
 .../idp/saml/metadata/impl/MetadataProviderContainer.java         | 6 +++---
 .../idp/saml/metadata/impl/ReloadableMetadataResolver.java        | 8 ++++----
 .../security/impl/MetadataPKIXValidationInformationResolver.java  | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataProviderContainer.java b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataProviderContainer.java
index c9ef3c61f..d26431887 100644
--- a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataProviderContainer.java
+++ b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataProviderContainer.java
@@ -56,7 +56,7 @@ public class MetadataProviderContainer extends AbstractServiceableComponent<Meta
      * @param key what to set
      */
     public void setSortKey(final int key) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         sortKey = key;
     }
     
@@ -66,7 +66,7 @@ public class MetadataProviderContainer extends AbstractServiceableComponent<Meta
      * @param theResolver The {@link MetadataResolver} to embed.
      */
     @Nonnull public void setEmbeddedResolver(@Nonnull final MetadataResolver theResolver) {
-        throwSetterPreconditionExceptions();
+        checkSetterPreconditions();
         resolver = Constraint.isNotNull(theResolver, "MetadataResolver cannot be null");
     }
 
@@ -99,7 +99,7 @@ public class MetadataProviderContainer extends AbstractServiceableComponent<Meta
     
     /** {@inheritDoc} */
     @Override public int compareTo(final MetadataProviderContainer other) {
-        throwComponentStateExceptions();
+        checkComponentActive();
         final int result = sortKey.compareTo(other.sortKey);
         if (result != 0) {
             return result;
diff --git a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadableMetadataResolver.java b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadableMetadataResolver.java
index 19025e8b5..979d94f8b 100644
--- a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadableMetadataResolver.java
+++ b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadableMetadataResolver.java
@@ -61,7 +61,7 @@ public class ReloadableMetadataResolver extends AbstractIdentifiableInitializabl
 
     /** {@inheritDoc} */
     @Override @Nonnull public Iterable<EntityDescriptor> resolve(final CriteriaSet criteria) throws ResolverException {
-        throwComponentStateExceptions();
+        checkComponentActive();
         ServiceableComponent<MetadataResolver> component = null;
         try {
             component = service.getServiceableComponent();
@@ -84,7 +84,7 @@ public class ReloadableMetadataResolver extends AbstractIdentifiableInitializabl
 
     /** {@inheritDoc} */
     @Override @Nullable public EntityDescriptor resolveSingle(final CriteriaSet criteria) throws ResolverException {
-        throwComponentStateExceptions();        ServiceableComponent<MetadataResolver> component = null;
+        checkComponentActive();        ServiceableComponent<MetadataResolver> component = null;
         try {
             component = service.getServiceableComponent();
             if (null == component) {
@@ -106,7 +106,7 @@ public class ReloadableMetadataResolver extends AbstractIdentifiableInitializabl
 
     /** {@inheritDoc} */
     @Override public boolean isRequireValidMetadata() {
-        throwComponentStateExceptions();
+        checkComponentActive();
         ServiceableComponent<MetadataResolver> component = null;
         try {
             component = service.getServiceableComponent();
@@ -132,7 +132,7 @@ public class ReloadableMetadataResolver extends AbstractIdentifiableInitializabl
 
     /** {@inheritDoc} */
     @Override public MetadataFilter getMetadataFilter() {
-        throwComponentStateExceptions();
+        checkComponentActive();
         ServiceableComponent<MetadataResolver> component = null;
         try {
             component = service.getServiceableComponent();
diff --git a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolver.java b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolver.java
index 6f5b614f8..ba3955cf0 100644
--- a/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolver.java
+++ b/shib-metadata-impl/src/main/java/net/shibboleth/idp/saml/security/impl/MetadataPKIXValidationInformationResolver.java
@@ -110,7 +110,7 @@ public class MetadataPKIXValidationInformationResolver extends AbstractInitializ
     /** {@inheritDoc} */
     @Override public Iterable<PKIXValidationInformation> resolve(final CriteriaSet criteriaSet)
                             throws ResolverException {
-        throwComponentStateExceptions();
+        checkComponentActive();
         checkCriteriaRequirements(criteriaSet);
 
         final String entityID = criteriaSet.get(EntityIdCriterion.class).getEntityId();
@@ -129,7 +129,7 @@ public class MetadataPKIXValidationInformationResolver extends AbstractInitializ
 
     /** {@inheritDoc} */
     @Override @Nonnull public Set<String> resolveTrustedNames(final CriteriaSet criteriaSet) throws ResolverException {
-        throwComponentStateExceptions();
+        checkComponentActive();
         checkCriteriaRequirements(criteriaSet);
 
         final String entityID = criteriaSet.get(EntityIdCriterion.class).getEntityId();

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