[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: Thu Oct 30 06:03:21 2014
New Revision: 6807

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6807&view=rev
Log:
Define an interface that for the attributes that  ECMAScripts get .

Added:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/scripted/
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/scripted/ScriptedIdPAttribute.java   (with props)
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/scripted/package-info.java   (with props)
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedIdPAttributeImpl.java
      - copied, changed from r6802, trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedIdPAttribute.java
Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/BasicAttribute.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/ad/impl/ScriptedIdPAttribute.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/ScriptedDataConnector.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/impl/SAMLAttributeDataConnector.java

Modified: trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/BasicAttribute.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/BasicAttribute.java?rev=6807&r1=6806&r2=6807&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/BasicAttribute.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/BasicAttribute.java Thu Oct 30 06:03:21 2014
@@ -21,16 +21,16 @@
 import org.slf4j.LoggerFactory;
 
 import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.idp.attribute.resolver.ad.impl.ScriptedIdPAttribute;
+import net.shibboleth.idp.attribute.resolver.ad.impl.ScriptedIdPAttributeImpl;
 
 /**
  * A class which is here solely to provide compatibility for V2 scripted attribute definitions. The assumption is that a
  * constructor will be called with a string and that only {@link #getValues()} would be called from then on.
  */
-public class BasicAttribute extends ScriptedIdPAttribute {
+public class BasicAttribute extends ScriptedIdPAttributeImpl {
 
     /** Log. */
-    private Logger log = LoggerFactory.getLogger(ScriptedIdPAttribute.class);
+    private Logger log = LoggerFactory.getLogger(ScriptedIdPAttributeImpl.class);
 
     /**
      * Constructor.

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=6807&r1=6806&r2=6807&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 Thu Oct 30 06:03:21 2014
@@ -158,9 +158,9 @@
             return null;
         }
 
-        if (result instanceof ScriptedIdPAttribute) {
-
-            final ScriptedIdPAttribute scriptedAttribute = (ScriptedIdPAttribute) result;
+        if (result instanceof ScriptedIdPAttributeImpl) {
+
+            final ScriptedIdPAttributeImpl scriptedAttribute = (ScriptedIdPAttributeImpl) result;
             return scriptedAttribute.getResultingAttribute();
 
         } else {
@@ -192,7 +192,7 @@
         } else {
             log.debug("{} adding to-be-populated attribute to script context", getLogPrefix());
             final IdPAttribute newAttribute = new IdPAttribute(getId());
-            scriptContext.setAttribute(getId(), new ScriptedIdPAttribute(newAttribute, getLogPrefix()),
+            scriptContext.setAttribute(getId(), new ScriptedIdPAttributeImpl(newAttribute, getLogPrefix()),
                     ScriptContext.ENGINE_SCOPE);
         }
 
@@ -212,7 +212,7 @@
             final IdPAttribute pseudoAttribute = new IdPAttribute(dependencyAttribute.getKey());

[... 159 lines stripped ...]