support jakarta.ws.rs.DefaultValue handling

Author: kliushnichenko

modules/jooby-apt/src/main/java/io/jooby/internal/apt/MvcParameter.java

@@ -98,13 +98,13 @@ yield hasAnnotation(NULLABLE)
         if (strategy.isEmpty()) {
           // must be body
           yield ParameterGenerator.BodyParam.toSourceCode(
-              kt, route, null, type, parameterName, isNullable(kt));
+              kt, route, null, type, parameter, parameterName, isNullable(kt));
         } else {
           var paramGenerator = strategy.get().getKey();
           paramGenerator.verifyType(parameterType, parameterName, route);
 
           yield paramGenerator.toSourceCode(
-              kt, route, strategy.get().getValue(), type, parameterName, isNullable(kt));
+              kt, route, strategy.get().getValue(), type, parameter, parameterName, isNullable(kt));
         }
       }
     };

modules/jooby-apt/src/main/java/io/jooby/internal/apt/ParameterGenerator.java

@@ -5,15 +5,14 @@
  */
 package io.jooby.internal.apt;
 
-import static io.jooby.internal.apt.AnnotationSupport.findAnnotationValue;
-import static io.jooby.internal.apt.Types.BUILT_IN;
-import static java.util.stream.Collectors.joining;
-
+import javax.lang.model.element.*;
 import java.util.*;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import javax.lang.model.element.*;
+import static io.jooby.internal.apt.AnnotationSupport.findAnnotationValue;
+import static io.jooby.internal.apt.Types.BUILT_IN;
+import static java.util.stream.Collectors.joining;
 
 public enum ParameterGenerator {
   ContextParam("getAttribute", "io.jooby.annotation.ContextParam", "jakarta.ws.rs.core.Context") {
@@ -23,6 +22,7 @@ public String toSourceCode(
         MvcRoute route,
         AnnotationMirror annotation,
         TypeDefinition type,
+        VariableElement parameter,
         String name,
         boolean nullable) {
       if (type.is(Map.class)) {
@@ -70,6 +70,7 @@ public String toSourceCode(
         MvcRoute route,
         AnnotationMirror annotation,
         TypeDefinition type,
+        VariableElement parameter,
         String name,
         boolean nullable) {
       var rawType = type.getRawType().toString();
@@ -107,6 +108,7 @@ public String toSourceCode(
         MvcRoute route,
         AnnotationMirror annotation,
         TypeDefinition type,
+        VariableElement parameter,
         String name,
         boolean nullable) {
       List<Element> converters = new ArrayList<>();
@@ -200,10 +202,11 @@ public String toSourceCode(
       MvcRoute route,
       AnnotationMirror annotation,
       TypeDefinition type,
+      VariableElement parameter,
       String name,
       boolean nullable) {
     var paramSource = source(annotation);
-    var builtin = builtinType(kt, annotation, type, name, nullable);
+    var builtin = builtinType(kt, annotation, type, parameter, name, nullable);
     if (builtin == null) {
       // List, Set,
       var toValue =
@@ -323,10 +326,15 @@ public String toSourceCode(
   }
 
   protected String builtinType(
-      boolean kt, AnnotationMirror annotation, TypeDefinition type, String name, boolean nullable) {
+      boolean kt,
+      AnnotationMirror annotation,
+      TypeDefinition type,
+      VariableElement parameter,
+      String name,
+      boolean nullable) {
     if (BUILT_IN.stream().anyMatch(type::is)) {
       var paramSource = source(annotation);
-      var defaultValue = defaultValue(annotation);
+      var defaultValue = defaultValue(parameter, annotation);
       // look at named parameter
       if (type.isPrimitive()) {
         // like: .intValue
@@ -425,10 +433,19 @@ protected String source(AnnotationMirror annotation) {
     return "";
   }
 
-  protected String defaultValue(AnnotationMirror annotation) {
-    if (annotation.getAnnotationType().toString().startsWith("io.jooby.annotation")) {
+  protected String defaultValue(VariableElement parameter, AnnotationMirror annotation) {
+    var annotationType = annotation.getAnnotationType().toString();
+
+    if (annotationType.startsWith("io.jooby.annotation")) {
       var sources = findAnnotationValue(annotation, AnnotationSupport.VALUE);
       return sources.isEmpty() ? "" : CodeBlock.of(", ", CodeBlock.string(sources.getFirst()));
+    } else if (annotationType.startsWith("jakarta.ws.rs")) {
+      var defaultValueAnnotation = AnnotationSupport.findAnnotationByName(
+          parameter, "jakarta.ws.rs.DefaultValue");
+      if (defaultValueAnnotation != null) {
+        var defaultValue = findAnnotationValue(defaultValueAnnotation, AnnotationSupport.VALUE);
+        return defaultValue.isEmpty() ? "" : CodeBlock.of(", ", CodeBlock.string(defaultValue.getFirst()));
+      }
     }
     return "";
   }

modules/jooby-apt/src/test/java/tests/i3761/C3761Jakarta.java

@@ -0,0 +1,35 @@
+/*
+ * Jooby https://jooby.io
+ * Apache License Version 2.0 https://jooby.io/LICENSE.txt
+ * Copyright 2014 Edgar Espina
+ */
+package tests.i3761;
+
+import io.jooby.annotation.GET;
+import io.jooby.annotation.Path;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.QueryParam;
+
+@Path("/3761")
+public class C3761Jakarta {
+
+  @GET("/number")
+  public int number(@QueryParam("num") @DefaultValue("5") int num) {
+    return num;
+  }
+
+  @GET("/unset")
+  public String unset(@QueryParam("unset") String unset) {
+    return unset;
+  }
+
+  @GET("/emptySet")
+  public String emptySet(@QueryParam("emptySet") @DefaultValue("") String emptySet) {
+    return emptySet;
+  }
+
+  @GET("/stringVal")
+  public String string(@QueryParam("stringVal") @DefaultValue("Hello") String stringVal) {
+    return stringVal;
+  }
+}

modules/jooby-apt/src/test/java/tests/i3761/Issue3761.java

@@ -5,24 +5,30 @@
  */
 package tests.i3761;
 
-import static org.junit.jupiter.api.Assertions.*;
-
+import io.jooby.apt.ProcessorRunner;
 import org.junit.jupiter.api.Test;
 
-import io.jooby.apt.ProcessorRunner;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class Issue3761 {
   @Test
   public void shouldGenerateDefaultValues() throws Exception {
     new ProcessorRunner(new C3761())
-        .withSourceCode(
-            (source) -> {
-              assertTrue(source.contains("return c.number(ctx.query(\"num\", \"5\").intValue());"));
-              assertTrue(source.contains("return c.unset(ctx.query(\"unset\").valueOrNull());"));
-              assertTrue(
-                  source.contains("return c.emptySet(ctx.query(\"emptySet\", \"\").value());"));
-              assertTrue(
-                  source.contains("return c.string(ctx.query(\"stringVal\", \"Hello\").value());"));
-            });
+        .withSourceCode(Issue3761::assertSourceCodeRespectDefaultValues);
+  }
+
+  @Test
+  public void shouldGenerateJakartaDefaultValues() throws Exception {
+    new ProcessorRunner(new C3761Jakarta())
+        .withSourceCode(Issue3761::assertSourceCodeRespectDefaultValues);
+  }
+
+  private static void assertSourceCodeRespectDefaultValues(String source) {
+    assertTrue(source.contains("return c.number(ctx.query(\"num\", \"5\").intValue());"));
+    assertTrue(source.contains("return c.unset(ctx.query(\"unset\").valueOrNull());"));
+    assertTrue(
+        source.contains("return c.emptySet(ctx.query(\"emptySet\", \"\").value());"));
+    assertTrue(
+        source.contains("return c.string(ctx.query(\"stringVal\", \"Hello\").value());"));
   }
 }