Moved Annotation to Route building logic to the annotation.

Annotation/Route.hh

@@ -11,6 +11,8 @@ use Titon\Annotation\Annotation;
 use Titon\Route\Mixin\FilterMixin;
 use Titon\Route\Mixin\MethodMixin;
 use Titon\Route\Mixin\PatternMixin;
+use Titon\Route\Route as BaseRoute;
+use Titon\Route\Router;
 use Titon\Utility\Col;
 
 /**
@@ -43,9 +45,9 @@ class Route extends Annotation {
      *
      * @param string $key
      * @param string $path
-     * @param mixed  $methods
-     * @param mixed  $filters
-     * @param mixed  $patterns
+     * @param mixed $methods
+     * @param mixed $filters
+     * @param mixed $patterns
      */
     public function __construct(string $key, string $path, mixed $methods = [], mixed $filters = [], array<string, string> $patterns = []) {
         $this->key = $key;
@@ -73,4 +75,20 @@ class Route extends Annotation {
         return $this->path;
     }
 
+    /**
+     * Convert the annotation to a `Route` object.
+     *
+     * @param string $class
+     * @param string $action
+     * @return \Titon\Route\Route
+     */
+    public function toRoute(string $class, string $action = 'index'): BaseRoute {
+        $route = new BaseRoute($this->getPath(), Router::buildAction(shape('class' => $class, 'action' => $action)));
+        $route->setMethods($this->getMethods());
+        $route->setFilters($this->getFilters());
+        $route->setPatterns($this->getPatterns());
+
+        return $route;
+    }
+
 }

Router.hh

@@ -633,37 +633,20 @@ class Router implements Subject {
         // Map resource routes if the annotation is on the class
         foreach ($reader->getClassAnnotations() as $annotation) {
             if ($annotation instanceof RouteAnnotation) {
-                $this->resource($annotation->getKey(), $this->buildAnnotationRoute($annotation, $class));
+                $this->resource($annotation->getKey(), $annotation->toRoute($class));
             }
         }
 
         // Map regular routes if the annotation is on a method
         foreach ($reader->getAnnotatedMethods() as $method => $annotations) {
             foreach ($annotations as $annotation) {
                 if ($annotation instanceof RouteAnnotation) {
-                    $this->map($annotation->getKey(), $this->buildAnnotationRoute($annotation, $class, $method));
+                    $this->map($annotation->getKey(), $annotation->toRoute($class, $method));
                 }
             }
         }
 
         return $this;
     }
 
-    /**
-     * Build a route object from an annotation.
-     *
-     * @param \Titon\Route\Annotation\Route $annotation
-     * @param string $class
-     * @param string $method
-     * @return \Titon\Route\Route
-     */
-    protected function buildAnnotationRoute(RouteAnnotation $annotation, string $class, string $method = 'index'): Route {
-        $route = new Route($annotation->getPath(), static::buildAction(shape('class' => $class, 'action' => $method)));
-        $route->setMethods($annotation->getMethods());
-        $route->setFilters($annotation->getFilters());
-        $route->setPatterns($annotation->getPatterns());
-
-        return $route;
-    }
-
 }