[java-shib-profile] branch main updated: Implement access to internals via getters for subclass flexibility.

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-shib-profile.

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

The following commit(s) were added to refs/heads/main by this push:
     new 64d246f  Implement access to internals via getters for subclass flexibility.
64d246f is described below

commit 64d246fbcb247003908ee4e6d1fb0a7b81b0f8bb
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Aug 15 13:29:05 2025 -0400

    Implement access to internals via getters for subclass flexibility.
---
 .../DefaultRelyingPartyConfigurationResolver.java    | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java b/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
index 0d3399d..f11b17c 100644
--- a/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
+++ b/shib-profile-impl/src/main/java/net/shibboleth/profile/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
@@ -284,7 +284,7 @@ public class DefaultRelyingPartyConfigurationResolver extends AbstractIdentifiab
 
         final ProfileRequestContext context = getProfileRequestContext(criteria);
 
-        for (final RelyingPartyConfiguration configuration : rpConfigurations) {
+        for (final RelyingPartyConfiguration configuration : getRelyingPartyConfigurations()) {
             log.debug("Checking if relying party configuration {} is applicable", configuration.getId());
             if (configuration.test(context)) {
                 log.debug("Relying party configuration {} is applicable", configuration.getId());
@@ -296,12 +296,12 @@ public class DefaultRelyingPartyConfigurationResolver extends AbstractIdentifiab
         }
 
         if (matches.isEmpty()) {
-            if (defaultRelyingPartyConfiguration != null) {
+            final RelyingPartyConfiguration defaultConfig = getDefaultConfiguration();
+            if (defaultConfig != null) {
                 log.debug("No matching relying party configuration applicable, returning default: {}",
-                        defaultRelyingPartyConfiguration.getId());
+                        defaultConfig.getId());
                 increment(DEFAULT_RELYING_PARTY_COUNTER);
-                assert defaultRelyingPartyConfiguration != null;
-                return CollectionSupport.singleton(defaultRelyingPartyConfiguration);
+                return CollectionSupport.singleton(defaultConfig);
             } else {
                 log.warn("No matching relying party configuration applicable, returning nothing");
                 return CollectionSupport.emptyList();
@@ -335,7 +335,7 @@ public class DefaultRelyingPartyConfigurationResolver extends AbstractIdentifiab
 
         final ProfileRequestContext context = getProfileRequestContext(criteria);
 
-        for (final RelyingPartyConfiguration configuration : rpConfigurations) {
+        for (final RelyingPartyConfiguration configuration : getRelyingPartyConfigurations()) {
             log.debug("Checking if relying party configuration {} is applicable", configuration.getId());
             if (configuration.test(context)) {
                 log.debug("Relying party configuration {} is applicable", configuration.getId());
@@ -345,12 +345,12 @@ public class DefaultRelyingPartyConfigurationResolver extends AbstractIdentifiab
             log.debug("Relying party configuration {} is not applicable", configuration.getId());
         }
 
-        if (defaultRelyingPartyConfiguration != null) {
+        final RelyingPartyConfiguration defaultConfig = getDefaultConfiguration();
+        if (defaultConfig != null) {
             log.debug("No matching relying party configuration applicable, returning default: {}",
-                    defaultRelyingPartyConfiguration.getId());
+                    defaultConfig.getId());
             increment(DEFAULT_RELYING_PARTY_COUNTER);
-            assert defaultRelyingPartyConfiguration != null;
-            return defaultRelyingPartyConfiguration;
+            return defaultConfig;
         }
 
         log.warn("No matching relying party configuration applicable, returning nothing");

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