[java-opensaml COMMIT] in /trunk/opensaml-saml-api/src/main/java/org/opensaml/saml: common/profile/AbstractNameIdenti...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Jan 23 15:43:45 2014
New Revision: 3567

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3567&view=rev
Log:
IDP-362: Allow generators to return null, add unit test and format validation to SAML 1 plugin

Added:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/profile/SAML1ObjectSupport.java   (with props)
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/profile/SAML2ObjectSupport.java   (with props)
Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/AbstractNameIdentifierGenerator.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/NameIdentifierGenerator.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/NameIdentifier.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/profile/AbstractSAML1NameIdentifierGenerator.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/profile/SAML1NameIdentifierGenerator.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/profile/AbstractSAML2NameIDGenerator.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/profile/SAML2NameIDGenerator.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/AbstractNameIdentifierGenerator.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/AbstractNameIdentifierGenerator.java?rev=3567&r1=3566&r2=3567&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/AbstractNameIdentifierGenerator.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/AbstractNameIdentifierGenerator.java Thu Jan 23 15:43:45 2014
@@ -220,7 +220,7 @@
     
     /** {@inheritDoc} */
     @Override
-    @Nonnull public NameIdType generate(@Nonnull final ProfileRequestContext profileRequestContext)
+    @Nullable public NameIdType generate(@Nonnull final ProfileRequestContext profileRequestContext)
             throws ProfileException {
         ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
         
@@ -235,7 +235,7 @@
      * @return  the generated object
      * @throws ProfileException if an error occurs
      */
-    @Nonnull protected abstract NameIdType doGenerate(@Nonnull final ProfileRequestContext profileRequestContext)
+    @Nullable protected abstract NameIdType doGenerate(@Nonnull final ProfileRequestContext profileRequestContext)
             throws ProfileException;
 
     /**
@@ -247,9 +247,9 @@
      * @return  the generated identifier
      * @throws ProfileException if an error occurs
      */
-    @Nonnull @NotEmpty protected String getIdentifier(@Nonnull final ProfileRequestContext profileRequestContext)
+    @Nullable protected String getIdentifier(@Nonnull final ProfileRequestContext profileRequestContext)
             throws ProfileException {
-        throw new UnsupportedOperationException("Operation not supported");
+        return null;
     }
 
     /**

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/NameIdentifierGenerator.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/NameIdentifierGenerator.java?rev=3567&r1=3566&r2=3567&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/NameIdentifierGenerator.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/profile/NameIdentifierGenerator.java Thu Jan 23 15:43:45 2014
@@ -18,6 +18,7 @@
 package org.opensaml.saml.common.profile;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import org.opensaml.profile.ProfileException;
 import org.opensaml.profile.context.ProfileRequestContext;
@@ -49,10 +50,10 @@
      * 
      * @param profileRequestContext the current profile request context
      * 
-     * @return  the identifier object
+     * @return  the identifier object, or null
      * @throws ProfileException if an error occurs while generating the identifier
      */
-    @Nonnull NameIdType generate(@Nonnull final ProfileRequestContext profileRequestContext)
+    @Nullable NameIdType generate(@Nonnull final ProfileRequestContext profileRequestContext)
         throws ProfileException;
     
 }

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/NameIdentifier.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/NameIdentifier.java?rev=3567&r1=3566&r2=3567&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/NameIdentifier.java (original)

[... 137 lines stripped ...]