[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-impl/src: main/java/net/shibboleth/idp/attribute/res...

[noreply at shibboleth.net]

Author: dfisher
Date: Mon Oct 31 00:55:23 2016
New Revision: 8553

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8553&view=rev
Log:
IDP-1077

Use filter string for cache key.

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/AbstractExecutableSearchFilterBuilder.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
    trunk/idp-attribute-resolver-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/ldapDataConnectorTest.ldif

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/AbstractExecutableSearchFilterBuilder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/AbstractExecutableSearchFilterBuilder.java?rev=8553&r1=8552&r2=8553&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/AbstractExecutableSearchFilterBuilder.java	(original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/AbstractExecutableSearchFilterBuilder.java	Mon Oct 31 00:55:23 2016
@@ -52,7 +52,7 @@
 
             /** {@inheritDoc} */
             @Nonnull public String getResultCacheKey() {
-                return String.valueOf(searchFilter.hashCode());
+                return searchFilter.format();
             }
 
             /** {@inheritDoc} */

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java?rev=8553&r1=8552&r2=8553&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java	(original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java	Mon Oct 31 00:55:23 2016
@@ -216,7 +216,7 @@
 
     @Test public void resolveMulti() throws ComponentInitializationException, ResolutionException {
         final ParameterizedExecutableSearchFilterBuilder builder =
-                newParameterizedExecutableSearchFilterBuilder("(objectclass=inetOrgPerson)");
+                newParameterizedExecutableSearchFilterBuilder("(uid=P*)");
         resolveMulti(builder);
     }
 
@@ -341,21 +341,21 @@
         final Map<String, IdPAttribute> attrs = connector.resolve(context);
         Assert.assertNotNull(attrs);
         // check total attributes: uid, cn, sn, mail
-        Assert.assertTrue(attrs.size() == 4);
+        Assert.assertEquals(attrs.size(), 4);
         // check uid
-        Assert.assertTrue(attrs.get("uid").getValues().size() == 1);
+        Assert.assertEquals(attrs.get("uid").getValues().size(), 1);
         Assert.assertEquals(new StringAttributeValue(TestSources.PRINCIPAL_ID), attrs.get("uid").getValues().iterator()
                 .next());
         // check cn
-        Assert.assertTrue(attrs.get("cn").getValues().size() == 3);
+        Assert.assertEquals(attrs.get("cn").getValues().size(), 3);
         Assert.assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("Peter Principal")));
         Assert.assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("Peter J Principal")));
         Assert.assertTrue(attrs.get("cn").getValues().contains(new StringAttributeValue("pete principal")));
         // check sn
-        Assert.assertTrue(attrs.get("sn").getValues().size() == 1);
+        Assert.assertEquals(attrs.get("sn").getValues().size(), 1);
         Assert.assertEquals(new StringAttributeValue("Principal"), attrs.get("sn").getValues().iterator().next());
         // check mail
-        Assert.assertTrue(attrs.get("mail").getValues().size() == 2);
+        Assert.assertEquals(attrs.get("mail").getValues().size(), 2);
         Assert.assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue("peter.principal at shibboleth.net")));
         Assert.assertTrue(attrs.get("mail").getValues().contains(new StringAttributeValue("peterprincipal at shibboleth.net")));
     }
@@ -371,24 +371,24 @@
         final Map<String, IdPAttribute> attrs = connector.resolve(context);
         Assert.assertNotNull(attrs);
         // check total attributes: uid, cn, sn, mail
-        Assert.assertTrue(attrs.size() == 4);
+        Assert.assertEquals(attrs.size(), 4);
         // check uid
-        Assert.assertTrue(attrs.get("uid").getValues().size() == 3);
+        Assert.assertEquals(attrs.get("uid").getValues().size(), 3);

[... 130 lines stripped ...]