Merge pull request #123 from SentryMan/master

Now can define path in @controller

Author: rbygrave

README.md

@@ -75,11 +75,9 @@ package org.example.hello;
 
 import io.avaje.http.api.Controller;
 import io.avaje.http.api.Get;
-import io.avaje.http.api.Path;
 import java.util.List;
 
-@Path("/widgets")
-@Controller
+@Controller("/widgets")
 public class WidgetController {
   private final HelloComponent hello;
   public WidgetController(HelloComponent hello) {

http-api/src/main/java/io/avaje/http/api/Controller.java

@@ -1,25 +1,26 @@
 package io.avaje.http.api;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 /**
  * Marker annotation for controllers.
  *
  * <pre>{@code
- *
- *  @Controller
- *  @Path("/customers")
- *  class CustomerController {
- *    ...
- *  }
+ * @Controller("/customers")
+ * class CustomerController {
+ *   ...
+ * }
  *
  * }</pre>
  */
-@Target(value=TYPE)
-@Retention(value=RUNTIME)
+@Target(TYPE)
+@Retention(RUNTIME)
 public @interface Controller {
+
+  /** Specify the path mapping request to the controller. */
+  String value() default "";
 }

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

@@ -1,8 +1,13 @@
 package io.avaje.http.generator.core;
 
-import io.avaje.http.api.Path;
-import io.avaje.http.api.Produces;
-import io.swagger.v3.oas.annotations.Hidden;
+import static java.util.function.Predicate.not;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.TreeSet;
 
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
@@ -14,11 +19,11 @@
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.ElementFilter;
 import javax.validation.Valid;
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
+
+import io.avaje.http.api.Controller;
+import io.avaje.http.api.Path;
+import io.avaje.http.api.Produces;
+import io.swagger.v3.oas.annotations.Hidden;
 
 /**
  * Reads the type information for the Controller (bean).
@@ -79,7 +84,9 @@ private List<Element> initInterfaces() {
     List<Element> interfaces = new ArrayList<>();
     for (TypeMirror anInterface : beanType.getInterfaces()) {
       final Element ifaceElement = ctx.asElement(anInterface);
-      if (ifaceElement.getAnnotation(Path.class) != null) {
+      var controller = ifaceElement.getAnnotation(Controller.class);
+      if (controller != null && !controller.value().isBlank()
+          || ifaceElement.getAnnotation(Path.class) != null) {
         interfaces.add(ifaceElement);
       }
     }
@@ -250,11 +257,13 @@ public List<MethodReader> methods() {
   }
 
   public String path() {
-    Path path = findAnnotation(Path.class);
-    if (path == null) {
-      return null;
-    }
-    return Util.trimPath(path.value());
+
+    return Optional.ofNullable(findAnnotation(Controller.class))
+        .map(Controller::value)
+        .filter(not(String::isBlank))
+        .or(() -> Optional.ofNullable(findAnnotation(Path.class)).map(Path::value))
+        .map(Util::trimPath)
+        .orElse(null);
   }
 
   public void addImportType(String rawType) {

tests/test-helidon/src/main/java/org/example/FooController.java

@@ -18,8 +18,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-@Controller
-@Path("/foo")
+@Controller("/foo")
 public class FooController {
 
   //@Produces("text/plain")