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

[noreply at shibboleth.net]

Author: rdw
Date: Sat Nov 14 07:37:12 2015
New Revision: 7996

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7996&view=rev
Log:
IDP-700 IDP-743 Revert non compatible change to an interface

https://issues.shibboleth.net/jira/browse/IDP-700 https://issues.shibboleth.net/jira/browse/IDP-743

The change to allow data connectors to stay quiescent for a back off time added a method to an interface.  Mea Maxima Culpa

Add a new Interface with the new methods, make our data connectors implement it and recate the attribute resolver and status.jsp changes to reflect this

Added:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/DataConnectorEx.java   (with props)
Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractDataConnector.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/DataConnector.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
    trunk/idp-war/src/main/webapp/WEB-INF/jsp/status.jsp

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractDataConnector.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractDataConnector.java?rev=7996&r1=7995&r2=7996&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractDataConnector.java	(original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractDataConnector.java	Sat Nov 14 07:37:12 2015
@@ -38,7 +38,7 @@
 /** Base class for data connector resolver plugins. */
 @ThreadSafe
 public abstract class AbstractDataConnector extends AbstractResolverPlugin<Map<String, IdPAttribute>> implements
-        DataConnector {
+        DataConnectorEx {
 
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(AbstractDataConnector.class);

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/DataConnector.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/DataConnector.java?rev=7996&r1=7995&r2=7996&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/DataConnector.java	(original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/DataConnector.java	Sat Nov 14 07:37:12 2015
@@ -24,32 +24,21 @@
 
 import net.shibboleth.idp.attribute.IdPAttribute;
 
-/** Base class for data connector resolver plugins. */
+/**
+ * Base class for data connector resolver plugins.
+ * 
+ * This interface should be considered as deprecated, and {@link DataConnectorEx} should be used instead.
+ */
 @ThreadSafe
 public interface DataConnector extends ResolverPlugin<Map<String, IdPAttribute>> {
 
     /**
      * Gets the ID of the {@link DataConnector} whose values will be used in the event that this data connector
      * experiences an error.
-     *
+     * 
      * @return ID of the {@link DataConnector} whose values will be used in the event that this data connector
      *         experiences an error
      */
     @Nullable String getFailoverDataConnectorId();
 
-    /**
-     * Get how long to wait until we declare the connector (potentially) alive again.
-     *
-     * @return how long to wait.
-     */
-     long getNoRetryDelay();
-
-     /**
-      * Get the time when this connector last failed. This will be set for any exception regardless of the setting of
-      * {@link #isPropagateResolutionExceptions()}
-      *
-      * @return when it last failed
-      */
-     long getLastFail();
-
 }

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java?rev=7996&r1=7995&r2=7996&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java	(original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java	Sat Nov 14 07:37:12 2015
@@ -35,6 +35,7 @@
 import net.shibboleth.idp.attribute.resolver.AttributeDefinition;
 import net.shibboleth.idp.attribute.resolver.AttributeResolver;
 import net.shibboleth.idp.attribute.resolver.DataConnector;
+import net.shibboleth.idp.attribute.resolver.DataConnectorEx;
 import net.shibboleth.idp.attribute.resolver.LegacyPrincipalDecoder;

[... 186 lines stripped ...]