Merge pull request #2182 from pvillard31/jackson-3-phase-1

Enable Jackson 3 - Phase 1

Author: bitwiseman

pom.xml

@@ -89,7 +89,7 @@
       <dependency>
         <groupId>com.fasterxml.jackson</groupId>
         <artifactId>jackson-bom</artifactId>
-        <version>2.20.0</version>
+        <version>2.21.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

src/main/java/org/kohsuke/github/GHEventInfo.java

@@ -174,7 +174,7 @@ public GHOrganization getOrganization() throws IOException {
      *             if payload cannot be parsed
      */
     public <T extends GHEventPayload> T getPayload(Class<T> type) throws IOException {
-        T v = GitHubClient.getMappingObjectReader(root()).readValue(payload.traverse(), type);
+        T v = GitHubClient.getMappingObjectReader(root()).forType(type).readValue(payload);
         v.lateBind();
         return v;
     }

src/main/java/org/kohsuke/github/GitHubClient.java

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.introspect.VisibilityChecker;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import org.apache.commons.io.IOUtils;
 import org.kohsuke.github.authorization.AuthorizationProvider;
@@ -109,21 +110,19 @@ static class RetryRequestException extends IOException {
     /** The Constant DEFAULT_MINIMUM_RETRY_TIMEOUT_MILLIS. */
     private static final int DEFAULT_MINIMUM_RETRY_MILLIS = DEFAULT_MAXIMUM_RETRY_MILLIS;
     private static final Logger LOGGER = Logger.getLogger(GitHubClient.class.getName());
-    private static final ObjectMapper MAPPER = new ObjectMapper();
+    private static final ObjectMapper MAPPER = JsonMapper.builder()
+            .addModule(new JavaTimeModule())
+            .visibility(new VisibilityChecker.Std(NONE, NONE, NONE, NONE, ANY))
+            .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+            .enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS)
+            .propertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE)
+            .build();
 
     private static final ThreadLocal<String> sendRequestTraceId = new ThreadLocal<>();
 
     /** The Constant GITHUB_URL. */
     static final String GITHUB_URL = "https://api.github.com";
 
-    static {
-        MAPPER.registerModule(new JavaTimeModule());
-        MAPPER.setVisibility(new VisibilityChecker.Std(NONE, NONE, NONE, NONE, ANY));
-        MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        MAPPER.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS, true);
-        MAPPER.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE);
-    }
-
     @Nonnull
     private static <T> GitHubResponse<T> createResponse(@Nonnull GitHubConnectorResponse connectorResponse,
             @CheckForNull BodyHandler<T> handler) throws IOException {

src/test/java/org/kohsuke/github/AotIntegrationTest.java

@@ -1,7 +1,7 @@
 package org.kohsuke.github;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import org.junit.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -80,7 +80,9 @@ public void testIfAllRequiredClassesAreRegisteredForAot() throws IOException {
 
     private Stream<String> readAotConfigToStreamOfClassNames(String reflectionConfig) throws IOException {
         byte[] reflectionConfigFileAsBytes = Files.readAllBytes(Path.of(reflectionConfig));
-        ArrayNode reflectConfigJsonArray = (ArrayNode) new ObjectMapper().readTree(reflectionConfigFileAsBytes);
+        ArrayNode reflectConfigJsonArray = (ArrayNode) JsonMapper.builder()
+                .build()
+                .readTree(reflectionConfigFileAsBytes);
         return StreamSupport
                 .stream(Spliterators.spliteratorUnknownSize(reflectConfigJsonArray.iterator(), Spliterator.ORDERED),
                         false)

src/test/java/org/kohsuke/github/internal/graphql/response/GHGraphQLResponseMockTest.java

@@ -3,8 +3,8 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
@@ -20,10 +20,9 @@
 class GHGraphQLResponseMockTest {
 
     private GHGraphQLResponse<Object> convertJsonToGraphQLResponse(String json) throws JsonProcessingException {
-        ObjectMapper objectMapper = new ObjectMapper();
-        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        JsonMapper mapper = JsonMapper.builder().disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES).build();
 
-        ObjectReader objectReader = objectMapper.reader();
+        ObjectReader objectReader = mapper.reader();
         JavaType javaType = objectReader.getTypeFactory()
                 .constructParametricType(GHGraphQLResponse.class, Object.class);