#16 - Support Javalin version 3 and version 2

Author: rbygrave

src/main/java/io/dinject/javalin/generator/Constants.java

@@ -2,9 +2,11 @@
 
 class Constants {
 
-  static final String JAVALIN_CONTEXT = "io.javalin.Context";
+  static final String JAVALIN2_CONTEXT = "io.javalin.Context";
+  static final String JAVALIN3_CONTEXT = "io.javalin.http.Context";
 
-  static final String JAVALIN_ROLES = "io.javalin.security.SecurityUtil.roles";
+  static final String JAVALIN2_ROLES = "io.javalin.security.SecurityUtil.roles";
+  static final String JAVALIN3_ROLES = "io.javalin.core.security.SecurityUtil.roles";
 
   static final String OPENAPIDEFINITION = "io.swagger.v3.oas.annotations.OpenAPIDefinition";
 

src/main/java/io/dinject/javalin/generator/ControllerReader.java

@@ -19,7 +19,8 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import static io.dinject.javalin.generator.Constants.JAVALIN_ROLES;
+import static io.dinject.javalin.generator.Constants.JAVALIN2_ROLES;
+import static io.dinject.javalin.generator.Constants.JAVALIN3_ROLES;
 
 /**
  * Reads the type information for the Controller (bean).
@@ -147,7 +148,7 @@ boolean isDocHidden() {
 
   void read() {
     if (!roles.isEmpty()) {
-      addStaticImportType(JAVALIN_ROLES);
+      addStaticImportType(ctx.isJavalin3() ? JAVALIN3_ROLES : JAVALIN2_ROLES);
       for (String role : roles) {
         addStaticImportType(role);
       }

src/main/java/io/dinject/javalin/generator/ElementReader.java

@@ -13,6 +13,10 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
+import static io.dinject.javalin.generator.Constants.JAVALIN2_CONTEXT;
+import static io.dinject.javalin.generator.Constants.JAVALIN3_CONTEXT;
+import static io.dinject.javalin.generator.Util.typeDef;
+
 public class ElementReader {
 
   private final ProcessingContext ctx;
@@ -29,7 +33,7 @@ public class ElementReader {
   private String paramDefault;
 
   ElementReader(Element element, ProcessingContext ctx, ParamType defaultType, boolean formMarker) {
-    this(element, element.asType().toString(), ctx, defaultType, formMarker);
+    this(element, typeDef(element.asType()), ctx, defaultType, formMarker);
   }
 
   ElementReader(Element element, String rawType, ProcessingContext ctx, ParamType defaultType, boolean formMarker) {
@@ -114,7 +118,7 @@ private boolean hasParamDefault() {
   }
 
   private boolean isJavalinContext() {
-    return Constants.JAVALIN_CONTEXT.equals(rawType);
+    return JAVALIN3_CONTEXT.equals(rawType) || JAVALIN2_CONTEXT.equals(rawType);
   }
 
   private String shortType() {

src/main/java/io/dinject/javalin/generator/MethodReader.java

@@ -20,7 +20,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static io.dinject.javalin.generator.Constants.JAVALIN_ROLES;
+import static io.dinject.javalin.generator.Constants.JAVALIN2_ROLES;
+import static io.dinject.javalin.generator.Constants.JAVALIN3_ROLES;
+import static io.dinject.javalin.generator.Util.typeDef;
 
 public class MethodReader {
 
@@ -92,7 +94,7 @@ public <A extends Annotation> A findAnnotation(Class<A> type) {
 
   void read() {
     if (!methodRoles.isEmpty()) {
-      bean.addStaticImportType(JAVALIN_ROLES);
+      bean.addStaticImportType(ctx.isJavalin3() ? JAVALIN3_ROLES : JAVALIN2_ROLES);
       for (String role : methodRoles) {
         bean.addStaticImportType(role);
       }
@@ -109,9 +111,9 @@ void read() {
 
       String rawType;
       if (actualParams != null) {
-        rawType = actualParams.get(i).toString();
+        rawType = typeDef(actualParams.get(i));
       } else {
-        rawType = p.asType().toString();
+        rawType = typeDef(p.asType());
       }
 
       MethodParam param = new MethodParam(p, rawType, ctx, defaultParamType, formMarker);

src/main/java/io/dinject/javalin/generator/ProcessingContext.java

@@ -16,6 +16,7 @@
 import java.io.IOException;
 
 import static io.dinject.javalin.generator.Constants.GENERATED;
+import static io.dinject.javalin.generator.Constants.JAVALIN3_CONTEXT;
 import static io.dinject.javalin.generator.Constants.OPENAPIDEFINITION;
 
 public class ProcessingContext {
@@ -26,6 +27,7 @@ public class ProcessingContext {
   private final Types types;
   private final boolean generatedAvailable;
   private final boolean openApiAvailable;
+  private final boolean javalin3;
 
   private final DocContext docContext;
 
@@ -36,6 +38,7 @@ public class ProcessingContext {
     this.types = env.getTypeUtils();
     this.generatedAvailable = isTypeAvailable(GENERATED);
     this.openApiAvailable = isTypeAvailable(OPENAPIDEFINITION);
+    this.javalin3 = isTypeAvailable(JAVALIN3_CONTEXT);
     this.docContext = new DocContext(env, openApiAvailable);
   }
 
@@ -55,6 +58,10 @@ boolean isOpenApiAvailable() {
     return openApiAvailable;
   }
 
+  boolean isJavalin3() {
+    return javalin3;
+  }
+
   void logError(Element e, String msg, Object... args) {
     messager.printMessage(Diagnostic.Kind.ERROR, String.format(msg, args), e);
   }

src/main/java/io/dinject/javalin/generator/Util.java

@@ -4,10 +4,24 @@
 import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.Element;
 import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.TypeMirror;
 import java.util.ArrayList;
 import java.util.List;
 
-class Util {
+public class Util {
+
+  /**
+   * Return the type removing validation annotations etc.
+   */
+  public static String typeDef(TypeMirror typeMirror) {
+    if (typeMirror.getKind() == TypeKind.DECLARED) {
+      DeclaredType declaredType = (DeclaredType) typeMirror;
+      return declaredType.asElement().toString();
+    } else {
+      return typeMirror.toString();
+    }
+  }
 
   static String trimPath(String value) {
     return value.length() <= 1 ? value : trimTrailingSlash(value);

src/main/java/io/dinject/javalin/generator/openapi/DocContext.java

@@ -163,7 +163,7 @@ private ObjectMapper createObjectMapper() {
   }
 
   private Writer createMetaWriter() throws IOException {
-    FileObject writer = filer.createResource(StandardLocation.CLASS_OUTPUT, "META-INF", "openapi.json", null);
+    FileObject writer = filer.createResource(StandardLocation.CLASS_OUTPUT, "meta", "openapi.json", null);
     return writer.openWriter();
   }
 

src/main/java/io/dinject/javalin/generator/openapi/KnownTypes.java

@@ -39,7 +39,7 @@ interface KnownType {
   private final Map<String, KnownType> typeMap = new HashMap<>();
 
   KnownTypes() {
-    add(new StringType(), String.class);
+    add(new StringType(), String.class, char[].class, CharSequence.class);
     add(new BoolType(), boolean.class, Boolean.class);
     add(new IntegerType(), int.class, Integer.class);
     add(new LongType(), long.class, Long.class);

src/main/java/io/dinject/javalin/generator/openapi/SchemaDocBuilder.java

@@ -28,6 +28,8 @@
 import java.util.Set;
 import java.util.TreeMap;
 
+import static io.dinject.javalin.generator.Util.typeDef;
+
 /**
  * Help build OpenAPI Schema objects.
  */
@@ -119,7 +121,7 @@ private RequestBody requestBody(Operation operation) {
 
   Schema<?> toSchema(TypeMirror type) {
 
-    Schema<?> schema = knownTypes.createSchema(type.toString());
+    Schema<?> schema = knownTypes.createSchema(typeDef(type));
     if (schema != null) {
       return schema;
     }