detect avaje

Author: SentryMan

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

@@ -9,6 +9,7 @@ public class Constants {
   public static final String FACTORY_SUFFIX = "$Factory";
 
   static final String OPENAPIDEFINITION = "io.swagger.v3.oas.annotations.OpenAPIDefinition";
+  static final String COMPONENT = "io.avaje.inject.Component";
 
   static final String SINGLETON = "jakarta.inject.Singleton";
 

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

@@ -67,8 +67,12 @@ protected void addImports(boolean withSingleton) {
       importTypes.add(Constants.VALIDATOR);
     }
     if (withSingleton) {
-      importTypes.add(
-          ctx.useJavax() ? Constants.SINGLETON.replace("jakarta", "javax") : Constants.SINGLETON);
+      if (ctx.isAvajeAvailable()) {
+        importTypes.add(Constants.COMPONENT);
+      } else {
+        importTypes.add(
+            ctx.useJavax() ? Constants.SINGLETON.replace("jakarta", "javax") : Constants.SINGLETON);
+      }
     }
   }
 

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

@@ -1,6 +1,6 @@
 package io.avaje.http.generator.core;
 
-import io.avaje.http.generator.core.openapi.DocContext;
+import java.io.IOException;
 
 import javax.annotation.processing.Filer;
 import javax.annotation.processing.Messager;
@@ -15,7 +15,8 @@
 import javax.tools.FileObject;
 import javax.tools.JavaFileObject;
 import javax.tools.StandardLocation;
-import java.io.IOException;
+
+import io.avaje.http.generator.core.openapi.DocContext;
 
 public class ProcessingContext {
 
@@ -26,7 +27,9 @@ public class ProcessingContext {
   private final Types types;
   private final boolean openApiAvailable;
   private final DocContext docContext;
+  private final boolean avajeAvailable;
   private final boolean useJavax;
+  private final String diAnnotation;
 
   public ProcessingContext(ProcessingEnvironment env, PlatformAdapter readAdapter) {
     this.readAdapter = readAdapter;
@@ -35,8 +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.docContext = new DocContext(env, openApiAvailable);
-    this.useJavax= Boolean.parseBoolean(env.getOptions().get("useJavax"));
+    this.useJavax = Boolean.parseBoolean(env.getOptions().get("useJavax"));
+    this.diAnnotation = avajeAvailable ? "@Component" : "@Singleton";
   }
 
   private boolean isTypeAvailable(String canonicalName) {
@@ -51,6 +56,14 @@ public boolean isOpenApiAvailable() {
     return openApiAvailable;
   }
 
+  public boolean useJavax() {
+    return useJavax;
+  }
+
+  public boolean isAvajeAvailable() {
+    return avajeAvailable;
+  }
+
   public void logError(Element e, String msg, Object... args) {
     messager.printMessage(Diagnostic.Kind.ERROR, String.format(msg, args), e);
   }
@@ -89,7 +102,7 @@ public PlatformAdapter platform() {
     return readAdapter;
   }
 
-  public boolean useJavax() {
-    return useJavax;
+  public String getDiAnnotation() {
+    return diAnnotation;
   }
 }

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("@Singleton").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("@Singleton").eol();
+    writer.append(ctx.getDiAnnotation()).eol();
     writer
       .append("public class ")
       .append(shortName)

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

@@ -47,7 +47,7 @@ private void writeForMethod(MethodReader method) {
 
   private void writeClassStart() {
     writer.append(AT_GENERATED).eol();
-    writer.append("@Singleton").eol();
+    writer.append(ctx.getDiAnnotation()).eol();
     writer.append("public class ").append(shortName).append("$Route implements Routing.Service {").eol().eol();
 
     String controllerName = "controller";

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("@Singleton").eol();
+    writer.append(ctx.getDiAnnotation()).eol();
     writer.append("public class %s$Route implements HttpService {", shortName).eol().eol();
 
     var controllerName = "controller";