[directory-scimple] 01/01: Merge branch 'patch-tests' into patch_phase1

[bd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bdemers pushed a commit to branch patch_phase1
in repository https://gitbox.apache.org/repos/asf/directory-scimple.git

commit 050e8446cde7c704f2994d840dbf0ff55e2b19f5
Merge: 7668d042 f7ff76b3
Author: Brian Demers <bd...@apache.org>
AuthorDate: Wed Jan 4 11:14:03 2023 -0500

    Merge branch 'patch-tests' into patch_phase1
    
    # Conflicts:
    #       scim-core/src/main/java/org/apache/directory/scim/core/repository/UpdateRequest.java

 .../scim/core/repository/UpdateRequest.java        |  31 ++-
 .../scim/core/repository/UpdateRequestTest.java    | 211 ++++++++++++++-------
 .../directory/scim/spec/resources/PhoneNumber.java |   2 +
 3 files changed, 172 insertions(+), 72 deletions(-)

diff --cc scim-core/src/main/java/org/apache/directory/scim/core/repository/UpdateRequest.java
index 9a5d1cef,35b5a069..9a7ebf59
--- a/scim-core/src/main/java/org/apache/directory/scim/core/repository/UpdateRequest.java
+++ b/scim-core/src/main/java/org/apache/directory/scim/core/repository/UpdateRequest.java
@@@ -19,10 -19,26 +19,24 @@@
  
  package org.apache.directory.scim.core.repository;
  
 -import com.fasterxml.jackson.annotation.JsonInclude;
  import com.fasterxml.jackson.core.JsonProcessingException;
 -import com.fasterxml.jackson.databind.AnnotationIntrospector;
 -import com.fasterxml.jackson.databind.DeserializationFeature;
  import com.fasterxml.jackson.databind.JsonNode;
  import com.fasterxml.jackson.databind.ObjectMapper;
 +import com.fasterxml.jackson.databind.node.*;
+ import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;
+ import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
+ import com.fasterxml.jackson.databind.node.ArrayNode;
+ import com.fasterxml.jackson.databind.node.BooleanNode;
+ import com.fasterxml.jackson.databind.node.DoubleNode;
+ import com.fasterxml.jackson.databind.node.FloatNode;
+ import com.fasterxml.jackson.databind.node.IntNode;
+ import com.fasterxml.jackson.databind.node.NullNode;
+ import com.fasterxml.jackson.databind.node.ObjectNode;
+ import com.fasterxml.jackson.databind.node.POJONode;
+ import com.fasterxml.jackson.databind.node.TextNode;
+ import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector;
+ import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationModule;
+ import com.flipkart.zjsonpatch.DiffFlags;
  import com.flipkart.zjsonpatch.JsonDiff;
  import lombok.EqualsAndHashCode;
  import lombok.Getter;
@@@ -573,5 -604,19 +591,4 @@@ public class UpdateRequest<T extends Sc
        return attribute.getAccessor().get(object);
      }
    }
 -
 -  private static ObjectMapper createObjectMapper() {
 -    ObjectMapper objectMapper = new ObjectMapper();
 -
 -    objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
 -    objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 -    objectMapper.registerModule(new JakartaXmlBindAnnotationModule());
 -
 -    AnnotationIntrospector pair = new AnnotationIntrospectorPair(
 -      new JakartaXmlBindAnnotationIntrospector(objectMapper.getTypeFactory()),
 -      new JacksonAnnotationIntrospector());
 -    objectMapper.setAnnotationIntrospector(pair);
--
 -    return objectMapper;
 -  }
  }