Fix deserialization of GenericScimResource.

Jackson 3 enabled the DeserializationFeature.FAIL_ON_TRAILING_TOKENS
setting by default. This caused problems for the custom deserializer
since extra JSON data can be present if a GenericScimResource is
embedded within a list response. As a result, this commit updates the
deserializer to address this edge case.

This also includes a nullability annotation correction and minor test
cleanup.

Reviewer: dougbulkley
Reviewer: vyhhuang

JiraIssue: DS-51507

Author: kqarryzada

CHANGELOG.md

@@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/).
 
 ## 6.0.1 - TBD
+Fixed an issue with deserializing a GenericScimResource object when it was embedded within a list
+response.
 
 ## 6.0.0 - 2026-May-11
 The UnboundID SCIM SDK has been updated to use version 3 of the Jackson library (this release ships

scim2-sdk-common/src/main/java/com/unboundid/scim2/common/types/GroupResource.java

@@ -93,7 +93,7 @@
     name="Group", description = "Group")
 public class GroupResource extends BaseScimResource
 {
-  @NotNull
+  @Nullable
   @Attribute(description = "A human-readable name for the Group.",
       isRequired = true,
       isCaseExact = false,
@@ -115,7 +115,7 @@ public class GroupResource extends BaseScimResource
    *
    * @return The name of the Group, suitable for display to end-users.
    */
-  @NotNull
+  @Nullable
   public String getDisplayName()
   {
     return displayName;
@@ -129,7 +129,7 @@ public String getDisplayName()
    * @return This object.
    */
   @NotNull
-  public GroupResource setDisplayName(@NotNull final String displayName)
+  public GroupResource setDisplayName(@Nullable final String displayName)
   {
     this.displayName = displayName;
     return this;

scim2-sdk-common/src/main/java/com/unboundid/scim2/common/utils/GenericScimObjectDeserializer.java

@@ -34,7 +34,6 @@
 
 import com.unboundid.scim2.common.GenericScimResource;
 import com.unboundid.scim2.common.annotations.NotNull;
-import com.unboundid.scim2.common.annotations.Nullable;
 import com.unboundid.scim2.common.exceptions.runtime.ScimDeserializeException;
 import tools.jackson.core.JacksonException;
 import tools.jackson.core.JsonParser;
@@ -55,19 +54,18 @@ public class GenericScimObjectDeserializer
   @Override
   @NotNull
   public GenericScimResource deserialize(
-      @NotNull final JsonParser jp,
-      @Nullable final DeserializationContext ctxt)
+      @NotNull final JsonParser p,
+      @NotNull final DeserializationContext ctxt)
   {
     try
     {
-      ObjectNode node = JsonUtils.getObjectReader()
-          .forType(ObjectNode.class).readValue(jp);
+      ObjectNode node = ctxt.readValue(p, ObjectNode.class);
       return new GenericScimResource(node);
     }
     catch (JacksonException e)
     {
       throw new ScimDeserializeException(
-          "Cannot convert a non-object JSON to a GenericScimResource.", e);
+          "Failed to convert a JSON to an ObjectNode.", e);
     }
   }
 }