[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-impl/src: main/java/edu/internet2/middleware/shibbol...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Oct 21 10:20:23 2013
New Revision: 4883

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4883&view=rev
Log:
IDP-321 Change the internal requested attribute class name from ScriptedAttribute to ScriptedIdPAttribute.

NOTE that BaseAttribute cannot - this is a compatibiliity class and the name is tied to the V2 name constraints

Added:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedIdPAttribute.java
      - copied, changed from r4880, trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttribute.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/impl/ad/ScriptedAttribute.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttributeTest.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=4883&r1=4882&r2=4883&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 Mon Oct 21 10:20:23 2013
@@ -21,16 +21,16 @@
 import org.slf4j.LoggerFactory;
 
 import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.idp.attribute.resolver.impl.ad.ScriptedAttribute;
+import net.shibboleth.idp.attribute.resolver.impl.ad.ScriptedIdPAttribute;
 
 /**
  * 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 ScriptedAttribute {
+public class BasicAttribute extends ScriptedIdPAttribute {
 
     /** Log. */
-    private Logger log = LoggerFactory.getLogger(ScriptedAttribute.class);
+    private Logger log = LoggerFactory.getLogger(ScriptedIdPAttribute.class);
 
     /**
      * Constructor.

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttributeDefinition.java?rev=4883&r1=4882&r2=4883&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttributeDefinition.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttributeDefinition.java Mon Oct 21 10:20:23 2013
@@ -114,9 +114,9 @@
             return null;
         }
 
-        if (result instanceof ScriptedAttribute) {
+        if (result instanceof ScriptedIdPAttribute) {
 
-            ScriptedAttribute scriptedAttribute = (ScriptedAttribute) result;
+            ScriptedIdPAttribute scriptedAttribute = (ScriptedIdPAttribute) result;
             return scriptedAttribute.getResultingAttribute();
 
         } else {
@@ -158,7 +158,7 @@
         } else {
             log.debug("{} adding to-be-populated attribute to script context", getLogPrefix());
             final IdPAttribute newAttribute = new IdPAttribute(getId());
-            scriptContext.setAttribute(getId(), new ScriptedAttribute(newAttribute, getLogPrefix()),
+            scriptContext.setAttribute(getId(), new ScriptedIdPAttribute(newAttribute, getLogPrefix()),
                     ScriptContext.ENGINE_SCOPE);
         }
 
@@ -175,7 +175,7 @@
             final IdPAttribute pseudoAttribute = new IdPAttribute(dependencyAttribute.getKey());
             pseudoAttribute.setValues(dependencyAttribute.getValue());
 
-            scriptContext.setAttribute(dependencyAttribute.getKey(), new ScriptedAttribute(pseudoAttribute,
+            scriptContext.setAttribute(dependencyAttribute.getKey(), new ScriptedIdPAttribute(pseudoAttribute,
                     getLogPrefix()), ScriptContext.ENGINE_SCOPE);
         }
 


[... 46 lines stripped ...]