Rename ContextModule to InjectModule

Author: rbygrave

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

@@ -21,7 +21,7 @@ class Constants {
 
   static final String REQUESTSCOPE = "io.avaje.inject.RequestScope";
   static final String BEANCONTEXT = "io.avaje.inject.BeanScope";
-  static final String CONTEXTMODULE = "io.avaje.inject.ContextModule";
+  static final String INJECTMODULE = "io.avaje.inject.InjectModule";
 
   static final String GENERATED = "io.avaje.inject.spi.Generated";
   static final String BEAN_FACTORY = "io.avaje.inject.spi.BeanFactory";

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

@@ -151,9 +151,9 @@ void buildNewBuilder(Append writer) {
     writer.append(";").eol();
   }
 
-  void buildAtContextModule(Append writer) {
+  void buildAtInjectModule(Append writer) {
     writer.append(Constants.AT_GENERATED).eol();
-    writer.append("@ContextModule(name=\"%s\"", contextName);
+    writer.append("@InjectModule(name=\"%s\"", contextName);
     if (!isEmpty(contextProvides)) {
       writer.append(", provides=");
       buildStringArray(writer, contextProvides, false);

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

@@ -1,6 +1,6 @@
 package io.avaje.inject.generator;
 
-import io.avaje.inject.ContextModule;
+import io.avaje.inject.InjectModule;
 import io.avaje.inject.Factory;
 import io.avaje.inject.Request;
 import io.avaje.inject.spi.DependencyMeta;
@@ -61,7 +61,7 @@ public synchronized void init(ProcessingEnvironment processingEnv) {
   public Set<String> getSupportedAnnotationTypes() {
 
     Set<String> annotations = new LinkedHashSet<>();
-    annotations.add(ContextModule.class.getCanonicalName());
+    annotations.add(InjectModule.class.getCanonicalName());
     annotations.add(Factory.class.getCanonicalName());
     annotations.add(Singleton.class.getCanonicalName());
     annotations.add(Constants.CONTROLLER);
@@ -197,7 +197,7 @@ private void readBeanMeta(TypeElement typeElement, boolean factory) {
   }
 
   /**
-   * Read the existing meta data from ContextModule (if found) and the factory bean (if exists).
+   * Read the existing meta data from InjectModule (if found) and the factory bean (if exists).
    */
   private void readModule(RoundEnvironment roundEnv) {
     String factory = context.loadMetaInfServices();
@@ -208,12 +208,12 @@ private void readModule(RoundEnvironment roundEnv) {
       }
     }
 
-    Set<? extends Element> elementsAnnotatedWith = roundEnv.getElementsAnnotatedWith(ContextModule.class);
+    Set<? extends Element> elementsAnnotatedWith = roundEnv.getElementsAnnotatedWith(InjectModule.class);
     if (!elementsAnnotatedWith.isEmpty()) {
       Iterator<? extends Element> iterator = elementsAnnotatedWith.iterator();
       if (iterator.hasNext()) {
         Element element = iterator.next();
-        ContextModule annotation = element.getAnnotation(ContextModule.class);
+        InjectModule annotation = element.getAnnotation(InjectModule.class);
         if (annotation != null) {
           context.setContextDetails(annotation.name(), annotation.provides(), annotation.dependsOn(), element);
         }
@@ -227,7 +227,7 @@ private void readModule(RoundEnvironment roundEnv) {
    * which holds the information we need (to regenerate the factory with any changes).
    */
   private void readFactory(TypeElement factoryType) {
-    ContextModule module = factoryType.getAnnotation(ContextModule.class);
+    InjectModule module = factoryType.getAnnotation(InjectModule.class);
     context.setContextDetails(module.name(), module.provides(), module.dependsOn(), factoryType);
 
     List<? extends Element> elements = factoryType.getEnclosedElements();

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

@@ -126,7 +126,7 @@ private Set<String> factoryImportTypes() {
     Set<String> importTypes = new TreeSet<>();
     importTypes.add(Constants.GENERATED);
     importTypes.add(Constants.BEANCONTEXT);
-    importTypes.add(Constants.CONTEXTMODULE);
+    importTypes.add(Constants.INJECTMODULE);
     importTypes.add(Constants.DEPENDENCYMETA);
     importTypes.add(Constants.BEANSCOPEFACTORY);
     importTypes.add(Constants.BUILDER);
@@ -135,7 +135,7 @@ private Set<String> factoryImportTypes() {
 
   private void writeStartClass() {
     writer.append(CODE_COMMENT_FACTORY, context.contextName(), factoryPackage).eol();
-    context.buildAtContextModule(writer);
+    context.buildAtInjectModule(writer);
 
     writer.append("public class %s implements BeanScopeFactory {", factoryShortName).eol().eol();
     writer.append("  private final String name;").eol();

inject/src/main/java/io/avaje/inject/ContextModule.java renamed to inject/src/main/java/io/avaje/inject/InjectModule.java

@@ -54,7 +54,7 @@
  *
  * }</pre>
  */
-public @interface ContextModule {
+public @interface InjectModule {
 
   /**
    * The name of this context/module.