[java-identity-provider COMMIT] in /trunk: idp-saml-api/src/main/java/net/shibboleth/idp/saml/session/SAML2SPSession....

[noreply at shibboleth.net]

Author: scantor
Date: Mon Oct  7 13:49:07 2013
New Revision: 4836

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4836&view=rev
Log:
Serializer and unit test for SAML2 SPSession subtype.

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/session/
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/session/SAML2SPSessionSerializer.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/session/package-info.java   (with props)
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/session/
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/session/SAML2SPSessionSerializerTest.java   (with props)
    trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/session/
    trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/session/invalidNameID.json
    trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/session/invalidXML.json
    trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/session/noNameID.json
    trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/session/noSessionIndex.json
    trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/session/saml2SPSession.json
Modified:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/session/SAML2SPSession.java

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/session/SAML2SPSession.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/session/SAML2SPSession.java?rev=4836&r1=4835&r2=4836&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/session/SAML2SPSession.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/session/SAML2SPSession.java Mon Oct  7 13:49:07 2013
@@ -20,11 +20,9 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import org.opensaml.core.xml.io.Marshaller;
 import org.opensaml.core.xml.io.MarshallingException;
 import org.opensaml.core.xml.util.XMLObjectSupport;
 import org.opensaml.saml.saml2.core.NameID;
-import org.w3c.dom.Element;
 
 import com.google.common.base.Objects;
 
@@ -118,11 +116,9 @@
 
     /** {@inheritDoc} */
     public String toString() {
-        Marshaller marshaller = Constraint.isNotNull(
-                XMLObjectSupport.getMarshaller(nameID), "Marshaller for NameID was null");
         try {
-            Element node = marshaller.marshall(nameID);
-            return Objects.toStringHelper(this).add("NameID", SerializeSupport.nodeToString(node))
+            return Objects.toStringHelper(this)
+                    .add("NameID", SerializeSupport.nodeToString(XMLObjectSupport.marshall(nameID)))
                     .add("SessionIndex", sessionIndex).toString();
         } catch (MarshallingException e) {
             throw new IllegalArgumentException("Error marshalling NameID", e);