[java-identity-provider] branch master updated: IDP-1434 - Redesign Attribute encoding/decoding as a service

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=5a781cc5b8dd406aadfd8800e09d2fd070e94ec6

The following commit(s) were added to refs/heads/master by this push:
       new  5a781cc   IDP-1434 - Redesign Attribute encoding/decoding as a service
5a781cc is described below

commit 5a781cc5b8dd406aadfd8800e09d2fd070e94ec6
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jun 3 14:46:06 2019 -0400

    IDP-1434 - Redesign Attribute encoding/decoding as a service
    
    https://issues.shibboleth.net/jira/browse/IDP-1434
    
    Better default locale handling.
---
 .../attribute/transcoding/AttributeTranscoderRegistry.java   |  4 ++--
 .../idp/attribute/transcoding/TranscodingRule.java           | 12 ++++++------
 .../impl/AttributeTranscoderRegistryImplTest.java            | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/transcoding/AttributeTranscoderRegistry.java b/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/transcoding/AttributeTranscoderRegistry.java
index 2a500d9..072d5e3 100644
--- a/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/transcoding/AttributeTranscoderRegistry.java
+++ b/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/transcoding/AttributeTranscoderRegistry.java
@@ -53,10 +53,10 @@ public interface AttributeTranscoderRegistry extends IdentifiedComponent {
     @Nonnull @NotEmpty static final String PROP_RELYINGPARTIES = "relyingParties";
     
     /** Property prefix for language-specific display name of attribute. */
-    @Nonnull @NotEmpty static final String PROP_DISPLAY_NAME = "displayName.";
+    @Nonnull @NotEmpty static final String PROP_DISPLAY_NAME = "displayName";
 
     /** Property prefix for language-specific description of attribute. */
-    @Nonnull @NotEmpty static final String PROP_DESCRIPTION = "description.";
+    @Nonnull @NotEmpty static final String PROP_DESCRIPTION = "description";
     
     /**
      * Obtains a set of instructions for encoding an input {@link IdPAttribute} into a target type.
diff --git a/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/transcoding/TranscodingRule.java b/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/transcoding/TranscodingRule.java
index 63495f8..8a8a944 100644
--- a/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/transcoding/TranscodingRule.java
+++ b/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/transcoding/TranscodingRule.java
@@ -184,10 +184,10 @@ public class TranscodingRule {
                 
                 final String lang = StringSupport.trimOrNull(
                         entry.getKey().substring(AttributeTranscoderRegistry.PROP_DISPLAY_NAME.length()));
-                if (lang != null) {
-                    builder.put(Locale.forLanguageTag(lang), (String) entry.getValue());
-                } else {
+                if (lang == null) {
                     builder.put(Locale.getDefault(), (String) entry.getValue());
+                } else if (lang.startsWith(".")) {
+                    builder.put(Locale.forLanguageTag(lang.substring(1)), (String) entry.getValue());
                 }
             }
         }
@@ -209,10 +209,10 @@ public class TranscodingRule {
                 
                 final String lang = StringSupport.trimOrNull(
                         entry.getKey().substring(AttributeTranscoderRegistry.PROP_DESCRIPTION.length()));
-                if (lang != null) {
-                    builder.put(Locale.forLanguageTag(lang), (String) entry.getValue());
-                } else {
+                if (lang == null) {
                     builder.put(Locale.getDefault(), (String) entry.getValue());
+                } else if (lang.startsWith(".")) {
+                    builder.put(Locale.forLanguageTag(lang.substring(1)), (String) entry.getValue());
                 }
             }
         }
diff --git a/idp-attribute-impl/src/test/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImplTest.java b/idp-attribute-impl/src/test/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImplTest.java
index 74bc0e0..8fb78f5 100644
--- a/idp-attribute-impl/src/test/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImplTest.java
+++ b/idp-attribute-impl/src/test/java/net/shibboleth/idp/attribute/transcoding/impl/AttributeTranscoderRegistryImplTest.java
@@ -65,10 +65,10 @@ public class AttributeTranscoderRegistryImplTest {
         final Map<String,Object> ruleset1 = new HashMap<>();
         ruleset1.put(AttributeTranscoderRegistry.PROP_ID, "foo");
         ruleset1.put(AttributeTranscoderRegistry.PROP_TRANSCODER, transcoder);
-        ruleset1.put(AttributeTranscoderRegistry.PROP_DISPLAY_NAME + Locale.ENGLISH.toLanguageTag(), "English name");
-        ruleset1.put(AttributeTranscoderRegistry.PROP_DESCRIPTION + Locale.ENGLISH.toLanguageTag(), "English desc");
-        ruleset1.put(AttributeTranscoderRegistry.PROP_DISPLAY_NAME + Locale.CANADA_FRENCH.toLanguageTag(), "Canadian French name");
-        ruleset1.put(AttributeTranscoderRegistry.PROP_DESCRIPTION + Locale.CANADA_FRENCH.toLanguageTag(), "Canadian French desc");
+        ruleset1.put(AttributeTranscoderRegistry.PROP_DISPLAY_NAME, "Default name");
+        ruleset1.put(AttributeTranscoderRegistry.PROP_DESCRIPTION + '.' + Locale.ENGLISH.toLanguageTag(), "English desc");
+        ruleset1.put(AttributeTranscoderRegistry.PROP_DISPLAY_NAME + '.' +  Locale.CANADA_FRENCH.toLanguageTag(), "Canadian French name");
+        ruleset1.put(AttributeTranscoderRegistry.PROP_DESCRIPTION + '.' + Locale.CANADA_FRENCH.toLanguageTag(), "Canadian French desc");
         ruleset1.put("name", "bar");
         
         final Map<String,Object> ruleset2 = new HashMap<>();
@@ -168,7 +168,7 @@ public class AttributeTranscoderRegistryImplTest {
         assertEquals(attributes.get(0).getId(), "foo");
         assertTrue(attributes.get(0).getValues().isEmpty());
         
-        assertEquals(attributes.get(0).getDisplayNames().get(Locale.forLanguageTag("en")), "English name");
+        assertEquals(attributes.get(0).getDisplayNames().get(Locale.getDefault()), "Default name");
         assertEquals(attributes.get(0).getDisplayDescriptions().get(Locale.forLanguageTag("en")), "English desc");
         assertEquals(attributes.get(0).getDisplayNames().get(Locale.forLanguageTag("fr-ca")), "Canadian French name");
         assertEquals(attributes.get(0).getDisplayDescriptions().get(Locale.forLanguageTag("fr-ca")), "Canadian French desc");

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.