Merge pull request #5065 from opentripplanner/renovate/jackson.version

Update jackson.version to v2.15.0
opentripplanner · May 2, 2023 · 731285a · 731285a
2 parents 2e33937 + c113efc
commit 731285a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -60,7 +60,7 @@
         <!-- Lib versions - keep list sorted on property name -->
         <geotools.version>29.0</geotools.version>
         <google.dagger.version>2.45</google.dagger.version>
-        <jackson.version>2.14.2</jackson.version>
+        <jackson.version>2.15.0</jackson.version>
         <jersey.version>3.1.1</jersey.version>
         <junit.version>5.9.3</junit.version>
         <micrometer.version>1.10.6</micrometer.version>

diff --git a/src/ext-test/java/org/opentripplanner/ext/legacygraphqlapi/LegacyGraphQLScalarsTest.java b/src/ext-test/java/org/opentripplanner/ext/legacygraphqlapi/LegacyGraphQLScalarsTest.java
@@ -44,9 +44,7 @@ void geoJson() throws JsonProcessingException {
 
     var jsonNode = ObjectMappers
       .ignoringExtraFields()
-      .readTree(
-        "{\"type\":\"Polygon\",\"coordinates\":[[[0.0,0.0],[1.0,1.0],[2.0,2.0],[0.0,0.0]]]}"
-      );
-    assertEquals(jsonNode, geoJson);
+      .readTree("{\"type\":\"Polygon\",\"coordinates\":[[[0,0],[1,1],[2,2],[0,0]]]}");
+    assertEquals(jsonNode.toString(), geoJson.toString());
   }
 }
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/SnapshotTestBase.java b/src/test/java/org/opentripplanner/routing/algorithm/mapping/SnapshotTestBase.java
@@ -7,7 +7,7 @@
 
 import au.com.origin.snapshots.serializers.SerializerType;
 import au.com.origin.snapshots.serializers.SnapshotSerializer;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.util.DefaultIndenter;
@@ -37,6 +37,7 @@
 import org.opentripplanner.TestOtpModel;
 import org.opentripplanner.TestServerContext;
 import org.opentripplanner.api.mapping.ItineraryMapper;
+import org.opentripplanner.api.model.ApiLeg;
 import org.opentripplanner.api.parameter.ApiRequestMode;
 import org.opentripplanner.api.parameter.QualifiedMode;
 import org.opentripplanner.api.parameter.Qualifier;
@@ -373,15 +374,7 @@ private SnapshotItinerarySerializer() {
       objectMapper.registerModule(new JavaTimeModule());
       objectMapper.registerModule(new Jdk8Module());
 
-      objectMapper.setVisibility(
-        objectMapper
-          .getSerializationConfig()
-          .getDefaultVisibilityChecker()
-          .withFieldVisibility(JsonAutoDetect.Visibility.ANY)
-          .withGetterVisibility(JsonAutoDetect.Visibility.NONE)
-          .withSetterVisibility(JsonAutoDetect.Visibility.NONE)
-          .withCreatorVisibility(JsonAutoDetect.Visibility.NONE)
-      );
+      objectMapper.addMixIn(ApiLeg.class, ApiLegMixin.class);
 
       pp =
         new DefaultPrettyPrinter("") {
@@ -418,4 +411,14 @@ public String getOutputFormat() {
       return SerializerType.JSON.name();
     }
   }
+
+  /**
+   * To exclude {@link ApiLeg#getDuration()} from being deserialized because the returned number
+   * is non-constant making it impossible to assert.
+   */
+  private abstract static class ApiLegMixin {
+
+    @JsonIgnore
+    abstract double getDuration();
+  }
 }