Merge branch '3.x' of github.com:FasterXML/jackson-modules-base into 3.x

Author: cowtowncoder

pom.xml

@@ -40,6 +40,7 @@ not datatype, data format, or JAX-RS provider modules.
 <!-- 29-Jan-2018, tatu: No need for this, with Java 8
     <module>paranamer</module>
 -->
+    <module>spi-subtypes</module>
   </modules>
 
   <url>https://github.com/FasterXML/jackson-modules-base</url>

release-notes/VERSION

@@ -24,6 +24,8 @@ Active maintainers:
 
 3.1.0 (not yet released)
 
+#229: Add `jackson-module-spi-subtypes` module
+ (contributed by @black-06)
 #317: (afterburner, mrbean) Update byte-buddy to latest (1.17.8) from 1.15.1
 #320: (mrbean) Remove shade plugin from 3.1 MrBean
  (fix by @cowtowncoder, w/ Claude code)

spi-subtypes/src/main/java/module-info.java

@@ -0,0 +1,13 @@
+// SPI Subtypes Main artifact Module descriptor
+module tools.jackson.module.spisubtypes
+{
+    requires com.fasterxml.jackson.annotation;
+
+    requires tools.jackson.core;
+    requires tools.jackson.databind;
+
+    exports tools.jackson.module.spisubtypes;
+
+    provides tools.jackson.databind.JacksonModule with
+        tools.jackson.module.spisubtypes.SubtypesModule;
+}

…n/module/spisubtypes/JacksonSubType.java …n/module/spisubtypes/JacksonSubType.javaspi-subtypes/src/main/java/com/fasterxml/jackson/module/spisubtypes/JacksonSubType.java renamed to spi-subtypes/src/main/java/tools/jackson/module/spisubtypes/JacksonSubType.java spi-subtypes/src/main/java/com/fasterxml/jackson/module/spisubtypes/JacksonSubType.java renamed to spi-subtypes/src/main/java/tools/jackson/module/spisubtypes/JacksonSubType.java

@@ -1,12 +1,11 @@
-package com.fasterxml.jackson.module.spisubtypes;
+package tools.jackson.module.spisubtypes;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 import com.fasterxml.jackson.annotation.JacksonAnnotation;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 
 /**
@@ -16,7 +15,7 @@
  * name will be constructed by type id mechanism.
  * Default name is usually based on class name.
  * <p>
- * It's the same as {@link  JsonSubTypes.Type}.
+ * It's the same as {@link com.fasterxml.jackson.annotation.JsonSubTypes.Type}.
  *
  * @since 2.21 / 3.1
  */

…odule/spisubtypes/PackageVersion.java.in …odule/spisubtypes/PackageVersion.java.inspi-subtypes/src/main/java/com/fasterxml/jackson/module/spisubtypes/PackageVersion.java.in renamed to spi-subtypes/src/main/java/tools/jackson/module/spisubtypes/PackageVersion.java.in spi-subtypes/src/main/java/com/fasterxml/jackson/module/spisubtypes/PackageVersion.java.in renamed to spi-subtypes/src/main/java/tools/jackson/module/spisubtypes/PackageVersion.java.in

@@ -1,8 +1,8 @@
 package @package@;
 
-import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.core.Versioned;
-import com.fasterxml.jackson.core.util.VersionUtil;
+import tools.jackson.core.Version;
+import tools.jackson.core.Versioned;
+import tools.jackson.core.util.VersionUtil;
 
 /**
  * Automatically generated from PackageVersion.java.in during

…ypes/SubtypesAnnotationIntrospector.java …ypes/SubtypesAnnotationIntrospector.javaspi-subtypes/src/main/java/com/fasterxml/jackson/module/spisubtypes/SubtypesAnnotationIntrospector.java renamed to spi-subtypes/src/main/java/tools/jackson/module/spisubtypes/SubtypesAnnotationIntrospector.java spi-subtypes/src/main/java/com/fasterxml/jackson/module/spisubtypes/SubtypesAnnotationIntrospector.java renamed to spi-subtypes/src/main/java/tools/jackson/module/spisubtypes/SubtypesAnnotationIntrospector.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.module.spisubtypes;
+package tools.jackson.module.spisubtypes;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -7,11 +7,12 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 
-import com.fasterxml.jackson.core.Version;
+import tools.jackson.core.Version;
 
-import com.fasterxml.jackson.databind.AnnotationIntrospector;
-import com.fasterxml.jackson.databind.introspect.Annotated;
-import com.fasterxml.jackson.databind.jsontype.NamedType;
+import tools.jackson.databind.AnnotationIntrospector;
+import tools.jackson.databind.cfg.MapperConfig;
+import tools.jackson.databind.introspect.Annotated;
+import tools.jackson.databind.jsontype.NamedType;
 
 /**
  * Annotation introspector that handles {@link JacksonSubType} annotation.
@@ -23,7 +24,10 @@
  *
  * @since 2.21 / 3.1
  */
-public class SubtypesAnnotationIntrospector extends AnnotationIntrospector {
+public class SubtypesAnnotationIntrospector extends AnnotationIntrospector
+{
+    private static final long serialVersionUID = 3L;
+
     private final ConcurrentHashMap<Class<?>, List<NamedType>> subtypes = new ConcurrentHashMap<>();
 
     @Override
@@ -32,7 +36,7 @@ public Version version() {
     }
 
     @Override
-    public List<NamedType> findSubtypes(Annotated a) {
+    public List<NamedType> findSubtypes(MapperConfig<?> config, Annotated a) {
         registerTypes(a.getRawType());
 
         List<NamedType> list1 = _findSubtypes(a.getRawType(), a::getAnnotation);

…n/module/spisubtypes/SubtypesModule.java …n/module/spisubtypes/SubtypesModule.javaspi-subtypes/src/main/java/com/fasterxml/jackson/module/spisubtypes/SubtypesModule.java renamed to spi-subtypes/src/main/java/tools/jackson/module/spisubtypes/SubtypesModule.java spi-subtypes/src/main/java/com/fasterxml/jackson/module/spisubtypes/SubtypesModule.java renamed to spi-subtypes/src/main/java/tools/jackson/module/spisubtypes/SubtypesModule.java

@@ -1,15 +1,15 @@
-package com.fasterxml.jackson.module.spisubtypes;
+package tools.jackson.module.spisubtypes;
 
-import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.databind.Module;
+import tools.jackson.core.Version;
+import tools.jackson.databind.JacksonModule;
 
 /**
  * Subtypes module for registering subtypes without annotating the parent class.
  * See <a href="https://github.com/FasterXML/jackson-databind/issues/2104">this issues</a> in jackson-databind.
  *
  * @since 2.21 / 3.1
  */
-public class SubtypesModule extends Module {
+public class SubtypesModule extends JacksonModule {
 
     protected SubtypesAnnotationIntrospector _introspector;
 
@@ -18,7 +18,7 @@ public SubtypesModule() {
     }
 
     public SubtypesModule(SubtypesAnnotationIntrospector introspector) {
-        this._introspector = introspector;
+        _introspector = introspector;
     }
 
     @Override

spi-subtypes/src/moditect/module-info.java

@@ -1,17 +1,19 @@
-package com.fasterxml.jackson.module.spisubtypes;
+package tools.jackson.module.spisubtypes;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Stream;
 
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.json.JsonMapper;
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
+
 import com.google.auto.service.AutoService;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
 
 import static org.junit.jupiter.api.Assertions.*;
 

…spisubtypes/WithJacksonSubTypesTest.java …spisubtypes/WithJacksonSubTypesTest.javaspi-subtypes/src/test/java/com/fasterxml/jackson/module/spisubtypes/WithJacksonSubTypesTest.java renamed to spi-subtypes/src/test/java/tools/jackson/module/spisubtypes/WithJacksonSubTypesTest.java spi-subtypes/src/test/java/com/fasterxml/jackson/module/spisubtypes/WithJacksonSubTypesTest.java renamed to spi-subtypes/src/test/java/tools/jackson/module/spisubtypes/WithJacksonSubTypesTest.java

@@ -1,18 +1,18 @@
-package com.fasterxml.jackson.module.spisubtypes;
+package tools.jackson.module.spisubtypes;
 
 import java.util.Objects;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.json.JsonMapper;
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
 import com.google.auto.service.AutoService;
-import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-
 /**
  * test {@link JacksonSubType} works alone, without {@link JsonSubTypes}
  */