[java-opensaml COMMIT] in /trunk: opensaml-saml-impl/src/main/java/org/opensaml/saml/security/MetadataCredentialResol...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Dec 26 10:13:08 2012
New Revision: 3103

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3103&view=rev
Log:
Add annotations, fix up misspelled API.

Added:
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/package-info.java   (with props)
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/package-info.java
      - copied, changed from r3101, trunk/opensaml-security-api/src/main/java/org/opensaml/security/package.html
Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/MetadataCredentialResolver.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/MetadataCredentialResolverTest.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/AbstractCredential.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/BasicCredential.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/Credential.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/CredentialResolver.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/CredentialSupport.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/package.html
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/package.html
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/DSAKeyValueProvider.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/InlineX509DataProvider.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/RSAKeyValueProvider.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/MetadataCredentialResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/MetadataCredentialResolver.java?rev=3103&r1=3102&r2=3103&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/MetadataCredentialResolver.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/security/MetadataCredentialResolver.java Wed Dec 26 10:13:08 2012
@@ -276,7 +276,7 @@
                                 mutableCred.setEntityId(entityID);
                                 mutableCred.setUsageType(mdUsage);
                             }
-                            cred.getCredentalContextSet().add(new SAMLMDCredentialContext(keyDescriptor));
+                            cred.getCredentialContextSet().add(new SAMLMDCredentialContext(keyDescriptor));
                             credentials.add(cred);
                         }
                     }

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/MetadataCredentialResolverTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/MetadataCredentialResolverTest.java?rev=3103&r1=3102&r2=3103&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/MetadataCredentialResolverTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/security/MetadataCredentialResolverTest.java Wed Dec 26 10:13:08 2012
@@ -549,7 +549,7 @@
     private void checkContextAndID(Credential credential, String entityID, QName role) {
         Assert.assertEquals(credential.getEntityId(), entityID, "Unexpected value found for credential entityID");
         
-        SAMLMDCredentialContext mdContext = credential.getCredentalContextSet().get(SAMLMDCredentialContext.class);
+        SAMLMDCredentialContext mdContext = credential.getCredentialContextSet().get(SAMLMDCredentialContext.class);
         Assert.assertNotNull(mdContext, "SAMLMDCredentialContext was not available");
         
         Assert.assertNotNull(mdContext.getRoleDescriptor());

Modified: trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/AbstractCredential.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/AbstractCredential.java?rev=3103&r1=3102&r2=3103&view=diff
==============================================================================
--- trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/AbstractCredential.java (original)
+++ trunk/opensaml-security-api/src/main/java/org/opensaml/security/credential/AbstractCredential.java Wed Dec 26 10:13:08 2012
@@ -21,6 +21,8 @@
 import java.security.PublicKey;
 import java.util.Collection;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.crypto.SecretKey;
 
 import net.shibboleth.utilities.java.support.collection.LazySet;
@@ -63,37 +65,37 @@
     }
     
     /** {@inheritDoc}  */
-    public String getEntityId() {
+    @Nullable public String getEntityId() {

[... 452 lines stripped ...]