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

[noreply at shibboleth.net]

Author: rdw
Date: Thu Sep  1 12:16:26 2016
New Revision: 8363

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8363&view=rev
Log:
IDP-1029 Don't try to call a setter if there isn't one.

https://issues.shibboleth.net/jira/browse/IDP-1029

Added:
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/staticAttributesHybrid.xml   (with props)
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/resolver/staticAttributesHybridSpring.xml   (with props)
Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/DataConnectorFactoryBean.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorParserTest.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/service.xml

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/DataConnectorFactoryBean.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/impl/DataConnectorFactoryBean.java?rev=8363&r1=8362&r2=8363&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/DataConnectorFactoryBean.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/DataConnectorFactoryBean.java	Thu Sep  1 12:16:26 2016
@@ -247,7 +247,7 @@
         setValues(result);
 
         appContext =
-                SpringSupport.newContext("LDAPContext", getResources(), getBeanFactoryPostProcessors(),
+                SpringSupport.newContext("HybridSpringDataConnector", getResources(), getBeanFactoryPostProcessors(),
                         getBeanPostProcessors(), Collections.EMPTY_LIST, parentContext);
 
         final PropertyDescriptor[] descriptors =
@@ -257,7 +257,7 @@
             log.debug("Parsing property descriptor: {}", descriptor);
             final Map<String, ?> beans = appContext.getBeansOfType(descriptor.getPropertyType());
 
-            if (null == beans || beans.isEmpty()) {
+            if (null == beans || beans.isEmpty() || null == descriptor.getWriteMethod() ) {
                 continue;
             }
             if (beans.size() > 1) {

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorParserTest.java?rev=8363&r1=8362&r2=8363&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorParserTest.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/StaticDataConnectorParserTest.java	Thu Sep  1 12:16:26 2016
@@ -36,7 +36,6 @@
     
     @Test public void simple() {
         final StaticDataConnector connector = getDataConnector("staticAttributes.xml", StaticDataConnector.class);
-        
         Assert.assertEquals(connector.getAttributes().keySet().size(), 2);
         final IdPAttribute epe = connector.getAttributes().get("eduPersonEntitlement");
         List<IdPAttributeValue<?>> values = epe.getValues();
@@ -63,6 +62,22 @@
         Assert.assertEquals(values.size(), 1);
         Assert.assertTrue(values.contains(new StringAttributeValue("member")));
     }
+    
+    @Test public void hybrid() {
+        final StaticDataConnector connector = getDataConnector("resolver/staticAttributesHybrid.xml", StaticDataConnector.class);
+        
+        Assert.assertEquals(connector.getAttributes().keySet().size(), 2);
+        final IdPAttribute epe = connector.getAttributes().get("eduPersonEntitlement");
+        List<IdPAttributeValue<?>> values = epe.getValues();
+        Assert.assertEquals(values.size(), 2);
+        Assert.assertTrue(values.contains(new StringAttributeValue("urn:example.org:entitlement:entitlement1")));
+        Assert.assertTrue(values.contains(new StringAttributeValue("urn:mace:dir:entitlement:common-lib-terms")));
+        
+        values = connector.getAttributes().get("staticEpA").getValues();
+        Assert.assertEquals(values.size(), 1);
+        Assert.assertTrue(values.contains(new StringAttributeValue("member")));
+    }
+
 
     @Test public void nativesimple() {
         final StaticDataConnector connector = getDataConnector("staticAttributesNative.xml", StaticDataConnector.class);


[... 35 lines stripped ...]