[java-identity-provider COMMIT] /trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationResult.java

[noreply at shibboleth.net]

Author: scantor
Date: Mon Sep  9 18:00:37 2013
New Revision: 4758

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4758&view=rev
Log:
Remove extra copy of canonical name from AuthnResult

Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationResult.java

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationResult.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationResult.java?rev=4758&r1=4757&r2=4758&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationResult.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationResult.java Mon Sep  9 18:00:37 2013
@@ -48,9 +48,6 @@
     /** The Subject established by the authentication result. */
     @Nonnull private final Subject subject;
     
-    /** The canonical principal name derived from the subject. */
-    @Nullable private String canonicalPrincipalName;
-
     /** The identifier of the flow used to produce this result. */
     @Nonnull @NotEmpty private final String authenticationFlowId;
 
@@ -101,24 +98,6 @@
     @Nonnull @NonnullElements @Unmodifiable public <T extends Principal> Set<T> getSupportedPrincipals(
             @Nonnull final Class<T> c) {
         return subject.getPrincipals(c);
-    }
-    
-    /**
-     * Get the canonical principal name derived from the subject, if any.
-     * 
-     * @return  the canonical principal name derived from the subject
-     */
-    @Nullable public String getCanonicalPrincipalName() {
-        return canonicalPrincipalName;
-    }
-    
-    /**
-     * Set the canonical principal name derived from the subject, if any.
-     * 
-     * @param principalName the principal name to set
-     */
-    public void setCanonicalPrincipalName(@Nullable final String principalName) {
-        canonicalPrincipalName = StringSupport.trimOrNull(principalName);
     }
     
     /**
@@ -201,6 +180,7 @@
      * @return a principal name for logging/debugging
      */
     @Nullable private String getSubjectName() {
+        
         for (Principal p : getSubject().getPrincipals()) {
             return p.getName();
         }