rename

Author: SentryMan

http-generator-core/src/main/java/io/avaje/http/generator/core/ControllerReader.java

@@ -67,7 +67,7 @@ protected void addImports(boolean withSingleton) {
       importTypes.add(Constants.VALIDATOR);
     }
     if (withSingleton) {
-      if (ctx.isAvajeAvailable()) {
+      if (ctx.useComponent()) {
         importTypes.add(Constants.COMPONENT);
       } else {
         importTypes.add(ctx.useJavax() ? Constants.SINGLETON_JAVAX : Constants.SINGLETON_JAKARTA);

http-generator-core/src/main/java/io/avaje/http/generator/core/ProcessingContext.java

@@ -27,9 +27,9 @@ public class ProcessingContext {
   private final Types types;
   private final boolean openApiAvailable;
   private final DocContext docContext;
-  private final boolean avajeAvailable;
+  private final boolean useComponent;
   private final boolean useJavax;
-  private final String diAnnotation;
+  private final String annotationDI;
 
   public ProcessingContext(ProcessingEnvironment env, PlatformAdapter readAdapter) {
     this.readAdapter = readAdapter;
@@ -38,11 +38,10 @@ public ProcessingContext(ProcessingEnvironment env, PlatformAdapter readAdapter)
     this.elements = env.getElementUtils();
     this.types = env.getTypeUtils();
     this.openApiAvailable = isTypeAvailable(Constants.OPENAPIDEFINITION);
-    this.avajeAvailable = isTypeAvailable(Constants.COMPONENT);
-    this.diAnnotation = avajeAvailable ? "@Component" : "@Singleton";
-
     this.docContext = new DocContext(env, openApiAvailable);
-
+    this.useComponent = isTypeAvailable(Constants.COMPONENT);
+    this.annotationDI = useComponent ? "@Component" : "@Singleton";
+    
     final var javax = isTypeAvailable(Constants.SINGLETON_JAVAX);
     final var jakarta = isTypeAvailable(Constants.SINGLETON_JAKARTA);
     final var override = Boolean.getBoolean(env.getOptions().get("useJavax"));
@@ -72,8 +71,8 @@ public boolean useJavax() {
     return useJavax;
   }
 
-  public boolean isAvajeAvailable() {
-    return avajeAvailable;
+  public boolean useComponent() {
+    return useComponent;
   }
 
   public void logError(Element e, String msg, Object... args) {
@@ -114,7 +113,7 @@ public PlatformAdapter platform() {
     return readAdapter;
   }
 
-  public String getDiAnnotation() {
-    return diAnnotation;
+  public String getDIAnnotation() {
+    return annotationDI;
   }
 }

http-generator-helidon/src/main/java/io/avaje/http/generator/helidon/ControllerWriter.java

@@ -60,7 +60,7 @@ private void writeRoutes(List<ControllerMethodWriter> methods) {
 
   private void writeClassStart() {
     writer.append(AT_GENERATED).eol();
-    writer.append(ctx.getDiAnnotation()).eol();
+    writer.append(ctx.getDIAnnotation()).eol();
     writer.append("public class ").append(shortName).append("$Route implements Service {").eol().eol();
 
     String controllerName = "controller";

http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/ControllerWriter.java

@@ -67,7 +67,7 @@ private void writeForMethod(MethodReader method) {
 
   private void writeClassStart() {
     writer.append(AT_GENERATED).eol();
-    writer.append(ctx.getDiAnnotation()).eol();
+    writer.append(ctx.getDIAnnotation()).eol();
     writer
       .append("public class ")
       .append(shortName)

http-generator-nima/src/main/java/io/avaje/http/generator/helidon/nima/ControllerWriter.java

@@ -77,7 +77,7 @@ private void writeRoutes(List<ControllerMethodWriter> methods) {
 
   private void writeClassStart() {
     writer.append(AT_GENERATED).eol();
-    writer.append(ctx.getDiAnnotation()).eol();
+    writer.append(ctx.getDIAnnotation()).eol();
     writer.append("public class %s$Route implements HttpService {", shortName).eol().eol();
 
     var controllerName = "controller";