[java-identity-provider COMMIT] /trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAM...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Dec 19 10:09:53 2014
New Revision: 7173

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7173&view=rev
Log:
Fix Javadoc

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML2AttributesMapperService.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML2AttributesMapperService.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML2AttributesMapperService.java?rev=7173&r1=7172&r2=7173&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML2AttributesMapperService.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML2AttributesMapperService.java Fri Dec 19 10:09:53 2014
@@ -41,11 +41,11 @@
 import com.google.common.collect.Multimap;
 
 /**
- * An implementation of {@link SAML2AttributesMapper} for use by objects that
- * can't just store a constructed mapper themselves, such as action beans.
+ * An implementation of {@link SAML2AttributesMapper} for use by objects that can't just store a constructed mapper
+ * themselves, such as action beans.
  */
 @ThreadSafe
-public class SAML2AttributesMapperService implements AttributesMapper<Attribute,IdPAttribute> {
+public class SAML2AttributesMapperService implements AttributesMapper<Attribute, IdPAttribute> {
 
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(SAML2AttributesMapperService.class);
@@ -53,7 +53,8 @@
     /** Service used to get the resolver used to fetch attributes. */
     @Nonnull private final ReloadableService<AttributeResolver> attributeResolverService;
 
-    /** Whether the last invocation of {@link #refreshMappers()} failed. */
+    /** Whether the last invocation of {@link ReloadableService#reload()} failed 
+     * on {@link #attributeResolverService}. */
     @Nonnull private boolean refreshFailed;
 
     /** Cached AttributeMapper. */
@@ -72,16 +73,15 @@
     }
 
     /** {@inheritDoc} */
-    @Override
-    @Nonnull @NonnullElements public Multimap<String, IdPAttribute> mapAttributes(
+    @Override @Nonnull @NonnullElements public Multimap<String, IdPAttribute> mapAttributes(
             @Nonnull @NonnullElements final List<Attribute> prototypes) {
-        
+
         final SAML2AttributesMapper mapper = getMapper();
         if (null == mapper) {
             log.error("No AttributeMapper available, returning nothing");
             return ArrayListMultimap.create();
         }
-        
+
         return mapper.mapAttributes(prototypes);
     }
 
@@ -91,7 +91,7 @@
      * @return the mapper to use
      */
     @Nullable private SAML2AttributesMapper getMapper() {
-        
+
         if (lastReload != null && lastReload.equals(attributeResolverService.getLastSuccessfulReloadInstant())) {
             // Nothing has changed since we last reloaded.
             return attributesMapper;
@@ -120,7 +120,7 @@
                 component.unpinComponent();
             }
         }
-        
+
         try {
             if (null != am) {
                 am.initialize();
@@ -128,9 +128,9 @@
         } catch (final ComponentInitializationException e) {
             log.error("Error initializing AttributeMapper", e);
         }
-        
+
         attributesMapper = am;
         return am;
     }
-    
+
 }