[java-idp-plugin-oidc-op-oidfed] 01/02: Renamed the deserializer for LocalKeyContainer.

[Codeberg]

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

codeberg pushed a commit to branch dev/CACHE-REFACTOR
in repository java-idp-plugin-oidc-op-oidfed.

View the commit online:
https://codeberg.org/Shibboleth/java-idp-plugin-oidc-op-oidfed/commit/f385ffb03faabdcbc2e7d6d58500fc6fec8fb60d

commit f385ffb03faabdcbc2e7d6d58500fc6fec8fb60d
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Tue Dec 16 15:09:11 2025 +0200

    Renamed the deserializer for LocalKeyContainer.
---
 .../idp/plugin/oidc/op/oidfed/metadata/LocalKeyContainer.java    | 4 +++-
 .../LocalKeyContainerDeserializer.java}                          | 9 +++++----
 .../main/resources/META-INF/net.shibboleth.idp/postconfig.xml    | 1 +
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/idp-oidfed-op-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oidfed/metadata/LocalKeyContainer.java b/idp-oidfed-op-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oidfed/metadata/LocalKeyContainer.java
index 858cf39..587104f 100644
--- a/idp-oidfed-op-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oidfed/metadata/LocalKeyContainer.java
+++ b/idp-oidfed-op-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oidfed/metadata/LocalKeyContainer.java
@@ -19,10 +19,12 @@ import javax.annotation.Nullable;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.nimbusds.jose.jwk.JWKSet;
 
+import net.shibboleth.idp.plugin.oidc.op.oidfed.metadata.jackson.LocalKeyContainerDeserializer;
+
 /**
  * Key set container class wrapping {@link JWKSet}.
  */
- at JsonDeserialize(using = JWKSetDeserializer.class)
+ at JsonDeserialize(using = LocalKeyContainerDeserializer.class)
 public class LocalKeyContainer {
 
     /** The key set. */
diff --git a/idp-oidfed-op-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oidfed/metadata/JWKSetDeserializer.java b/idp-oidfed-op-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oidfed/metadata/jackson/LocalKeyContainerDeserializer.java
similarity index 84%
rename from idp-oidfed-op-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oidfed/metadata/JWKSetDeserializer.java
rename to idp-oidfed-op-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oidfed/metadata/jackson/LocalKeyContainerDeserializer.java
index c543b31..18c6523 100644
--- a/idp-oidfed-op-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oidfed/metadata/JWKSetDeserializer.java
+++ b/idp-oidfed-op-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oidfed/metadata/jackson/LocalKeyContainerDeserializer.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.plugin.oidc.op.oidfed.metadata;
+package net.shibboleth.idp.plugin.oidc.op.oidfed.metadata.jackson;
 
 import java.io.IOException;
 import java.text.ParseException;
@@ -28,21 +28,22 @@ import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.nimbusds.jose.jwk.JWKSet;
 
+import net.shibboleth.idp.plugin.oidc.op.oidfed.metadata.LocalKeyContainer;
 import net.shibboleth.shared.primitive.LoggerFactory;
 
 /**
  * Jackson deserializer for {@link LocalKeyContainer}.
  */
-public class JWKSetDeserializer extends JsonDeserializer<LocalKeyContainer> {
+public class LocalKeyContainerDeserializer extends JsonDeserializer<LocalKeyContainer> {
 
     /** Class logger. */
-    @Nonnull private final Logger log = LoggerFactory.getLogger(JWKSetDeserializer.class);
+    @Nonnull private final Logger log = LoggerFactory.getLogger(LocalKeyContainerDeserializer.class);
 
     /** {@inheritDoc} */
     @Override
     public LocalKeyContainer deserialize(@Nullable final JsonParser jsonParser,
             @Nullable final DeserializationContext deserializationContext)
-            throws IOException, JacksonException {
+                    throws IOException, JacksonException {
         assert jsonParser != null;
         final String raw = jsonParser.readValueAsTree().toString();
         log.trace("Raw string to be parsed into JWTSet: {}", raw);
diff --git a/idp-oidfed-op-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml b/idp-oidfed-op-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
index 3dd4b7f..2d5aad1 100644
--- a/idp-oidfed-op-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
+++ b/idp-oidfed-op-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
@@ -412,6 +412,7 @@
         </property>
         <property name="parsingStrategy">
             <bean class="net.shibboleth.oidc.metadata.cache.impl.DefaultJSONMapParsingStrategy"
+                c:mapper-ref="shibboleth.oidfed.JWTPayloadJSONObjectMapper"
                 c:valueClass="net.shibboleth.idp.plugin.oidc.op.oidfed.metadata.LocalKeyContainer"/>
         </property>
         <property name="sourceMetadataExpiryStrategy">

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