javax constant

Author: SentryMan

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

@@ -11,7 +11,8 @@ 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 SINGLETON_JAKARTA = "jakarta.inject.Singleton";
+  static final String SINGLETON_JAVAX = "javax.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

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

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

@@ -43,8 +43,8 @@ public ProcessingContext(ProcessingEnvironment env, PlatformAdapter readAdapter)
 
     this.docContext = new DocContext(env, openApiAvailable);
 
-    final var javax = isTypeAvailable(Constants.SINGLETON.replace("jakarta", "javax"));
-    final var jakarta = isTypeAvailable(Constants.SINGLETON);
+    final var javax = isTypeAvailable(Constants.SINGLETON_JAVAX);
+    final var jakarta = isTypeAvailable(Constants.SINGLETON_JAKARTA);
     final var override = Boolean.getBoolean(env.getOptions().get("useJavax"));
 
     if (override || (javax && jakarta)) {