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

[noreply at shibboleth.net]

Author: dfisher
Date: Fri Jul 11 00:46:43 2014
New Revision: 6273

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6273&view=rev
Log:
Update ldaptive to 1.0.4
API changed enum to interface.
Resolves IDP-437.

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParser.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=6273&r1=6272&r2=6273&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 Fri Jul 11 00:46:43 2014
@@ -144,12 +144,26 @@
                         .getProviderConfig().getClass());
         String connectionStrategy = AttributeSupport.getAttributeValue(config, new QName("connectionStrategy"));
         if (connectionStrategy == null) {
-            connectionStrategy = ConnectionStrategy.ACTIVE_PASSIVE.name();
-        }
-        final BeanDefinitionBuilder strategy =
-                BeanDefinitionBuilder.rootBeanDefinition(ConnectionStrategy.class, "valueOf");
-        strategy.addConstructorArgValue(connectionStrategy);
-        providerConfig.addPropertyValue("connectionStrategy", strategy.getBeanDefinition());
+            providerConfig.addPropertyValue("connectionStrategy", ConnectionStrategy.ACTIVE_PASSIVE);
+        } else {
+            switch (connectionStrategy) {
+                case "DEFAULT":
+                    providerConfig.addPropertyValue("connectionStrategy", ConnectionStrategy.DEFAULT);
+                    break;
+
+                case "ROUND_ROBIN":
+                    providerConfig.addPropertyValue("connectionStrategy", ConnectionStrategy.ROUND_ROBIN);
+                    break;
+
+                case "RANDOM":
+                    providerConfig.addPropertyValue("connectionStrategy", ConnectionStrategy.RANDOM);
+                    break;
+
+                default:
+                    providerConfig.addPropertyValue("connectionStrategy", ConnectionStrategy.ACTIVE_PASSIVE);
+                    break;
+            }
+        }
 
         final ManagedMap<String, String> props = new ManagedMap<>();
         final List<Element> propertyElements =