Merge branch '2.x' into 3.x

Author: cowtowncoder

jakarta-jsonp/src/main/resources/META-INF/services/tools.jackson.databind.JacksonModule

@@ -19,4 +19,8 @@
 
     // Further, need to open up test packages for JUnit et al
     opens tools.jackson.datatype.jsonp;
+
+    provides tools.jackson.databind.JacksonModule with
+        tools.jackson.datatype.jsonp.JSONPModule;
+    uses tools.jackson.databind.JacksonModule;
 }

jakarta-jsonp/src/test/java/module-info.java

@@ -0,0 +1,35 @@
+package tools.jackson.datatype.jsonp;
+
+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 TestBase
+{
+    @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 = JSONPModule.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("Expecteed to find `"+exp+"` Module (found "+count+" others)");
+        assertEquals(1, count);
+    }
+}

jakarta-jsonp/src/test/java/tools/jackson/datatype/jsonp/ModuleSPIMetadataTest.java

@@ -15,4 +15,8 @@
 
     // Further, need to open up test packages for JUnit et al
     opens tools.jackson.datatype.jakarta.mail;
+
+    provides tools.jackson.databind.JacksonModule with
+        tools.jackson.datatype.jakarta.mail.JakartaMailModule;
+    uses tools.jackson.databind.JacksonModule;
 }

jakarta-mail/src/main/resources/META-INF/services/tools.jackson.databind.JacksonModule

@@ -0,0 +1,35 @@
+package tools.jackson.datatype.jakarta.mail;
+
+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 TestBase
+{
+    @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 = JakartaMailModule.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("Expecteed to find `"+exp+"` Module (found "+count+" others)");
+        assertEquals(1, count);
+    }
+}

jakarta-mail/src/test/java/module-info.java

@@ -23,4 +23,8 @@
 
     // Further, need to open up test packages for JUnit et al
     opens tools.jackson.datatype.javax.money;
+
+    provides tools.jackson.databind.JacksonModule with
+        tools.jackson.datatype.javax.money.JavaxMoneyModule;
+    uses tools.jackson.databind.JacksonModule;
 }

jakarta-mail/src/test/java/tools/jackson/datatype/jakarta/mail/ModuleSPIMetadataTest.java

@@ -0,0 +1,35 @@
+package tools.jackson.datatype.javax.money;
+
+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 = JavaxMoneyModule.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);
+    }
+}