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

[noreply at shibboleth.net]

Author: rdw
Date: Fri Dec 11 11:59:57 2015
New Revision: 8028

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8028&view=rev
Log:
IDP-694 Deprecate the use of workContext in the Scripted Attribute Plugins

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

Deprecate the newly introduced delegating context

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/DelegatedWorkContext.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnector.java

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/DelegatedWorkContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/DelegatedWorkContext.java?rev=8028&r1=8027&r2=8028&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/DelegatedWorkContext.java	(original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/DelegatedWorkContext.java	Fri Dec 11 11:59:57 2015
@@ -36,8 +36,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/** A delegate for {@link AttributeResolverWorkContext}. */
-public class DelegatedWorkContext extends BaseContext {
+/** A delegate for {@link AttributeResolverWorkContext}. 
+ * @deprecated(Deprecated function)*/
+ at Deprecated public class DelegatedWorkContext extends BaseContext {
 
     /** log. */
     private final Logger log = LoggerFactory.getLogger(DelegatedWorkContext.class);

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java?rev=8028&r1=8027&r2=8028&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java	(original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeDefinition.java	Fri Dec 11 11:59:57 2015
@@ -197,7 +197,8 @@
      * @return constructed script context
      * @throws ResolutionException thrown if dependent data connectors or attribute definitions can not be resolved
      */
-    @Nonnull private ScriptContext getScriptContext(@Nonnull final AttributeResolutionContext resolutionContext,
+    @SuppressWarnings("deprecation") @Nonnull private ScriptContext getScriptContext(
+            @Nonnull final AttributeResolutionContext resolutionContext,
             @Nonnull final AttributeResolverWorkContext workContext) throws ResolutionException {
 
         final SimpleScriptContext scriptContext = new SimpleScriptContext();

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnector.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnector.java?rev=8028&r1=8027&r2=8028&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnector.java	(original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnector.java	Fri Dec 11 11:59:57 2015
@@ -57,6 +57,7 @@
 /**
  * A Data Connector which populates a series of attributes from a provided {@link ProfileRequestContext}.
  */
+ at SuppressWarnings("deprecation")
 public class ScriptedDataConnector extends AbstractDataConnector {
 
     /** The id of the object where the results go. */