Merge branch 'master' into prism-spi

avaje · Jun 25, 2024 · e22b119 · e22b119
2 parents b85434d + 640b95c
commit e22b119
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 32 deletions.
diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/ExternalProvider.java b/inject-generator/src/main/java/io/avaje/inject/generator/ExternalProvider.java
@@ -13,7 +13,6 @@
 
 import java.util.List;
 import java.util.Map;
-import java.util.ServiceConfigurationError;
 import java.util.Set;
 
 import javax.tools.StandardLocation;
@@ -70,33 +69,29 @@ static void registerModuleProvidedTypes(Set<String> providedTypes) {
       return;
     }
     for (final var module : modules) {
-      try {
-        final var name = module.getClass().getTypeName();
-        final var provides = new ArrayList<String>();
-        APContext.logNote("Detected Module: " + name);
-        for (final var provide : module.provides()) {
-          providedTypes.add(provide.getTypeName());
-          provides.add(provide.getTypeName());
-        }
-        for (final var provide : module.autoProvides()) {
-          providedTypes.add(provide.getTypeName());
-          provides.add(provide.getTypeName());
-        }
-        for (final var provide : module.autoProvidesAspects()) {
-          final var aspectType = Util.wrapAspect(provide.getTypeName());
-          providedTypes.add(aspectType);
-          provides.add(aspectType);
-        }
-        final var requires = Arrays.stream(module.requires()).map(Type::getTypeName).collect(toList());
-
-        Arrays.stream(module.autoRequires()).map(Type::getTypeName).forEach(requires::add);
-        Arrays.stream(module.requiresPackages()).map(Type::getTypeName).forEach(requires::add);
-        Arrays.stream(module.autoRequiresAspects()).map(Type::getTypeName).map(Util::wrapAspect).forEach(requires::add);
-
-        ProcessingContext.addModule(new ModuleData(name, provides, requires));
-      } catch (final ServiceConfigurationError expected) {
-        // ignore expected error reading the module that we are also writing
+      final var name = module.getClass().getTypeName();
+      final var provides = new ArrayList<String>();
+      APContext.logNote("Detected Module: " + name);
+      for (final var provide : module.provides()) {
+        providedTypes.add(provide.getTypeName());
+        provides.add(provide.getTypeName());
       }
+      for (final var provide : module.autoProvides()) {
+        providedTypes.add(provide.getTypeName());
+        provides.add(provide.getTypeName());
+      }
+      for (final var provide : module.autoProvidesAspects()) {
+        final var aspectType = Util.wrapAspect(provide.getTypeName());
+        providedTypes.add(aspectType);
+        provides.add(aspectType);
+      }
+      final var requires = Arrays.stream(module.requires()).map(Type::getTypeName).collect(toList());
+
+      Arrays.stream(module.autoRequires()).map(Type::getTypeName).forEach(requires::add);
+      Arrays.stream(module.requiresPackages()).map(Type::getTypeName).forEach(requires::add);
+      Arrays.stream(module.autoRequiresAspects()).map(Type::getTypeName).map(Util::wrapAspect).forEach(requires::add);
+
+      ProcessingContext.addModule(new ModuleData(name, provides, requires));
     }
   }
 

diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/LoadServices.java b/inject-generator/src/main/java/io/avaje/inject/generator/LoadServices.java
@@ -23,7 +23,7 @@ static List<AvajeModule> loadModules(ClassLoader classLoader) {
           modules.add((AvajeModule) spi);
         }
       } catch (final ServiceConfigurationError expected) {
-        // ignore expected error reading the module that we are also writing
+        // ignore expected error reading the extensions not compiled yet
       }
     }
     return modules;
@@ -32,11 +32,18 @@ static List<AvajeModule> loadModules(ClassLoader classLoader) {
   static List<InjectPlugin> loadPlugins(ClassLoader classLoader) {
     List<InjectPlugin> plugins = new ArrayList<>();
     ServiceLoader.load(Plugin.class, classLoader).forEach(plugins::add);
-    ServiceLoader.load(InjectExtension.class, classLoader).forEach(spi -> {
-      if (spi instanceof InjectPlugin) {
-        plugins.add((InjectPlugin) spi);
+
+    final var iterator = ServiceLoader.load(InjectExtension.class, classLoader).iterator();
+    while (iterator.hasNext()) {
+      try {
+        final var spi = iterator.next();
+        if (spi instanceof InjectPlugin) {
+          plugins.add((InjectPlugin) spi);
+        }
+      } catch (final ServiceConfigurationError expected) {
+        // ignore expected error reading  the extensions not compiled yet
       }
-    });
+    }
     return plugins;
   }
 }