[java-identity-provider COMMIT] in /trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/security: KeyAutho...

[noreply at shibboleth.net]

Author: rdw
Date: Sun Feb  2 12:00:14 2014
New Revision: 5300

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5300&view=rev
Log:
Checkstyle

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/security/package-info.java   (with props)
Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/security/KeyAuthorityNodeProcessor.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/security/MetadataPKIXValidationInformationResolver.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/security/KeyAuthorityNodeProcessor.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/security/KeyAuthorityNodeProcessor.java?rev=5300&r1=5299&r2=5300&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/security/KeyAuthorityNodeProcessor.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/security/KeyAuthorityNodeProcessor.java Sun Feb  2 12:00:14 2014
@@ -46,6 +46,7 @@
     private Logger log = LoggerFactory.getLogger(KeyAuthority.class);
 
     /** {@inheritDoc} */
+    @Override
     public void process(XMLObject metadataNode) throws FilterException {
         if (metadataNode instanceof EntitiesDescriptor) {
             handleEntitiesDescriptor((EntitiesDescriptor) metadataNode);

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/security/MetadataPKIXValidationInformationResolver.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/security/MetadataPKIXValidationInformationResolver.java?rev=5300&r1=5299&r2=5300&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/security/MetadataPKIXValidationInformationResolver.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/security/MetadataPKIXValidationInformationResolver.java Sun Feb  2 12:00:14 2014
@@ -54,32 +54,31 @@
 import org.opensaml.security.x509.PKIXValidationInformationResolver;
 import org.opensaml.xmlsec.keyinfo.KeyInfoSupport;
 import org.opensaml.xmlsec.signature.KeyInfo;
-import org.opensaml.xmlsec.signature.KeyName;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * An implementation of {@link PKIXValidationInformationResolver} which resolves {@link PKIXValidationInformation} based
  * on information stored in SAML 2 metadata. Validation information is retrieved from Shibboleth-specific metadata
- * extensions to {@link EntityDescriptor} represented by instances of {@link KeyAuthority}, as well as instances
- * of {@link PKIXValidationInformation} which have been previously populated within the data set available from
+ * extensions to {@link EntityDescriptor} represented by instances of {@link KeyAuthority}, as well as instances of
+ * {@link PKIXValidationInformation} which have been previously populated within the data set available from
  * {@link EntityDescriptor#getObjectMetadata()}.
  * 
- * Resolution of trusted names for an entity is also supported, based on {@link KeyName} information contained within
- * the {@link KeyInfo} of a role descriptor's {@link KeyDescriptor} element.
+ * Resolution of trusted names for an entity is also supported, based on {@link org.opensaml.xmlsec.signature.KeyName}
+ * information contained within the {@link KeyInfo} of a role descriptor's {@link KeyDescriptor} element.
  */
-public class MetadataPKIXValidationInformationResolver implements PKIXValidationInformationResolver, 
+public class MetadataPKIXValidationInformationResolver implements PKIXValidationInformationResolver,
         InitializableComponent {
 
     /** Default value for Shibboleth KeyAuthority verify depth. */
     public static final int KEY_AUTHORITY_VERIFY_DEPTH_DEFAULT = 1;
-    
+
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(MetadataPKIXValidationInformationResolver.class);
-    
+
     /** Metadata RoleDescriptor resolver used to resolve metadata information. */
     private RoleDescriptorResolver roleDescriptorResolver;
-    
+
     /** Initialization flag. */
     private boolean isInitialized;
 
@@ -91,20 +90,20 @@
     public MetadataPKIXValidationInformationResolver(RoleDescriptorResolver resolver) {
         roleDescriptorResolver = Constraint.isNotNull(resolver, "RoleDescriptor resolver cannot be null");
     }
-    
-    /** {@inheritDoc} */
-    public boolean isInitialized() {
+
+    /** {@inheritDoc} */
+    @Override public boolean isInitialized() {
         return isInitialized;
     }
 
     /** {@inheritDoc} */
-    public void initialize() throws ComponentInitializationException {
+    @Override public void initialize() throws ComponentInitializationException {
         isInitialized = true;
     }
-    
+
     /**

[... 289 lines stripped ...]