rename loader

avaje · Jun 17, 2024 · 22a1947 · 22a1947
1 parent 3f0ad72
commit 22a1947
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/validator-generator/io.avaje.validation.spi.GeneratedComponent b/validator-generator/io.avaje.validation.spi.GeneratedComponent
diff --git a/validator-generator/io.avaje.validation.spi.ValidationExtension b/validator-generator/io.avaje.validation.spi.ValidationExtension
diff --git a/validator/src/main/java/io/avaje/validation/core/DValidator.java b/validator/src/main/java/io/avaje/validation/core/DValidator.java
@@ -36,7 +36,7 @@
 /** Default implementation of Validator. */
 final class DValidator implements Validator, ValidationContext {
 
-  private static final DServiceLoader SPI_LOADER = new DServiceLoader();
+  private static final ExtensionLoader SPI_LOADER = new ExtensionLoader();
   private final CoreAdapterBuilder builder;
   private final Map<Type, ValidationType<?>> typeCache = new ConcurrentHashMap<>();
   private final MessageInterpolator interpolator;
@@ -289,7 +289,7 @@ private void registerComponents() {
       for (final ValidatorCustomizer next : SPI_LOADER.customizers()) {
         next.customize(this);
       }
-      for (final GeneratedComponent next : SPI_LOADER.components()) {
+      for (final GeneratedComponent next : SPI_LOADER.generatedComponents()) {
         next.customize(this);
       }
     }

diff --git a/...avaje/validation/core/DServiceLoader.java → ...vaje/validation/core/ExtensionLoader.java b/...avaje/validation/core/DServiceLoader.java → ...vaje/validation/core/ExtensionLoader.java
@@ -13,18 +13,18 @@
 import io.avaje.validation.spi.ValidationExtension;
 
 /** Load all the services using the common service interface. */
-final class DServiceLoader {
+final class ExtensionLoader {
 
-  private final List<GeneratedComponent> components = new ArrayList<>();
+  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();
 
-  DServiceLoader() {
+  ExtensionLoader() {
     for (var spi : ServiceLoader.load(ValidationExtension.class)) {
       if (spi instanceof GeneratedComponent gc) {
-        components.add(gc);
+        generatedComponents.add(gc);
       } else if (spi instanceof ValidatorCustomizer c) {
         customizers.add(c);
       } else if (spi instanceof MessageInterpolator m) {
@@ -41,8 +41,8 @@ public Optional<MessageInterpolator> interpolator() {
     return interpolator;
   }
 
-  public List<GeneratedComponent> components() {
-    return components;
+  public List<GeneratedComponent> generatedComponents() {
+    return generatedComponents;
   }
 
   public List<ValidatorCustomizer> customizers() {

diff --git a/validator/src/main/java/io/avaje/validation/spi/ValidationExtension.java b/validator/src/main/java/io/avaje/validation/spi/ValidationExtension.java
@@ -2,7 +2,7 @@
 
 import io.avaje.spi.Service;
 
-/** super interface for all Validation SPIs */
+/** Super interface for all validation SPIs */
 @Service
 public sealed interface ValidationExtension
     permits AdapterFactory,