[java-idp-oidc] branch master updated: Extend naming registry and eliminate duplicated entries.

[Scott Cantor]

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

scantor pushed a commit to branch master
in repository java-idp-oidc.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=9061953d51e73c217953ec6bde875dffc2a1b7d6

The following commit(s) were added to refs/heads/master by this push:
       new  9061953   Extend naming registry and eliminate duplicated entries.
9061953 is described below

commit 9061953d51e73c217953ec6bde875dffc2a1b7d6
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jan 14 12:07:41 2020 -0500

    Extend naming registry and eliminate duplicated entries.
---
 .../src/test/resources/conf/global-oidc.xml        | 28 ++++++++++------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/idp-oidc-extension-impl/src/test/resources/conf/global-oidc.xml b/idp-oidc-extension-impl/src/test/resources/conf/global-oidc.xml
index c90f361..7774b2b 100644
--- a/idp-oidc-extension-impl/src/test/resources/conf/global-oidc.xml
+++ b/idp-oidc-extension-impl/src/test/resources/conf/global-oidc.xml
@@ -59,7 +59,7 @@
         <value>sub</value>
     </util:list>
 
-    <!-- Necessary for encoder parsing to function, normally part of registry wiring. -->
+    <!-- Necessary for encoder parsing and claims mapping to function, normally part of registry wiring. -->
     
     <bean id="OIDCByteTranscoder"
         class="org.geant.idpextension.oidc.attribute.transcoding.impl.OIDCByteAttributeTranscoder" />
@@ -70,19 +70,15 @@
     <bean id="OIDCScopedStringTranscoder"
         class="org.geant.idpextension.oidc.attribute.transcoding.impl.OIDCScopedStringAttributeTranscoder" />
 
-    <util:map id="OIDCExtendedNamingRegistry">
-        <entry key="#{T(net.minidev.json.JSONObject)}">
-            <bean class="org.geant.idpextension.oidc.attribute.transcoding.AbstractOIDCAttributeTranscoder.NamingFunction" />
-        </entry>
-        <entry key="#{T(org.opensaml.saml.saml2.core.Attribute)}">
-            <bean class="net.shibboleth.idp.saml.attribute.transcoding.AbstractSAML2AttributeTranscoder.NamingFunction" />
-        </entry>
-        <entry key="#{T(org.opensaml.saml.saml1.core.AttributeDesignator)}">
-            <bean class="net.shibboleth.idp.saml.attribute.transcoding.AbstractSAML1AttributeTranscoder.NamingFunction" />
-        </entry>
-        <entry key="#{T(net.shibboleth.idp.cas.attribute.Attribute)}">
-            <bean class="net.shibboleth.idp.cas.attribute.AbstractCASAttributeTranscoder.NamingFunction" />
-        </entry>
-    </util:map>
-
+    <bean id="OIDCExtendedNamingRegistry"
+            class="org.springframework.beans.factory.config.MapFactoryBean">
+        <property name="sourceMap">
+            <map merge="true">
+                <entry key="#{T(net.minidev.json.JSONObject)}">
+                    <bean class="org.geant.idpextension.oidc.attribute.transcoding.AbstractOIDCAttributeTranscoder.NamingFunction" />
+                </entry>
+            </map>
+        </property>
+    </bean>
+    
 </beans>
\ No newline at end of file

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