Merge branch 'main' of github.com:avaje/avaje-jsonb

Author: rbygrave

json-core/pom.xml

@@ -17,7 +17,7 @@
     <dependency>
       <groupId>io.helidon.webserver</groupId>
       <artifactId>helidon-webserver</artifactId>
-      <version>4.2.2</version>
+      <version>4.2.3</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>

jsonb-jackson/pom.xml

@@ -16,7 +16,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.19.0</version>
+      <version>2.19.1</version>
     </dependency>
     <dependency>
       <groupId>io.avaje</groupId>

jsonb-spring-adapter/pom.xml

@@ -18,7 +18,7 @@
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>3.5.0</version>
+        <version>3.5.3</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

jsonb/src/main/java/io/avaje/jsonb/Jsonb.java

@@ -1,21 +1,23 @@
 package io.avaje.jsonb;
 
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+import java.lang.reflect.Type;
+import java.util.function.Supplier;
+
 import io.avaje.json.JsonAdapter;
 import io.avaje.json.JsonReader;
 import io.avaje.json.JsonWriter;
 import io.avaje.json.PropertyNames;
-import io.avaje.json.stream.*;
+import io.avaje.json.stream.BufferRecycleStrategy;
+import io.avaje.json.stream.JsonOutput;
+import io.avaje.json.stream.JsonStream;
 import io.avaje.jsonb.core.DefaultBootstrap;
 import io.avaje.jsonb.spi.JsonStreamFactory;
 import io.avaje.jsonb.spi.JsonbComponent;
 
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.Writer;
-import java.lang.reflect.Type;
-import java.util.function.Supplier;
-
 /**
  * Provides access to json adapters by type.
  *
@@ -438,6 +440,13 @@ interface Builder {
      */
     Builder add(AdapterFactory factory);
 
+    /**
+     * Set the ClassLoader to use when loading modules.
+     *
+     * @param classLoader The ClassLoader to use
+     */
+    Builder classLoader(ClassLoader classLoader);
+
     /**
      * Build and return the Jsonb instance with all the given adapters and factories registered.
      */

jsonb/src/main/java/io/avaje/jsonb/core/CoreAdapterBuilder.java

@@ -94,7 +94,12 @@ <T> JsonAdapter<T> build(Type type, Object cacheKey) {
           return result;
         }
       }
-      throw new IllegalArgumentException("No JsonAdapter for " + type + ". Perhaps needs @Json or @Json.Import?");
+      throw new IllegalArgumentException(
+          "No JsonAdapter for "
+              + type
+              + "\nPossible Causes: \n"
+              + "1. Missing @Json or @Json.Import annotation.\n"
+              + "2. The avaje-jsonb-generator dependency was not available during compilation\n");
     } catch (IllegalArgumentException e) {
       throw lookupChain.exceptionWithLookupStack(e);
     } finally {

jsonb/src/main/java/io/avaje/jsonb/core/DJsonb.java

@@ -269,6 +269,7 @@ static final class DBuilder implements Jsonb.Builder {
     private boolean serializeEmpty = true;
     private JsonStream adapter;
     private BufferRecycleStrategy strategy = HYBRID_POOL;
+    private ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
 
     @Override
     public Builder serializeNulls(boolean serializeNulls) {
@@ -345,7 +346,14 @@ public Builder add(AdapterFactory factory) {
       return this;
     }
 
+    @Override
+    public Builder classLoader(ClassLoader classLoader) {
+      this.classLoader = classLoader;
+      return this;
+    }
+
     private void registerComponents() {
+      ExtensionLoader.init(classLoader);
       // first register all user defined JsonbComponent
       for (JsonbComponent next : ExtensionLoader.userComponents()) {
         next.register(this);

jsonb/src/main/java/io/avaje/jsonb/core/ExtensionLoader.java

@@ -5,8 +5,8 @@
 import java.util.Optional;
 import java.util.ServiceLoader;
 
-import io.avaje.jsonb.spi.JsonStreamFactory;
 import io.avaje.jsonb.spi.GeneratedComponent;
+import io.avaje.jsonb.spi.JsonStreamFactory;
 import io.avaje.jsonb.spi.JsonbComponent;
 import io.avaje.jsonb.spi.JsonbExtension;
 
@@ -17,8 +17,8 @@ final class ExtensionLoader {
   private static final List<JsonbComponent> userComponents = new ArrayList<>();
   private static Optional<JsonStreamFactory> adapterFactory = Optional.empty();
 
-  static {
-    for (var spi : ServiceLoader.load(JsonbExtension.class)) {
+  static void init(ClassLoader classLoader) {
+    for (var spi : ServiceLoader.load(JsonbExtension.class, classLoader)) {
       if (spi instanceof GeneratedComponent) {
         generatedComponents.add((GeneratedComponent) spi);
       } else if (spi instanceof JsonbComponent) {