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

[noreply at shibboleth.net]

Author: rdw
Date: Thu Mar 12 11:20:01 2015
New Revision: 7410

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7410&view=rev
Log:
IDP-635 Remove deprecated constructor

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

Modified: 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/AttributeDisplayNameFunction.java?rev=7410&r1=7409&r2=7410&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/AttributeDisplayNameFunction.java Thu Mar 12 11:20:01 2015
@@ -18,7 +18,6 @@
 package net.shibboleth.idp.consent.logic;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Locale;
@@ -30,7 +29,6 @@
 
 import net.shibboleth.idp.attribute.IdPAttribute;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.logic.Constraint;
 
 import org.slf4j.LoggerFactory;
 
@@ -45,18 +43,6 @@
     /** Locale. */
     @Nonnull private final List<Locale> locales;
     
-    /**
-     * Constructor.
-     * 
-     * @param l locale
-     * @deprecated use {@link #AttributeDisplayNameFunction(HttpServletRequest, String)}
-     */
-    @Deprecated public AttributeDisplayNameFunction(@Nonnull final Locale l) {
-        Constraint.isNotNull(l, "Locale cannot be null");
-
-        locales = Collections.singletonList(l);
-    }
-
     /**
      * Constructor.
      * 

Modified: trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/logic/AttributeDisplayNameFunctionTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/logic/AttributeDisplayNameFunctionTest.java?rev=7410&r1=7409&r2=7410&view=diff
==============================================================================
--- trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/logic/AttributeDisplayNameFunctionTest.java (original)
+++ trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/logic/AttributeDisplayNameFunctionTest.java Thu Mar 12 11:20:01 2015
@@ -72,13 +72,6 @@
         return request;
     }
     
-    @Test public void testServerLocale() {
-        @SuppressWarnings("deprecation")
-        Function<IdPAttribute, String> func = new AttributeDisplayNameFunction(new Locale("fr"));
-        
-        Assert.assertEquals(func.apply(testAttribute), "FR locale Name");
-    }
-    
     @Test public void testHttpOnly() {
         Function<IdPAttribute, String> func = new AttributeDisplayNameFunction(getMockRequest("fr", "de", "en"), null);
         Assert.assertEquals(func.apply(testAttribute), "FR locale Name");