Refactor rename AvajeModule interface to InjectModule

Note that I think this is reasonable in terms of @InjectModule
being the same name in that the IDE auto-completion when using
the annotation knows it's an annotation. So I don't think we get
problematic use like this.

Author: rbygrave

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

@@ -28,7 +28,7 @@ final class Constants {
   static final String AT_GENERATED_COMMENT = "(\"io.avaje.inject.generator\")";
   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";
+  static final String META_INF_CUSTOM = "META-INF/services/io.avaje.inject.spi.InjectModule.Custom";
 
   static final String BEANSCOPE = "io.avaje.inject.BeanScope";
   static final String INJECTMODULE = "io.avaje.inject.InjectModule";
@@ -53,7 +53,7 @@ final class Constants {
   static final String BEAN_FACTORY2 = "io.avaje.inject.spi.BeanFactory2";
   static final String BUILDER = "io.avaje.inject.spi.Builder";
   static final String DEPENDENCYMETA = "io.avaje.inject.spi.DependencyMeta";
-  static final String MODULE = "io.avaje.inject.spi.AvajeModule";
+  static final String MODULE = "io.avaje.inject.spi.InjectModule";
   static final String GENERICTYPE = "io.avaje.inject.spi.GenericType";
 
   static final String CONDITIONAL_DEPENDENCY = "con:";

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

@@ -18,7 +18,7 @@
 
 import javax.tools.StandardLocation;
 
-import io.avaje.inject.spi.AvajeModule;
+import io.avaje.inject.spi.InjectModule;
 import io.avaje.inject.spi.InjectPlugin;
 
 /**
@@ -64,7 +64,7 @@ static void registerModuleProvidedTypes(Set<String> providedTypes) {
       return;
     }
 
-    List<AvajeModule> modules = LoadServices.loadModules(CLASS_LOADER);
+    List<InjectModule> modules = LoadServices.loadModules(CLASS_LOADER);
     if (modules.isEmpty()) {
       APContext.logNote("No external modules detected");
       return;

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

@@ -10,17 +10,17 @@
 
 final class LoadServices {
 
-  static List<AvajeModule> loadModules(ClassLoader classLoader) {
-    List<AvajeModule> modules = new ArrayList<>();
+  static List<InjectModule> loadModules(ClassLoader classLoader) {
+    List<InjectModule> modules = new ArrayList<>();
     // load using older Module
     ServiceLoader.load(Module.class, classLoader).forEach(modules::add);
-    // load newer AvajeModule
+    // load newer InjectModule
     final var iterator = ServiceLoader.load(InjectExtension.class, classLoader).iterator();
     while (iterator.hasNext()) {
       try {
         final var spi = iterator.next();
-        if (spi instanceof AvajeModule) {
-          modules.add((AvajeModule) spi);
+        if (spi instanceof InjectModule) {
+          modules.add((InjectModule) spi);
         }
       } catch (final ServiceConfigurationError expected) {
         // ignore expected error reading the module that we are also writing

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

@@ -57,7 +57,7 @@ static String loadMetaInfServices() {
 
   private static boolean isInjectModule(String spi) {
     var moduleType = APContext.typeElement(spi);
-    return moduleType != null && moduleType.getSuperclass().toString().contains("AvajeModule");
+    return moduleType != null && moduleType.getSuperclass().toString().contains("InjectModule");
   }
 
   static List<String> loadMetaInfCustom() {

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

@@ -26,11 +26,11 @@ enum Type {
     /**
      * Default scope.
      */
-    DEFAULT("AvajeModule"),
+    DEFAULT("io.avaje.inject.spi.InjectModule"),
     /**
      * Custom scope.
      */
-    CUSTOM("AvajeModule.Custom"),
+    CUSTOM("io.avaje.inject.spi.InjectModule.Custom"),
     /**
      * Built-in Test scope.
      */

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

@@ -211,7 +211,6 @@ private Set<String> factoryImportTypes() {
     importTypes.add(Constants.BEANSCOPE);
     importTypes.add(Constants.INJECTMODULE);
     importTypes.add(Constants.DEPENDENCYMETA);
-    importTypes.add(Constants.MODULE);
     importTypes.add(Constants.BUILDER);
     return importTypes;
   }

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

@@ -51,7 +51,7 @@ private void writePackage() {
           + "import java.util.Set;\n"
           + "import io.avaje.inject.spi.Generated;\n"
           + "import io.avaje.inject.spi.ModuleOrdering;\n"
-          + "import io.avaje.inject.spi.AvajeModule;")
+          + "import io.avaje.inject.spi.InjectModule;")
       .eol();
 
     writer.eol();
@@ -67,7 +67,7 @@ private void writeStartClass() {
     writer.append(Constants.AT_GENERATED).eol();
     writer.append("public final class %s implements ModuleOrdering {", shortName).eol().eol();
 
-    writer.append("  private final AvajeModule[] sortedModules = new AvajeModule[%s];", ordering.size()).eol();
+    writer.append("  private final InjectModule[] sortedModules = new InjectModule[%s];", ordering.size()).eol();
     writer.append("  private static final Map<String, Integer> INDEXES = Map.ofEntries(").eol();
     var size = ordering.size();
     var count = 0;
@@ -85,7 +85,7 @@ private void writeBuildMethods() {
     writer.append(
       "\n"
         + "  @Override\n"
-        + "  public List<AvajeModule> factories() {\n"
+        + "  public List<InjectModule> factories() {\n"
         + "    return List.of(sortedModules);\n"
         + "  }\n"
         + "\n"
@@ -95,7 +95,7 @@ private void writeBuildMethods() {
         + "  }\n"
         + "\n"
         + "  @Override\n"
-        + "  public void add(AvajeModule module) {\n"
+        + "  public void add(InjectModule module) {\n"
         + "    final var index = INDEXES.get(module.getClass().getTypeName());\n"
         + "    if (index != null) {\n"
         + "      sortedModules[index] = module;\n"

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

@@ -1,3 +1,5 @@
+import io.avaje.inject.spi.InjectModule;
+
 module io.avaje.inject.generator {
 
   requires java.compiler;
@@ -11,7 +13,7 @@
   uses io.avaje.inject.spi.Plugin;
   uses io.avaje.inject.spi.Module;
   uses io.avaje.inject.spi.InjectPlugin;
-  uses io.avaje.inject.spi.AvajeModule;
+  uses InjectModule;
 
   provides javax.annotation.processing.Processor with io.avaje.inject.generator.InjectProcessor;
 }

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

@@ -3,7 +3,7 @@
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
 
-import io.avaje.inject.spi.AvajeModule;
+import io.avaje.inject.spi.InjectModule;
 import io.avaje.inject.spi.InjectPlugin;
 import io.avaje.inject.spi.InjectExtension;
 import io.avaje.inject.spi.Module;
@@ -94,12 +94,12 @@ private void writeProvidedPlugins(ClassLoader classLoader, FileWriter pluginWrit
   private void writeProvidedModules(ClassLoader classLoader, FileWriter moduleWriter) throws IOException {
     final Set<String> providedTypes = new HashSet<>();
 
-    final List<AvajeModule> avajeModules = new ArrayList<>();
+    final List<InjectModule> avajeModules = new ArrayList<>();
     ServiceLoader.load(Module.class, classLoader).forEach(avajeModules::add);
     ServiceLoader.load(InjectExtension.class, classLoader).stream()
         .map(Provider::get)
-        .filter(AvajeModule.class::isInstance)
-        .map(AvajeModule.class::cast)
+        .filter(InjectModule.class::isInstance)
+        .map(InjectModule.class::cast)
         .forEach(avajeModules::add);
 
     for (final var module : avajeModules) {

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

@@ -29,7 +29,7 @@
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.MavenProject;
 
-import io.avaje.inject.spi.AvajeModule;
+import io.avaje.inject.spi.InjectModule;
 import io.avaje.inject.spi.InjectExtension;
 import io.avaje.inject.spi.InjectPlugin;
 import io.avaje.inject.spi.Module;
@@ -133,12 +133,12 @@ private void writeProvidedModules(URLClassLoader newClassLoader, FileWriter modu
     final Set<String> providedTypes = new HashSet<>();
 
     final Log log = getLog();
-    final List<AvajeModule> avajeModules = new ArrayList<>();
+    final List<InjectModule> avajeModules = new ArrayList<>();
     ServiceLoader.load(Module.class, newClassLoader).forEach(avajeModules::add);
     ServiceLoader.load(InjectExtension.class, newClassLoader).stream()
         .map(Provider::get)
-        .filter(AvajeModule.class::isInstance)
-        .map(AvajeModule.class::cast)
+        .filter(InjectModule.class::isInstance)
+        .map(InjectModule.class::cast)
         .forEach(avajeModules::add);
     for (final var module : avajeModules) {
       final var name = module.getClass().getTypeName();