[java-identity-provider COMMIT] in /trunk/idp-consent/src: main/java/net/shibboleth/idp/consent/logic/AbstractAttribu...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Mar 13 06:48:33 2015
New Revision: 7412

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7412&view=rev
Log:
IdP-637 Add Function to allow display of attribute Description

Added:
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/AbstractAttributeDisplayFunction.java
      - copied, changed from r7410, trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/AttributeDisplayNameFunction.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/AttributeDisplayDescriptionFunction.java   (with props)
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/logic/AttributeDisplayNameDescriptionFunctionTest.java
      - copied, changed from r7410, trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/logic/AttributeDisplayNameFunctionTest.java
Modified:
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/AttributeDisplayNameFunction.java
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/logic/AttributeDisplayNameFunctionTest.java

Copied: trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/AbstractAttributeDisplayFunction.java (from r7410, trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/AttributeDisplayNameFunction.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/AbstractAttributeDisplayFunction.java?p2=trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/AbstractAttributeDisplayFunction.java&p1=trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/AttributeDisplayNameFunction.java&r1=7410&r2=7412&rev=7412&view=diff
==============================================================================
--- trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/AttributeDisplayNameFunction.java (original)
+++ trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/AbstractAttributeDisplayFunction.java Fri Mar 13 06:48:33 2015
@@ -30,40 +30,37 @@
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Function;
 
 /**
- * Function which returns the display name of an attribute for the defined {@link Locale}, defaulting to the attribute
- * id if no display names are configured.
+ * Abstract Function which returns information about attribute for the defined {@link Locale}. The abstract method
+ * {@link #getDisplayInfo(IdPAttribute)} returns the information select from and the default is the attribute id if no
+ * information is returned.
  */
-public class AttributeDisplayNameFunction implements Function<IdPAttribute, String> {
+public abstract class AbstractAttributeDisplayFunction implements Function<IdPAttribute, String> {
 
-    /** Locale. */
+    /** Desired locales in order of preference. */
     @Nonnull private final List<Locale> locales;
-    
+
     /**
      * Constructor.
      * 
      * @param request The {@link HttpServletRequest} this is used to get the languages.
-     * @param defaultLangauages the comma delimited list of fallback languages
+     * @param defaultLanguages the comma delimited list of fallback languages
      */
-    public AttributeDisplayNameFunction(@Nonnull HttpServletRequest request, @Nullable List<String> defaultLangauages) {
+    public AbstractAttributeDisplayFunction(@Nonnull HttpServletRequest request,
+            @Nullable List<String> defaultLanguages) {
 
         final Enumeration<Locale> requestLocales = request.getLocales();
-        
+
         final List<Locale> newLocales = new ArrayList<>();
 
         while (requestLocales.hasMoreElements()) {
-            Locale l = requestLocales.nextElement();
-            newLocales.add(l);
-            LoggerFactory.getLogger(this.getClass()).trace("Adding locale {}", l);
+            newLocales.add(requestLocales.nextElement());
         }
-        if (null != defaultLangauages) {
-            for (String s : defaultLangauages) {
+        if (null != defaultLanguages) {
+            for (final String s : defaultLanguages) {
                 newLocales.add(new Locale(s));
-                LoggerFactory.getLogger(this.getClass()).trace("Adding language {}", s);
             }
         }
         locales = newLocales;
@@ -74,9 +71,9 @@
         if (input == null) {
             return "N/A";
         }
-        final Map<Locale, String> displayNames = input.getDisplayNames();
-        if (!displayNames.isEmpty()) {
-            for (Locale locale : locales) {
+        final Map<Locale, String> displayNames = getDisplayInfo(input);
+        if (null != displayNames && !displayNames.isEmpty()) {
+            for (final Locale locale : locales) {
                 String displayName = displayNames.get(locale);
                 if (displayName != null) {
                     return displayName;
@@ -89,4 +86,12 @@
         }
         return input.getId();
     }
+
+    /**
+     * Get the information to be displayed from the attribute.
+     * 

[... 153 lines stripped ...]