[java-identity-provider] branch master updated: Fix some bugs in RelyingPartyConfiguration.

[Scott Cantor]

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

scantor pushed a commit to branch master
in repository java-identity-provider.

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

The following commit(s) were added to refs/heads/master by this push:
       new  3fac714   Fix some bugs in RelyingPartyConfiguration.
3fac714 is described below

commit 3fac714d583c6f44e8f98c8481fc1c41135c873f
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Mar 27 11:22:30 2019 -0400

    Fix some bugs in RelyingPartyConfiguration.
---
 .../idp/relyingparty/RelyingPartyConfiguration.java          |  9 ++++-----
 .../idp/relyingparty/RelyingPartyConfigurationTest.java      | 12 +++++++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java b/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java
index 4cee8d4..59a5fc6 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java
@@ -18,7 +18,6 @@
 package net.shibboleth.idp.relyingparty;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Function;
@@ -32,6 +31,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElemen
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
 import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
+import net.shibboleth.utilities.java.support.collection.CollectionSupport;
 import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
@@ -46,7 +46,6 @@ import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Predicates;
 import com.google.common.collect.Collections2;
-import com.google.common.collect.ImmutableMap;
 
 /** The configuration that applies to a given relying party. */
 public class RelyingPartyConfiguration extends AbstractIdentifiableInitializableComponent implements
@@ -72,7 +71,7 @@ public class RelyingPartyConfiguration extends AbstractIdentifiableInitializable
     public RelyingPartyConfiguration() {
         activationCondition = Predicates.alwaysTrue();
         detailedErrorsPredicate = Predicates.alwaysFalse();
-        profileConfigurationsLookupStrategy = FunctionSupport.constant(Collections.emptyMap());
+        profileConfigurationsLookupStrategy = FunctionSupport.constant(null);
     }
 
     /**
@@ -153,7 +152,7 @@ public class RelyingPartyConfiguration extends AbstractIdentifiableInitializable
      */
     @Nonnull @NonnullElements @Unmodifiable @NotLive public Map<String,ProfileConfiguration> getProfileConfigurations(
             @Nullable final ProfileRequestContext profileRequestContext) {
-        return ImmutableMap.copyOf(profileConfigurationsLookupStrategy.apply(profileRequestContext));
+        return CollectionSupport.buildImmutableMap(profileConfigurationsLookupStrategy.apply(profileRequestContext));
     }
 
     /**
@@ -186,7 +185,7 @@ public class RelyingPartyConfiguration extends AbstractIdentifiableInitializable
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         
         if (configs == null) {
-            profileConfigurationsLookupStrategy = FunctionSupport.constant(Collections.emptyMap());
+            profileConfigurationsLookupStrategy = FunctionSupport.constant(null);
         } else {
             final HashMap<String,ProfileConfiguration> map = new HashMap<>();
             for (final ProfileConfiguration config : Collections2.filter(configs, Predicates.notNull())) {
diff --git a/idp-profile-api/src/test/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationTest.java b/idp-profile-api/src/test/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationTest.java
index e2c2d78..fc704e1 100644
--- a/idp-profile-api/src/test/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationTest.java
+++ b/idp-profile-api/src/test/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationTest.java
@@ -125,8 +125,8 @@ public class RelyingPartyConfigurationTest {
         config.setProfileConfigurationsLookupStrategy(FunctionSupport.constant(null));
         config.initialize();
         
-        Assert.assertNotNull(config.getProfileConfiguration(null, "foo"));
-        Assert.assertNotNull(config.getProfileConfiguration(null, "bar"));
+        Assert.assertNull(config.getProfileConfiguration(null, "foo"));
+        Assert.assertNull(config.getProfileConfiguration(null, "bar"));
         Assert.assertNull(config.getProfileConfiguration(null, "baz"));
     }
 
@@ -142,7 +142,13 @@ public class RelyingPartyConfigurationTest {
         config.setResponderId("http://idp.example.org");
         config.setResponderIdLookupStrategy(FunctionSupport.constant(null));
         config.initialize();
-        Assert.assertEquals(config.getResponderId(null), "http://idp.example.org");
+        
+        try {
+            config.getResponderId(null);
+            Assert.fail("Expected a constraint violation");
+        } catch (final ConstraintViolationException e) {
+            
+        }
     }
 
 }
\ No newline at end of file

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