Add detection of request scope for Helidon Nima and Helidon Reactive

Author: rbygrave

inject-generator/src/main/java/io/avaje/inject/generator/RequestScope.java

@@ -13,13 +13,25 @@ class RequestScope {
   private static final String JAVALIN_CONTEXT = "io.javalin.http.Context";
   private static final String HELIDON_REQ = "io.helidon.webserver.ServerRequest";
   private static final String HELIDON_RES = "io.helidon.webserver.ServerResponse";
-  private static final Map<String, Handler> TYPES = new HashMap<>();
 
+  private static final String NIMA_REQ = "io.helidon.nima.webserver.http.ServerRequest";
+  private static final String NIMA_RES = "io.helidon.nima.webserver.http.ServerResponse";
+  private static final String HELIDON_REACTIVE_REQ = "io.helidon.reactive.webserver.ServerRequest";
+  private static final String HELIDON_REACTIVE_RES = "io.helidon.reactive.webserver.ServerResponse";
+
+  private static final Map<String, Handler> TYPES = new HashMap<>();
   static {
-    TYPES.put(JEX_CONTEXT, new Jex());
-    TYPES.put(JAVALIN_CONTEXT, new Javalin());
-    TYPES.put(HELIDON_REQ, new Helidon());
-    TYPES.put(HELIDON_RES, new Helidon());
+    TYPES.put(JEX_CONTEXT, new JexHandler());
+    TYPES.put(JAVALIN_CONTEXT, new JavalinHandler());
+    final var helidon = new Helidon();
+    TYPES.put(HELIDON_REQ, helidon);
+    TYPES.put(HELIDON_RES, helidon);
+    final var helidonReactive = new HelidonReactive();
+    TYPES.put(HELIDON_REACTIVE_REQ, helidonReactive);
+    TYPES.put(HELIDON_REACTIVE_RES, helidonReactive);
+    final var helidonNima = new HelidonNima();
+    TYPES.put(NIMA_REQ, helidonNima);
+    TYPES.put(NIMA_RES, helidonNima);
   }
 
   /**
@@ -62,37 +74,48 @@ interface Handler {
     String argumentName(String paramType);
   }
 
-  /**
-   * Jex support for request scoping/BeanFactory.
-   */
-  private static class Jex implements Handler {
 
-    @Override
-    public void factoryInterface(Append writer, String parentType) {
-      writer.append("BeanFactory<%s, %s>", parentType, "Context");
+  private static final class JexHandler extends ContextHandler {
+    private JexHandler() {
+      super(JEX_CONTEXT);
     }
+  }
 
-    @Override
-    public void addImports(Set<String> importTypes) {
-      importTypes.add(Constants.BEAN_FACTORY);
-      importTypes.add(JEX_CONTEXT);
+  private static final class JavalinHandler extends ContextHandler {
+    private JavalinHandler() {
+      super(JAVALIN_CONTEXT);
     }
+  }
 
-    @Override
-    public void writeCreateMethod(Append writer, String parentType) {
-      writer.append("  public %s create(Context context) {", parentType).eol();
+  private static final class Helidon extends RequestResponseHandler {
+    Helidon() {
+      super(HELIDON_REQ, HELIDON_RES);
     }
+  }
 
-    @Override
-    public String argumentName(String paramType) {
-      return "context";
+  private static final class HelidonReactive extends RequestResponseHandler {
+    HelidonReactive() {
+      super(HELIDON_REACTIVE_REQ, HELIDON_REACTIVE_RES);
+    }
+  }
+
+  private static final class HelidonNima extends RequestResponseHandler {
+    HelidonNima() {
+      super(NIMA_REQ, NIMA_RES);
     }
   }
 
+
   /**
-   * Javalin support for request scoping/BeanFactory.
+   * Single Context based handlers.
    */
-  private static class Javalin implements Handler {
+  private static abstract class ContextHandler implements Handler {
+
+    final String contextType;
+
+    private ContextHandler(String contextType) {
+      this.contextType = contextType;
+    }
 
     @Override
     public void factoryInterface(Append writer, String parentType) {
@@ -102,7 +125,7 @@ public void factoryInterface(Append writer, String parentType) {
     @Override
     public void addImports(Set<String> importTypes) {
       importTypes.add(Constants.BEAN_FACTORY);
-      importTypes.add(JAVALIN_CONTEXT);
+      importTypes.add(contextType);
     }
 
     @Override
@@ -117,9 +140,17 @@ public String argumentName(String paramType) {
   }
 
   /**
-   * Helidon support for request scoping/BeanFactory.
+   * ServerRequest ServerResponse based Handlers.
    */
-  private static class Helidon implements Handler {
+  private static abstract class RequestResponseHandler implements Handler {
+
+    final String reqType;
+    final String resType;
+
+    RequestResponseHandler(String reqType, String resType) {
+      this.reqType = reqType;
+      this.resType = resType;
+    }
 
     @Override
     public void factoryInterface(Append writer, String parentType) {
@@ -129,8 +160,8 @@ public void factoryInterface(Append writer, String parentType) {
     @Override
     public void addImports(Set<String> importTypes) {
       importTypes.add(Constants.BEAN_FACTORY2);
-      importTypes.add(HELIDON_REQ);
-      importTypes.add(HELIDON_RES);
+      importTypes.add(reqType);
+      importTypes.add(resType);
     }
 
     @Override
@@ -140,7 +171,7 @@ public void writeCreateMethod(Append writer, String parentType) {
 
     @Override
     public String argumentName(String paramType) {
-      if (paramType.equals(HELIDON_RES)) {
+      if (paramType.equals(resType)) {
         return "response";
       } else {
         return "request";