#85 - Change to use @component (to be agnostic to javax.inject vs jakarata.inject)

Author: rbygrave

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 SINGLETON = "jakarta.inject.Singleton";
+  static final String COMPONENT = "io.avaje.inject.Component";
 
   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,7 @@ protected void addImports(boolean withSingleton) {
       importTypes.add(Constants.VALIDATOR);
     }
     if (withSingleton) {
-      importTypes.add(Constants.SINGLETON);
+      importTypes.add(Constants.COMPONENT);
     }
   }
 

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

@@ -11,7 +11,7 @@
  */
 class ControllerWriter extends BaseControllerWriter {
 
-  private static final String AT_GENERATED = "@Generated(\"io.dinject.helidon-generator\")";
+  private static final String AT_GENERATED = "@Generated(\"avaje-helidon-generator\")";
 
   ControllerWriter(ControllerReader reader, ProcessingContext ctx) throws IOException {
     super(reader, ctx);
@@ -60,7 +60,7 @@ private void writeRoutes(List<ControllerMethodWriter> methods) {
 
   private void writeClassStart() {
     writer.append(AT_GENERATED).eol();
-    writer.append("@Singleton").eol();
+    writer.append("@Component").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

@@ -9,7 +9,7 @@
  */
 class ControllerWriter extends BaseControllerWriter {
 
-  private static final String AT_GENERATED = "@Generated(\"io.dinject.javalin-generator\")";
+  private static final String AT_GENERATED = "@Generated(\"avaje-javalin-generator\")";
   private static final String API_BUILDER = "io.javalin.apibuilder.ApiBuilder";
 
   ControllerWriter(ControllerReader reader, ProcessingContext ctx) throws IOException {
@@ -45,7 +45,7 @@ private void writeForMethod(MethodReader method) {
 
   private void writeClassStart() {
     writer.append(AT_GENERATED).eol();
-    writer.append("@Singleton").eol();
+    writer.append("@Component").eol();
     writer.append("public class ").append(shortName).append("$Route implements WebRoutes {").eol().eol();
 
     String controllerName = "controller";

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("@Component").eol();
     writer.append("public class ").append(shortName).append("$Route implements Routing.Service {").eol().eol();
 
     String controllerName = "controller";