For custom ClassLoader support, use non-static ExtensionLoader (#307)

Author: rbygrave

validator/src/main/java/io/avaje/validation/core/DValidator.java

@@ -286,13 +286,12 @@ public Builder messageInterpolator(MessageInterpolator interpolator) {
       return this;
     }
 
-    private void registerComponents() {
-      ExtensionLoader.init(classLoader);
+    private void registerComponents(ExtensionLoader loader) {
       // first register all user defined ValidatorCustomizer
-      for (final ValidatorCustomizer next : ExtensionLoader.customizers()) {
+      for (final ValidatorCustomizer next : loader.customizers()) {
         next.customize(this);
       }
-      for (final GeneratedComponent next : ExtensionLoader.generatedComponents()) {
+      for (final GeneratedComponent next : loader.generatedComponents()) {
         next.customize(this);
       }
     }
@@ -304,12 +303,13 @@ public Validator build() {
         return DEFAULT;
       }
 
-      registerComponents();
+      final var loader = new ExtensionLoader(classLoader);
+      registerComponents(loader);
 
       final var localeResolver = new LocaleResolver(defaultLocale, otherLocales);
       final var interpolator =
           Optional.ofNullable(this.userInterpolator)
-              .or(ExtensionLoader::interpolator)
+              .or(loader::interpolator)
               .orElseGet(BasicMessageInterpolator::new);
 
       return new DValidator(

validator/src/main/java/io/avaje/validation/core/ExtensionLoader.java

@@ -15,13 +15,13 @@
 /** Load all the services using the common service interface. */
 final class ExtensionLoader {
 
-  private static final List<GeneratedComponent> generatedComponents = new ArrayList<>();
-  private static final List<ValidatorCustomizer> customizers = new ArrayList<>();
-  private static final List<AdapterFactory> adapterFactories = new ArrayList<>();
-  private static final List<AnnotationFactory> annotationFactories = new ArrayList<>();
-  private static Optional<MessageInterpolator> interpolator = Optional.empty();
+  private final List<GeneratedComponent> generatedComponents = new ArrayList<>();
+  private final List<ValidatorCustomizer> customizers = new ArrayList<>();
+  private final List<AdapterFactory> adapterFactories = new ArrayList<>();
+  private final List<AnnotationFactory> annotationFactories = new ArrayList<>();
+  private Optional<MessageInterpolator> interpolator = Optional.empty();
 
-  static void init(ClassLoader classLoader) {
+  ExtensionLoader(ClassLoader classLoader) {
     for (var spi : ServiceLoader.load(ValidationExtension.class, classLoader)) {
       if (spi instanceof GeneratedComponent gc) {
         generatedComponents.add(gc);
@@ -37,23 +37,23 @@ static void init(ClassLoader classLoader) {
     }
   }
 
-  static Optional<MessageInterpolator> interpolator() {
+  Optional<MessageInterpolator> interpolator() {
     return interpolator;
   }
 
-  static List<GeneratedComponent> generatedComponents() {
+  List<GeneratedComponent> generatedComponents() {
     return generatedComponents;
   }
 
-  static List<ValidatorCustomizer> customizers() {
+  List<ValidatorCustomizer> customizers() {
     return customizers;
   }
 
-  static List<AdapterFactory> adapterFactories() {
+  List<AdapterFactory> adapterFactories() {
     return adapterFactories;
   }
 
-  static List<AnnotationFactory> annotationFactories() {
+  List<AnnotationFactory> annotationFactories() {
     return annotationFactories;
   }
 }