[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/re...

[noreply at shibboleth.net]

Author: rdw
Date: Sat May  4 09:54:11 2013
New Revision: 4464

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4464&view=rev
Log:
IDP-273  Remove Optional from the Attribute resolver APIs.  Two missed instances

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsDataConnectorParser.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParser.java?rev=4464&r1=4463&r2=4464&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParser.java Sat May  4 09:54:11 2013
@@ -46,8 +46,8 @@
 import org.ldaptive.SearchFilter;
 import org.ldaptive.SearchScope;
 import org.ldaptive.handler.CaseChangeEntryHandler;
+import org.ldaptive.handler.CaseChangeEntryHandler.CaseChange;
 import org.ldaptive.handler.MergeAttributeEntryHandler;
-import org.ldaptive.handler.CaseChangeEntryHandler.CaseChange;
 import org.ldaptive.pool.BlockingConnectionPool;
 import org.ldaptive.pool.IdlePruneStrategy;
 import org.ldaptive.pool.PoolConfig;
@@ -64,7 +64,6 @@
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
-import com.google.common.base.Optional;
 import com.google.common.cache.Cache;
 
 /** Bean definition Parser for a {@link LdapDataConnector}. */
@@ -125,7 +124,7 @@
 
         final Validator validator = getBean(beanFactory, Validator.class);
         final MappingStrategy strategy = getBean(beanFactory, MappingStrategy.class);
-        final Cache<String, Optional<Map<String, Attribute>>> cache = getBean(beanFactory, Cache.class);
+        final Cache<String, Map<String, Attribute>> cache = getBean(beanFactory, Cache.class);
         final Boolean noResultAnError =
                 AttributeSupport.getAttributeValueAsBoolean(AttributeSupport.getAttribute(config, new QName(
                         "noResultIsError")));

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsDataConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsDataConnectorParser.java?rev=4464&r1=4463&r2=4464&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsDataConnectorParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsDataConnectorParser.java Sat May  4 09:54:11 2013
@@ -44,7 +44,6 @@
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
-import com.google.common.base.Optional;
 import com.google.common.cache.Cache;
 
 /** Bean definition Parser for a {@link RdbmsDataConnector}. */
@@ -98,7 +97,7 @@
 
         final Validator validator = getBean(beanFactory, Validator.class);
         final MappingStrategy strategy = getBean(beanFactory, MappingStrategy.class);
-        final Cache<String, Optional<Map<String, Attribute>>> cache = getBean(beanFactory, Cache.class);
+        final Cache<String, Map<String, Attribute>> cache = getBean(beanFactory, Cache.class);
         final Boolean noResultAnError =
                 AttributeSupport.getAttributeValueAsBoolean(AttributeSupport.getAttribute(config, new QName(
                         "noResultIsError")));