[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: Wed Sep 28 12:06:57 2016
New Revision: 8435

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8435&view=rev
Log:
IDP-1047 Deprecate parameterized constructor for DataConnectorFactory

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

Add a setter instead and check for it in the doCreateInstance call


Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/AbstractDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/DataConnectorFactoryBean.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/AbstractDataConnectorParser.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/AbstractDataConnectorParser.java?rev=8435&r1=8434&r2=8435&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/AbstractDataConnectorParser.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/AbstractDataConnectorParser.java	Wed Sep 28 12:06:57 2016
@@ -148,7 +148,7 @@
 
         if (isNative(config)) {
             // parse the configuration into a beanfactory and inject the resources as well
-            builder.addConstructorArgValue(getNativeBeanClass());
+            builder.addPropertyValue("objectType", getNativeBeanClass());
             // it's a factory bean so we use the spring lifecycle directly
             builder.setInitMethodName(null);
             builder.setDestroyMethodName(null);

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=8435&r1=8434&r2=8435&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	Wed Sep 28 12:06:57 2016
@@ -29,7 +29,6 @@
 
 import net.shibboleth.ext.spring.util.SpringSupport;
 import net.shibboleth.idp.attribute.resolver.AbstractDataConnector;
-import net.shibboleth.idp.attribute.resolver.DataConnector;
 import net.shibboleth.idp.attribute.resolver.spring.impl.AbstractResolverPluginFactoryBean;
 import net.shibboleth.utilities.java.support.annotation.Duration;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
@@ -88,15 +87,6 @@
     @Nullable @Duration private Long noRetryDelay;
 
     /**
-     * Constructor.
-     * 
-     * @param claz what we are making
-     */
-    public DataConnectorFactoryBean(@Nonnull final Class<? extends AbstractDataConnector> claz) {
-        connectorClass = Constraint.isNotNull(claz, "Injected class must be non-null");
-    }
-
-    /**
      * Data Connector property "failoverDataConnectorId".
      * 
      * @return the value of property to set or null if never set
@@ -202,8 +192,15 @@
         super.setSingleton(singleton);
     }
 
-    /** {@inheritDoc} */
-    @Override public Class<? extends DataConnector> getObjectType() {
+    /** Set the class we are going to build.
+     * @param claz the class.
+     */
+    public void setObjectType(@Nonnull final Class<? extends AbstractDataConnector> claz) {
+        connectorClass = Constraint.isNotNull(claz, "Injected class must be non-null");
+    }
+
+    /** {@inheritDoc} */
+    @Override public Class<? extends AbstractDataConnector> getObjectType() {
         return connectorClass;
     }
 
@@ -234,9 +231,10 @@
      */
     @Override protected AbstractDataConnector doCreateInstance() throws Exception {
 
-        log.debug("Creating a DataConnector of type {} from resources {}", connectorClass, resources);
-
-        final Constructor<? extends AbstractDataConnector> constructor = connectorClass.getConstructor();
+        Constraint.isNotNull(getObjectType(), "Injected class must be non-null");
+        log.debug("Creating a DataConnector of type {} from resources {}", getObjectType(), resources);
+
+        final Constructor<? extends AbstractDataConnector> constructor = getObjectType().getConstructor();
         final AbstractDataConnector result = constructor.newInstance();
         if (null != getFailoverDataConnectorId()) {
             result.setFailoverDataConnectorId(getFailoverDataConnectorId());
@@ -251,7 +249,7 @@
                         getBeanPostProcessors(), Collections.EMPTY_LIST, parentContext);
 

[... 7 lines stripped ...]