Merge branch '2.x' into 3.x

cowtowncoder · cowtowncoder · commit 423b61af628f · 2025-05-23T16:12:56.000-07:00
diff --git a/afterburner/src/test/java/module-info.java b/afterburner/src/test/java/module-info.java
@@ -42,4 +42,8 @@
     opens tools.jackson.module.afterburner.testutil;
     opens tools.jackson.module.afterburner.testutil.failure;
     opens tools.jackson.module.afterburner.util;
+
+    provides tools.jackson.databind.JacksonModule with
+        tools.jackson.module.afterburner.AfterburnerModule;
+    uses tools.jackson.databind.JacksonModule;
 }
diff --git a/afterburner/src/test/java/tools/jackson/module/afterburner/ModuleSPIMetadataTest.java b/afterburner/src/test/java/tools/jackson/module/afterburner/ModuleSPIMetadataTest.java
@@ -0,0 +1,36 @@
+package tools.jackson.module.afterburner;
+
+import org.junit.jupiter.api.Test;
+
+import tools.jackson.databind.JacksonModule;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.ServiceLoader;
+
+public class ModuleSPIMetadataTest
+    extends AfterburnerTestBase
+{
+    @Test
+    void testModuleSPIMetadata() {
+        ServiceLoader<JacksonModule> loader
+            = ServiceLoader.load(JacksonModule.class);
+        assertTrue(loader.iterator().hasNext(),
+                "Expected at least one `Module` implementation to be found via `ServiceLoader`");
+        final String exp = AfterburnerModule.class.getName();
+        int count = 0;
+
+        try {
+            for (JacksonModule service : loader) {
+                ++count;
+                if (service.getClass().getName().equals(exp)) {
+                    return;
+                }
+            }
+        } catch (Throwable t) {
+            fail("Expected to find `"+exp+"` Module (found "+count+" so far), problem: "+t);
+        }
+        fail("Expected to find `"+exp+"` Module (found "+count+" others)");
+        assertEquals(1, count);
+    }
+}
diff --git a/android-record/src/test/java/module-info.java b/android-record/src/test/java/module-info.java
@@ -18,4 +18,8 @@
     opens tools.jackson.module.androidrecord;
     opens tools.jackson.module.androidrecord.testutil.failure;
     opens tools.jackson.module.androidrecord.tofix;
+
+    provides tools.jackson.databind.JacksonModule with
+        tools.jackson.module.androidrecord.AndroidRecordModule;
+    uses tools.jackson.databind.JacksonModule;
 }
diff --git a/android-record/src/test/java/tools/jackson/module/androidrecord/ModuleSPIMetadataTest.java b/android-record/src/test/java/tools/jackson/module/androidrecord/ModuleSPIMetadataTest.java
@@ -0,0 +1,35 @@
+package tools.jackson.module.androidrecord;
+
+import org.junit.jupiter.api.Test;
+
+import tools.jackson.databind.JacksonModule;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.ServiceLoader;
+
+public class ModuleSPIMetadataTest
+{
+    @Test
+    void testModuleSPIMetadata() {
+        ServiceLoader<JacksonModule> loader
+            = ServiceLoader.load(JacksonModule.class);
+        assertTrue(loader.iterator().hasNext(),
+                "Expected at least one `Module` implementation to be found via `ServiceLoader`");
+        final String exp = AndroidRecordModule.class.getName();
+        int count = 0;
+
+        try {
+            for (JacksonModule service : loader) {
+                ++count;
+                if (service.getClass().getName().equals(exp)) {
+                    return;
+                }
+            }
+        } catch (Throwable t) {
+            fail("Expected to find `"+exp+"` Module (found "+count+" so far), problem: "+t);
+        }
+        fail("Expected to find `"+exp+"` Module (found "+count+" others)");
+        assertEquals(1, count);
+    }
+}
diff --git a/blackbird/src/test/java/module-info.java b/blackbird/src/test/java/module-info.java
@@ -39,4 +39,8 @@
     opens tools.jackson.module.blackbird.tofix;
     opens tools.jackson.module.blackbird.testutil;
     opens tools.jackson.module.blackbird.testutil.failure;
+
+    provides tools.jackson.databind.JacksonModule with
+        tools.jackson.module.blackbird.BlackbirdModule;
+    uses tools.jackson.databind.JacksonModule;
 }
diff --git a/blackbird/src/test/java/tools/jackson/module/blackbird/ModuleSPIMetadataTest.java b/blackbird/src/test/java/tools/jackson/module/blackbird/ModuleSPIMetadataTest.java
@@ -0,0 +1,36 @@
+package tools.jackson.module.blackbird;
+
+import org.junit.jupiter.api.Test;
+
+import tools.jackson.databind.JacksonModule;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.ServiceLoader;
+
+public class ModuleSPIMetadataTest
+    extends BlackbirdTestBase
+{
+    @Test
+    void testModuleSPIMetadata() {
+        ServiceLoader<JacksonModule> loader
+            = ServiceLoader.load(JacksonModule.class);
+        assertTrue(loader.iterator().hasNext(),
+                "Expected at least one `Module` implementation to be found via `ServiceLoader`");
+        final String exp = BlackbirdModule.class.getName();
+        int count = 0;
+
+        try {
+            for (JacksonModule service : loader) {
+                ++count;
+                if (service.getClass().getName().equals(exp)) {
+                    return;
+                }
+            }
+        } catch (Throwable t) {
+            fail("Expected to find `"+exp+"` Module (found "+count+" so far), problem: "+t);
+        }
+        fail("Expected to find `"+exp+"` Module (found "+count+" others)");
+        assertEquals(1, count);
+    }
+}
diff --git a/jakarta-xmlbind/src/test/java/module-info.java b/jakarta-xmlbind/src/test/java/module-info.java
@@ -25,4 +25,8 @@
     opens tools.jackson.module.jakarta.xmlbind.testutil.failure;
     opens tools.jackson.module.jakarta.xmlbind.tofix;
     opens tools.jackson.module.jakarta.xmlbind.types;
+
+    provides tools.jackson.databind.JacksonModule with
+        tools.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationModule;
+    uses tools.jackson.databind.JacksonModule;
 }
diff --git a/jakarta-xmlbind/src/test/java/tools/jackson/module/jakarta/xmlbind/ModuleSPIMetadataTest.java b/jakarta-xmlbind/src/test/java/tools/jackson/module/jakarta/xmlbind/ModuleSPIMetadataTest.java
@@ -0,0 +1,36 @@
+package tools.jackson.module.jakarta.xmlbind;
+
+import org.junit.jupiter.api.Test;
+
+import tools.jackson.databind.JacksonModule;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.ServiceLoader;
+
+public class ModuleSPIMetadataTest
+    extends ModuleTestBase
+{
+    @Test
+    void testModuleSPIMetadata() {
+        ServiceLoader<JacksonModule> loader
+            = ServiceLoader.load(JacksonModule.class);
+        assertTrue(loader.iterator().hasNext(),
+                "Expected at least one `Module` implementation to be found via `ServiceLoader`");
+        final String exp = JakartaXmlBindAnnotationModule.class.getName();
+        int count = 0;
+
+        try {
+            for (JacksonModule service : loader) {
+                ++count;
+                if (service.getClass().getName().equals(exp)) {
+                    return;
+                }
+            }
+        } catch (Throwable t) {
+            fail("Expected to find `"+exp+"` Module (found "+count+" so far), problem: "+t);
+        }
+        fail("Expected to find `"+exp+"` Module (found "+count+" others)");
+        assertEquals(1, count);
+    }
+}
diff --git a/mrbean/src/test/java/module-info.java b/mrbean/src/test/java/module-info.java
@@ -20,4 +20,8 @@
 
     // Further, need to open up some packages for JUnit et al
     opens tools.jackson.module.mrbean;
+
+    provides tools.jackson.databind.JacksonModule with
+        tools.jackson.module.mrbean.MrBeanModule;
+    uses tools.jackson.databind.JacksonModule;
 }
diff --git a/mrbean/src/test/java/tools/jackson/module/mrbean/ModuleSPIMetadataTest.java b/mrbean/src/test/java/tools/jackson/module/mrbean/ModuleSPIMetadataTest.java
@@ -0,0 +1,36 @@
+package tools.jackson.module.mrbean;
+
+import org.junit.jupiter.api.Test;
+
+import tools.jackson.databind.JacksonModule;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.ServiceLoader;
+
+public class ModuleSPIMetadataTest
+    extends BaseTest
+{
+    @Test
+    void testModuleSPIMetadata() {
+        ServiceLoader<JacksonModule> loader
+            = ServiceLoader.load(JacksonModule.class);
+        assertTrue(loader.iterator().hasNext(),
+                "Expected at least one `Module` implementation to be found via `ServiceLoader`");
+        final String exp = MrBeanModule.class.getName();
+        int count = 0;
+
+        try {
+            for (JacksonModule service : loader) {
+                ++count;
+                if (service.getClass().getName().equals(exp)) {
+                    return;
+                }
+            }
+        } catch (Throwable t) {
+            fail("Expected to find `"+exp+"` Module (found "+count+" so far), problem: "+t);
+        }
+        fail("Expected to find `"+exp+"` Module (found "+count+" others)");
+        assertEquals(1, count);
+    }
+}
diff --git a/mrbean/src/test/java/tools/jackson/module/mrbean/TestAbstractClasses.java b/mrbean/src/test/java/tools/jackson/module/mrbean/TestAbstractClasses.java
@@ -37,7 +37,6 @@ protected Bean() { }
     /**********************************************************
      */
 
-    @SuppressWarnings("synthetic-access")
     @Test
     public void testSimpleInteface() throws Exception
     {
diff --git a/mrbean/src/test/java/tools/jackson/module/mrbean/TestAbstractClassesWithOverrides.java b/mrbean/src/test/java/tools/jackson/module/mrbean/TestAbstractClassesWithOverrides.java
@@ -90,7 +90,6 @@ public void testOverrides() throws Exception
         verifyBean(bean2);
     }
 
-    @SuppressWarnings("synthetic-access")
     @Test
     public void testReAbstractedMethods() throws Exception
     {
@@ -173,7 +172,6 @@ public void testEagerFailureOnReAbstractedMethods() throws Exception
         }
     }
 
-    @SuppressWarnings("synthetic-access")
     private void verifyBean(Bean bean) {
         assertNotNull(bean);
         assertEquals("abc", bean.getX());
diff --git a/no-ctor-deser/src/test/java/module-info.java b/no-ctor-deser/src/test/java/module-info.java
@@ -16,4 +16,8 @@
 
     // Further, need to open up some packages for JUnit et al
     opens tools.jackson.module.noctordeser;
+
+    provides tools.jackson.databind.JacksonModule with
+        tools.jackson.module.noctordeser.NoCtorDeserModule;
+    uses tools.jackson.databind.JacksonModule;
 }
diff --git a/no-ctor-deser/src/test/java/tools/jackson/module/noctordeser/ModuleSPIMetadataTest.java b/no-ctor-deser/src/test/java/tools/jackson/module/noctordeser/ModuleSPIMetadataTest.java
@@ -0,0 +1,35 @@
+package tools.jackson.module.noctordeser;
+
+import org.junit.jupiter.api.Test;
+
+import tools.jackson.databind.JacksonModule;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.ServiceLoader;
+
+public class ModuleSPIMetadataTest
+{
+    @Test
+    void testModuleSPIMetadata() {
+        ServiceLoader<JacksonModule> loader
+            = ServiceLoader.load(JacksonModule.class);
+        assertTrue(loader.iterator().hasNext(),
+                "Expected at least one `Module` implementation to be found via `ServiceLoader`");
+        final String exp = NoCtorDeserModule.class.getName();
+        int count = 0;
+
+        try {
+            for (JacksonModule service : loader) {
+                ++count;
+                if (service.getClass().getName().equals(exp)) {
+                    return;
+                }
+            }
+        } catch (Throwable t) {
+            fail("Expected to find `"+exp+"` Module (found "+count+" so far), problem: "+t);
+        }
+        fail("Expected to find `"+exp+"` Module (found "+count+" others)");
+        assertEquals(1, count);
+    }
+}
diff --git a/paranamer/src/test/java/com/fasterxml/jackson/module/paranamer/ModuleSPIMetadataTest.java b/paranamer/src/test/java/com/fasterxml/jackson/module/paranamer/ModuleSPIMetadataTest.java
@@ -0,0 +1,34 @@
+package com.fasterxml.jackson.module.paranamer;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.ServiceLoader;
+
+public class ModuleSPIMetadataTest
+    extends ModuleTestBase
+{
+    @Test
+    void testModuleSPIMetadata() {
+        ServiceLoader<com.fasterxml.jackson.databind.Module> loader
+            = ServiceLoader.load(com.fasterxml.jackson.databind.Module.class);
+        assertTrue(loader.iterator().hasNext(),
+                "Expected at least one `Module` implementation to be found via `ServiceLoader`");
+        final String exp = ParanamerModule.class.getName();
+        int count = 0;
+
+        try {
+            for (com.fasterxml.jackson.databind.Module service : loader) {
+                ++count;
+                if (service.getClass().getName().equals(exp)) {
+                    return;
+                }
+            }
+        } catch (Throwable t) {
+            fail("Expected to find `"+exp+"` Module (found "+count+" so far), problem: "+t);
+        }
+        fail("Expected to find `"+exp+"` Module (found "+count+" others)");
+        assertEquals(1, count);
+    }
+}
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -25,6 +25,7 @@ Active maintainers:
 
 2.20.0 (not yet released)
 
+#303: Add unit tests to verify goodness of SPI metadata for Modules
 - Generate SBOMs [JSTEP-14]
 
 2.19.0 (24-Apr-2025)

Original file line number	Diff line number	Diff line change
`@@ -42,4 +42,8 @@`
`42`	`42`	`opens tools.jackson.module.afterburner.testutil;`
`43`	`43`	`opens tools.jackson.module.afterburner.testutil.failure;`
`44`	`44`	`opens tools.jackson.module.afterburner.util;`
	`45`	`+`
	`46`	`+ provides tools.jackson.databind.JacksonModule with`
	`47`	`+ tools.jackson.module.afterburner.AfterburnerModule;`
	`48`	`+ uses tools.jackson.databind.JacksonModule;`
`45`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,8 @@`
`18`	`18`	`opens tools.jackson.module.androidrecord;`
`19`	`19`	`opens tools.jackson.module.androidrecord.testutil.failure;`
`20`	`20`	`opens tools.jackson.module.androidrecord.tofix;`
	`21`	`+`
	`22`	`+ provides tools.jackson.databind.JacksonModule with`
	`23`	`+ tools.jackson.module.androidrecord.AndroidRecordModule;`
	`24`	`+ uses tools.jackson.databind.JacksonModule;`
`21`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,4 +39,8 @@`
`39`	`39`	`opens tools.jackson.module.blackbird.tofix;`
`40`	`40`	`opens tools.jackson.module.blackbird.testutil;`
`41`	`41`	`opens tools.jackson.module.blackbird.testutil.failure;`
	`42`	`+`
	`43`	`+ provides tools.jackson.databind.JacksonModule with`
	`44`	`+ tools.jackson.module.blackbird.BlackbirdModule;`
	`45`	`+ uses tools.jackson.databind.JacksonModule;`
`42`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,8 @@`
`25`	`25`	`opens tools.jackson.module.jakarta.xmlbind.testutil.failure;`
`26`	`26`	`opens tools.jackson.module.jakarta.xmlbind.tofix;`
`27`	`27`	`opens tools.jackson.module.jakarta.xmlbind.types;`
	`28`	`+`
	`29`	`+ provides tools.jackson.databind.JacksonModule with`
	`30`	`+ tools.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationModule;`
	`31`	`+ uses tools.jackson.databind.JacksonModule;`
`28`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,8 @@`
`20`	`20`
`21`	`21`	`// Further, need to open up some packages for JUnit et al`
`22`	`22`	`opens tools.jackson.module.mrbean;`
	`23`	`+`
	`24`	`+ provides tools.jackson.databind.JacksonModule with`
	`25`	`+ tools.jackson.module.mrbean.MrBeanModule;`
	`26`	`+ uses tools.jackson.databind.JacksonModule;`
`23`	`27`	`}`