Merge branch 'master' into tatu/3.0/1484-mapper-feat-default-view-inc…

…l-to-false
FasterXML · Jan 16, 2025 · 842579c · 842579c
2 parents dafa892 + d77ce7d
commit 842579c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -27,13 +27,17 @@
     exports tools.jackson.databind.cfg;
     exports tools.jackson.databind.deser;
     exports tools.jackson.databind.deser.bean;
-//    exports tools.jackson.databind.deser.impl;
+    // Alas multiple types from this package are exported. Would
+    // ideally move, but for now expose
+    exports tools.jackson.databind.deser.impl;
     exports tools.jackson.databind.deser.jackson;
     exports tools.jackson.databind.deser.jdk;
     exports tools.jackson.databind.deser.std;
     exports tools.jackson.databind.exc;
-    // No need to expose these handlers?
-//    exports tools.jackson.databind.ext;
+    exports tools.jackson.databind.ext;
+    exports tools.jackson.databind.ext.jdk8;
+    // Needed by Ion module for SqlDate deserializer:
+    exports tools.jackson.databind.ext.sql;
     exports tools.jackson.databind.introspect;
     exports tools.jackson.databind.json;
     exports tools.jackson.databind.jsonFormatVisitors;

diff --git a/src/main/java/tools/jackson/databind/ext/beans/JavaBeansAnnotations.java b/src/main/java/tools/jackson/databind/ext/beans/JavaBeansAnnotations.java
@@ -3,8 +3,6 @@
 import tools.jackson.databind.PropertyName;
 import tools.jackson.databind.introspect.Annotated;
 import tools.jackson.databind.introspect.AnnotatedParameter;
-import tools.jackson.databind.util.ClassUtil;
-import tools.jackson.databind.util.ExceptionUtil;
 
 /**
  * Since 2 JDK7-added annotations were left out of JDK 9+ core modules,

diff --git a/src/main/java/tools/jackson/databind/json/JsonMapper.java b/src/main/java/tools/jackson/databind/json/JsonMapper.java
@@ -26,6 +26,12 @@ public Builder(JsonFactory f) {
             super(f);
         }
 
+        /**
+         * NOTE: while public, not exposed as part of public API.
+         *
+         * @param state State from which to restore state of this builder
+         */
+        @SuppressWarnings("exports")
         public Builder(StateImpl state) {
             super(state);
         }

diff --git a/src/test/java/tools/jackson/databind/deser/filter/ReadOnlyDeser95Test.java b/src/test/java/tools/jackson/databind/deser/filter/ReadOnlyDeser95Test.java
@@ -1,7 +1,5 @@
 package tools.jackson.databind.deser.filter;
 
-import java.beans.ConstructorProperties;
-
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;