Rename InjectSPI to InjectExtension

README.md

@@ -62,13 +62,13 @@ Example ex = beanScope.get(Example.class);
 ### Java Module Usage
 When working with Java modules you need to add a `provides` statement in your `module-info.java` with the generated class.
 ```java
-import io.avaje.inject.spi.InjectSPI;
+import io.avaje.inject.spi.InjectExtension;
 
 module org.example {
 
   requires io.avaje.inject;
   // you must define the fully qualified class name of the generated classes. if you use an import statement, compilation will fail
-  provides InjectSPI with org.example.ExampleModule;
+  provides InjectExtension with org.example.ExampleModule;
 }
 ```
 

blackbox-aspect/src/main/java/module-info.java

@@ -4,6 +4,6 @@
   requires io.avaje.inject.aop;
 
   //remove this and compilation fails
-  provides io.avaje.inject.spi.InjectSPI with org.example.external.aspect.sub.ExampleExternalAspectModule;
+  provides io.avaje.inject.spi.InjectExtension with org.example.external.aspect.sub.ExampleExternalAspectModule;
 
 }

blackbox-other/pom.xml

@@ -18,6 +18,13 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
+
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-inject-events</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
 
     <!-- annotation processor -->
     <dependency>

blackbox-test-inject/pom.xml

@@ -91,7 +91,7 @@
 			<plugin>
 				<groupId>io.avaje</groupId>
 				<artifactId>avaje-inject-maven-plugin</artifactId>
-				<version>10.0-RC5</version>
+				<version>10.0-RC6</version>
 				<executions>
 					<execution>
 						<phase>process-sources</phase>

blackbox-test-inject/src/test/java/org/example/myapp/InjectExtension_injectFromTestModule_Test.java

@@ -1,14 +1,14 @@
 package org.example.myapp;
 
-import io.avaje.inject.test.InjectExtension;
+import io.avaje.inject.test.InjectJunitExtension;
 import jakarta.inject.Inject;
 import org.example.myapp.testconfig.CountTestScopeStart;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@ExtendWith(InjectExtension.class)
+@ExtendWith(InjectJunitExtension.class)
 class InjectExtension_injectFromTestModule_Test {
 
   @Inject

blackbox-test-inject/src/test/java/org/example/myapp/InjectExtension_injectLocalMock_Test.java

@@ -1,6 +1,6 @@
 package org.example.myapp;
 
-import io.avaje.inject.test.InjectExtension;
+import io.avaje.inject.test.InjectJunitExtension;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -10,7 +10,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.when;
 
-@ExtendWith(InjectExtension.class)
+@ExtendWith(InjectJunitExtension.class)
 class InjectExtension_injectLocalMock_Test {
 
   @Inject HelloService helloService;

blackbox-test-inject/src/test/java/org/example/myapp/InjectExtension_setupMethodStatic_Test.java

@@ -1,7 +1,7 @@
 package org.example.myapp;
 
 import io.avaje.inject.BeanScopeBuilder;
-import io.avaje.inject.test.InjectExtension;
+import io.avaje.inject.test.InjectJunitExtension;
 import io.avaje.inject.test.Setup;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
@@ -11,7 +11,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@ExtendWith(InjectExtension.class)
+@ExtendWith(InjectJunitExtension.class)
 class InjectExtension_setupMethodStatic_Test {
 
   static @Inject HelloService helloService;

blackbox-test-inject/src/test/java/org/example/myapp/InjectExtension_setupMethod_Test.java

@@ -1,7 +1,7 @@
 package org.example.myapp;
 
 import io.avaje.inject.BeanScopeBuilder;
-import io.avaje.inject.test.InjectExtension;
+import io.avaje.inject.test.InjectJunitExtension;
 import io.avaje.inject.test.Setup;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
@@ -14,7 +14,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@ExtendWith(InjectExtension.class)
+@ExtendWith(InjectJunitExtension.class)
 class InjectExtension_setupMethod_Test {
 
   @Inject

blackbox-test-inject/src/test/java/org/example/myapp/InjectExtension_testDoubleViaInject_Test.java

@@ -1,13 +1,13 @@
 package org.example.myapp;
 
-import io.avaje.inject.test.InjectExtension;
+import io.avaje.inject.test.InjectJunitExtension;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@ExtendWith(InjectExtension.class)
+@ExtendWith(InjectJunitExtension.class)
 class InjectExtension_testDoubleViaInject_Test {
 
   @Inject HelloService helloService;

blackbox-test-inject/src/test/java/org/example/myapp/InjectExtension_testDoubleViaMock2_Test.java

@@ -1,6 +1,6 @@
 package org.example.myapp;
 
-import io.avaje.inject.test.InjectExtension;
+import io.avaje.inject.test.InjectJunitExtension;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -10,7 +10,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.when;
 
-@ExtendWith(InjectExtension.class)
+@ExtendWith(InjectJunitExtension.class)
 class InjectExtension_testDoubleViaMock2_Test {
 
   @Inject HelloService helloService;

blackbox-test-inject/src/test/java/org/example/myapp/InjectExtension_testDoubleViaMockStatic_Test.java

@@ -1,6 +1,6 @@
 package org.example.myapp;
 
-import io.avaje.inject.test.InjectExtension;
+import io.avaje.inject.test.InjectJunitExtension;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -10,7 +10,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.when;
 
-@ExtendWith(InjectExtension.class)
+@ExtendWith(InjectJunitExtension.class)
 class InjectExtension_testDoubleViaMockStatic_Test {
 
   static @Inject HelloService helloService;

blackbox-test-inject/src/test/java/org/example/myapp/InjectExtension_testDoubleViaMock_Test.java

@@ -1,6 +1,6 @@
 package org.example.myapp;
 
-import io.avaje.inject.test.InjectExtension;
+import io.avaje.inject.test.InjectJunitExtension;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -9,7 +9,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@ExtendWith(InjectExtension.class)
+@ExtendWith(InjectJunitExtension.class)
 class InjectExtension_testDoubleViaMock_Test {
 
   @Inject HelloService helloService;

inject-events/src/main/resources/META-INF/services/io.avaje.inject.spi.InjectExtension

@@ -0,0 +1 @@
+io.avaje.inject.events.spi.ObserverManagerPlugin

inject-generator/src/main/java/io/avaje/inject/generator/Constants.java

@@ -26,7 +26,7 @@ final class Constants {
   static final String AT_PROXY = "@Proxy";
   static final String AT_GENERATED = "@Generated(\"io.avaje.inject.generator\")";
   static final String AT_GENERATED_COMMENT = "(\"io.avaje.inject.generator\")";
-  static final String META_INF_SPI = "META-INF/services/io.avaje.inject.spi.InjectSPI";
+  static final String META_INF_SPI = "META-INF/services/io.avaje.inject.spi.InjectExtension";
   static final String META_INF_TESTMODULE = "META-INF/services/io.avaje.inject.test.TestModule";
   static final String META_INF_CUSTOM = "META-INF/services/io.avaje.inject.spi.AvajeModule.Custom";
 

inject-generator/src/main/java/io/avaje/inject/generator/LoadServices.java

@@ -15,7 +15,7 @@ static List<AvajeModule> loadModules(ClassLoader classLoader) {
     // load using older Module
     ServiceLoader.load(Module.class, classLoader).forEach(modules::add);
     // load newer AvajeModule
-    final var iterator = ServiceLoader.load(InjectSPI.class, classLoader).iterator();
+    final var iterator = ServiceLoader.load(InjectExtension.class, classLoader).iterator();
     while (iterator.hasNext()) {
       try {
         final var spi = iterator.next();
@@ -32,7 +32,7 @@ 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(InjectSPI.class, classLoader).forEach(spi -> {
+    ServiceLoader.load(InjectExtension.class, classLoader).forEach(spi -> {
       if (spi instanceof InjectPlugin) {
         plugins.add((InjectPlugin) spi);
       }

inject-generator/src/main/java/io/avaje/inject/generator/SimpleModuleWriter.java

@@ -33,7 +33,7 @@ final class SimpleModuleWriter {
       " *   module example {\n" +
       " *     requires io.avaje.inject;\n" +
       " *     \n" +
-      " *     provides io.avaje.inject.spi.InjectSPI with %s.%s;\n" +
+      " *     provides io.avaje.inject.spi.InjectExtension with %s.%s;\n" +
       " *     \n" +
       " *   }\n" +
       " * \n" +

inject-generator/src/main/java/module-info.java

@@ -7,7 +7,7 @@
 
   requires static io.avaje.prism;
 
-  uses io.avaje.inject.spi.InjectSPI;
+  uses io.avaje.inject.spi.InjectExtension;
   uses io.avaje.inject.spi.Plugin;
   uses io.avaje.inject.spi.Module;
   uses io.avaje.inject.spi.InjectPlugin;

inject-generator/src/test/java/io/avaje/inject/generator/InjectProcessorTest.java

@@ -37,7 +37,7 @@ void deleteGeneratedFiles() throws IOException {
           .sorted(Comparator.reverseOrder())
           .map(Path::toFile)
           .forEach(File::delete);
-      Paths.get("io.avaje.inject.spi.InjectSPI").toAbsolutePath().toFile().delete();
+      Paths.get("io.avaje.inject.spi.InjectExtension").toAbsolutePath().toFile().delete();
     } catch (final Exception e) {
     }
   }

inject-gradle-plugin/build.gradle

@@ -6,7 +6,7 @@ plugins {
 }
 
 group 'io.avaje.inject'
-version '10.0-RC5'
+version '10.0-RC6'
 
 repositories {
   mavenLocal()

inject-gradle-plugin/src/main/java/io/avaje/inject/plugin/AvajeInjectPlugin.java

@@ -5,7 +5,7 @@
 
 import io.avaje.inject.spi.AvajeModule;
 import io.avaje.inject.spi.InjectPlugin;
-import io.avaje.inject.spi.InjectSPI;
+import io.avaje.inject.spi.InjectExtension;
 import io.avaje.inject.spi.Module;
 import org.gradle.api.*;
 
@@ -69,7 +69,11 @@ private void writeProvidedPlugins(ClassLoader cl, FileWriter pluginWriter) throw
 
     List<InjectPlugin> allPlugins = new ArrayList<>();
     ServiceLoader.load(io.avaje.inject.spi.Plugin.class, cl).forEach(allPlugins::add);
-    ServiceLoader.load(io.avaje.inject.spi.InjectPlugin.class, cl).forEach(allPlugins::add);
+    ServiceLoader.load(InjectExtension.class, classLoader).stream()
+        .map(Provider::get)
+        .filter(InjectPlugin.class::isInstance)
+        .map(InjectPlugin.class::cast)
+        .forEach(allPlugins::add);
 
     for (final var plugin : allPlugins) {
       System.out.println("Loaded Plugin: " + plugin.getClass().getCanonicalName());
@@ -92,7 +96,7 @@ private void writeProvidedModules(ClassLoader classLoader, FileWriter moduleWrit
 
     final List<AvajeModule> avajeModules = new ArrayList<>();
     ServiceLoader.load(Module.class, classLoader).forEach(avajeModules::add);
-    ServiceLoader.load(InjectSPI.class, classLoader).stream()
+    ServiceLoader.load(InjectExtension.class, classLoader).stream()
         .map(Provider::get)
         .filter(AvajeModule.class::isInstance)
         .map(AvajeModule.class::cast)

inject-maven-plugin/pom.xml

@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>10.0-RC5</version>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
 

inject-maven-plugin/src/main/java/io/avaje/inject/mojo/AutoProvidesMojo.java

@@ -30,8 +30,8 @@
 import org.apache.maven.project.MavenProject;
 
 import io.avaje.inject.spi.AvajeModule;
+import io.avaje.inject.spi.InjectExtension;
 import io.avaje.inject.spi.InjectPlugin;
-import io.avaje.inject.spi.InjectSPI;
 import io.avaje.inject.spi.Module;
 import io.avaje.inject.spi.Plugin;
 
@@ -107,7 +107,7 @@ private void writeProvidedPlugins(URLClassLoader newClassLoader, FileWriter plug
 
     final List<InjectPlugin> plugins = new ArrayList<>();
     ServiceLoader.load(Plugin.class, newClassLoader).forEach(plugins::add);
-    ServiceLoader.load(InjectSPI.class, newClassLoader).stream()
+    ServiceLoader.load(InjectExtension.class, newClassLoader).stream()
         .map(Provider::get)
         .filter(InjectPlugin.class::isInstance)
         .map(InjectPlugin.class::cast)
@@ -135,7 +135,7 @@ private void writeProvidedModules(URLClassLoader newClassLoader, FileWriter modu
     final Log log = getLog();
     final List<AvajeModule> avajeModules = new ArrayList<>();
     ServiceLoader.load(Module.class, newClassLoader).forEach(avajeModules::add);
-    ServiceLoader.load(InjectSPI.class, newClassLoader).stream()
+    ServiceLoader.load(InjectExtension.class, newClassLoader).stream()
         .map(Provider::get)
         .filter(AvajeModule.class::isInstance)
         .map(AvajeModule.class::cast)

inject-test/src/main/java/io/avaje/inject/test/GlobalTestBeans.java

@@ -36,7 +36,7 @@ Beans obtain(ExtensionContext context) {
   private void initialise(ExtensionContext context) {
     globalBeans = GlobalInitialise.initialise(false);
     log.log(TRACE, "register global test BeanScope with beans {0}", globalBeans);
-    context.getRoot().getStore(ExtensionContext.Namespace.GLOBAL).put(InjectExtension.class.getCanonicalName(), this);
+    context.getRoot().getStore(ExtensionContext.Namespace.GLOBAL).put(InjectJunitExtension.class.getCanonicalName(), this);
   }
 
   /**

inject-test/src/main/java/io/avaje/inject/test/InjectExtension.java → inject-test/src/main/java/io/avaje/inject/test/InjectJunitExtension.java

@@ -12,7 +12,7 @@
  * <p>
  * Supports injection for fields annotated with <code>@Mock, @Spy, @Captor, @Inject</code>.
  */
-public final class InjectExtension implements BeforeAllCallback, AfterAllCallback, BeforeEachCallback, AfterEachCallback {
+public final class InjectJunitExtension implements BeforeAllCallback, AfterAllCallback, BeforeEachCallback, AfterEachCallback {
 
   private static final System.Logger log = AppLog.getLogger("io.avaje.inject");
   private static final Namespace INJECT_NS = Namespace.create("io.avaje.inject.InjectTest");

inject-test/src/main/java/io/avaje/inject/test/InjectTest.java

@@ -13,7 +13,7 @@
  *
  * <p>This is a JUnit 5 extension.
  */
-@ExtendWith(InjectExtension.class)
+@ExtendWith(InjectJunitExtension.class)
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface InjectTest {

inject-test/src/main/java/module-info.java

@@ -4,12 +4,12 @@
 
   requires transitive io.avaje.inject;
   requires transitive io.avaje.inject.aop;
+  requires transitive io.avaje.inject.events;
   requires transitive org.junit.jupiter.engine;
   requires transitive org.junit.jupiter.api;
   requires static org.apiguardian.api; // needed for javadoc
   requires transitive org.mockito;
   requires transitive org.mockito.junit.jupiter;
-  requires static io.avaje.inject.events;
 //  requires transitive org.assertj.core;
 //  requires transitive net.bytebuddy;
   requires static java.net.http; // for testing only

inject-test/src/test/java/org/example/inherit/MyOneTest.java

@@ -1,14 +1,14 @@
 package org.example.inherit;
 
-import io.avaje.inject.test.InjectExtension;
+import io.avaje.inject.test.InjectJunitExtension;
 import jakarta.inject.Inject;
 import org.example.inherit.notpublic.PubExposed;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@ExtendWith(InjectExtension.class)
+@ExtendWith(InjectJunitExtension.class)
 public class MyOneTest extends MyOneAbstract {
 
   @Inject

inject-test/src/test/java/org/example/injectextension/WithExtnBasicTest.java

@@ -1,6 +1,6 @@
 package org.example.injectextension;
 
-import io.avaje.inject.test.InjectExtension;
+import io.avaje.inject.test.InjectJunitExtension;
 import jakarta.inject.Inject;
 import org.example.coffee.CoffeeMaker;
 import org.example.coffee.Pump;
@@ -14,7 +14,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
-@ExtendWith(InjectExtension.class)
+@ExtendWith(InjectJunitExtension.class)
 class WithExtnBasicTest {
 
   @Mock Pump pump;