[java-idp-oidc] branch main updated: Uniqueify the built-in transcoder beans.

[Scott Cantor]

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

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

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

The following commit(s) were added to refs/heads/main by this push:
       new  6654bb29  Uniqueify the built-in transcoder beans.
6654bb29 is described below

commit 6654bb2904c19b75aa16da6b46c0242c91c3877e
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Nov 4 14:32:53 2020 -0500

    Uniqueify the built-in transcoder beans.
---
 .../attribute/resolver/spring/enc/impl/OIDCByteEncoderParser.java   | 2 +-
 .../resolver/spring/enc/impl/OIDCScopedStringEncoderParser.java     | 2 +-
 .../attribute/resolver/spring/enc/impl/OIDCStringEncoderParser.java | 2 +-
 .../src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml   | 6 +++---
 .../net/shibboleth/idp/attribute/resolver/spring/customBean.xml     | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/OIDCByteEncoderParser.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/OIDCByteEncoderParser.java
index 1600b7b0..30055640 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/OIDCByteEncoderParser.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/OIDCByteEncoderParser.java
@@ -35,7 +35,7 @@ public class OIDCByteEncoderParser extends BaseOIDCAttributeEncoderParser {
     /** {@inheritDoc} */
     @Override
     protected BeanReference buildTranscoder() {
-        return new RuntimeBeanReference("OIDCByteTranscoder");
+        return new RuntimeBeanReference("shibboleth.OIDCByteTranscoder");
     }
 
 }
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/OIDCScopedStringEncoderParser.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/OIDCScopedStringEncoderParser.java
index 2d8092fb..7f55fa13 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/OIDCScopedStringEncoderParser.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/OIDCScopedStringEncoderParser.java
@@ -53,7 +53,7 @@ public class OIDCScopedStringEncoderParser extends BaseOIDCAttributeEncoderParse
     /** {@inheritDoc} */
     @Override
     protected BeanReference buildTranscoder() {
-        return new RuntimeBeanReference("OIDCScopedStringTranscoder");
+        return new RuntimeBeanReference("shibboleth.OIDCScopedStringTranscoder");
     }
 
 }
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/OIDCStringEncoderParser.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/OIDCStringEncoderParser.java
index b3872f13..b3417355 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/OIDCStringEncoderParser.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/attribute/resolver/spring/enc/impl/OIDCStringEncoderParser.java
@@ -53,7 +53,7 @@ public class OIDCStringEncoderParser extends BaseOIDCAttributeEncoderParser {
     /** {@inheritDoc} */
     @Override
     protected BeanReference buildTranscoder() {
-        return new RuntimeBeanReference("OIDCStringTranscoder");
+        return new RuntimeBeanReference("shibboleth.OIDCStringTranscoder");
     }
 
 }
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
index 51c96e9b..ca61fcf9 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
@@ -13,13 +13,13 @@
 
     <!-- Necessary for encoder parsing and claims mapping to function, normally part of registry wiring. -->
     
-    <bean id="OIDCByteTranscoder"
+    <bean id="shibboleth.OIDCByteTranscoder"
         class="org.geant.idpextension.oidc.attribute.transcoding.impl.OIDCByteAttributeTranscoder" />
 
-    <bean id="OIDCStringTranscoder"
+    <bean id="shibboleth.OIDCStringTranscoder"
         class="org.geant.idpextension.oidc.attribute.transcoding.impl.OIDCStringAttributeTranscoder" />
 
-    <bean id="OIDCScopedStringTranscoder"
+    <bean id="shibboleth.OIDCScopedStringTranscoder"
         class="org.geant.idpextension.oidc.attribute.transcoding.impl.OIDCScopedStringAttributeTranscoder" />
 
     <bean parent="shibboleth.RegistryNamingFunction" c:claz="net.minidev.json.JSONObject">
diff --git a/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml
index 7aed41dd..0ed37879 100644
--- a/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml
+++ b/idp-oidc-extension-impl/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/customBean.xml
@@ -27,13 +27,13 @@
 
     <!-- Necessary for encoder parsing to function, normally part of registry wiring. -->
     
-    <bean id="OIDCByteTranscoder"
+    <bean id="shibboleth.OIDCByteTranscoder"
         class="org.geant.idpextension.oidc.attribute.transcoding.impl.OIDCByteAttributeTranscoder" />
 
-    <bean id="OIDCStringTranscoder"
+    <bean id="shibboleth.OIDCStringTranscoder"
         class="org.geant.idpextension.oidc.attribute.transcoding.impl.OIDCStringAttributeTranscoder" />
 
-    <bean id="OIDCScopedStringTranscoder"
+    <bean id="shibboleth.OIDCScopedStringTranscoder"
         class="org.geant.idpextension.oidc.attribute.transcoding.impl.OIDCScopedStringAttributeTranscoder" />
 
 </beans>

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