use singleton

Author: SentryMan

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

@@ -1,20 +1,23 @@
 package io.avaje.http.generator.core;
 
-import io.avaje.http.api.Controller;
-import io.swagger.v3.oas.annotations.OpenAPIDefinition;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.tags.Tags;
+import java.io.IOException;
+import java.util.LinkedHashSet;
+import java.util.Set;
 
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedOptions;
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
-import java.io.IOException;
-import java.util.LinkedHashSet;
-import java.util.Set;
 
+import io.avaje.http.api.Controller;
+import io.swagger.v3.oas.annotations.OpenAPIDefinition;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.tags.Tags;
+
+@SupportedOptions({"useJavax"})
 public abstract class BaseProcessor extends AbstractProcessor {
 
   protected ProcessingContext ctx;

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

@@ -10,7 +10,7 @@ public class Constants {
 
   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";
 
   static final String IMPORT_PATH_TYPE_CONVERT = "import static io.avaje.http.api.PathTypeConversion.*;";
 

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

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

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

@@ -26,6 +26,7 @@ public class ProcessingContext {
   private final Types types;
   private final boolean openApiAvailable;
   private final DocContext docContext;
+  private final boolean useJavax;
 
   public ProcessingContext(ProcessingEnvironment env, PlatformAdapter readAdapter) {
     this.readAdapter = readAdapter;
@@ -35,6 +36,7 @@ public ProcessingContext(ProcessingEnvironment env, PlatformAdapter readAdapter)
     this.types = env.getTypeUtils();
     this.openApiAvailable = isTypeAvailable(Constants.OPENAPIDEFINITION);
     this.docContext = new DocContext(env, openApiAvailable);
+    this.useJavax= Boolean.parseBoolean(env.getOptions().get("useJavax"));
   }
 
   private boolean isTypeAvailable(String canonicalName) {
@@ -86,4 +88,8 @@ public TypeMirror asMemberOf(DeclaredType declaredType, Element element) {
   public PlatformAdapter platform() {
     return readAdapter;
   }
+
+  public boolean useJavax() {
+    return useJavax;
+  }
 }

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("@Component").eol();
+    writer.append("@Singleton").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

@@ -56,7 +56,7 @@ private void writeForMethod(MethodReader method) {
 
   private void writeClassStart() {
     writer.append(AT_GENERATED).eol();
-    writer.append("@Component").eol();
+    writer.append("@Singleton").eol();
     writer
       .append("public class ")
       .append(shortName)

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

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