@@ -56,30 +56,13 @@ public void bind(String globalPrefix, Object controller) {
|
56 | 56 | for (String command : commands) { |
57 | 57 | SimpleCommandDeclaration commandDecl = prefixDecl.clone(); |
58 | 58 | commandDecl.parse(command, false); |
59 | | -CommandRoute route = commandDecl.create(cli.getResolvers()); |
60 | | -route.handler(handler); |
61 | | -bindMiddlewares(route, middlewares); |
| 59 | +cli.route(commandDecl, handler, middlewares.toArray(new String[0])); |
62 | 60 | } |
63 | 61 | } |
64 | 62 | } |
65 | 63 | } |
66 | 64 | } |
67 | 65 | |
68 | | -private void bindMiddlewares(CommandRoute route, List<String> middlewares) { |
69 | | -for (String name : middlewares) { |
70 | | -CommandHandler before = cli.getBeforeMiddleware(name); |
71 | | -CommandHandler after = cli.getAfterMiddleware(name); |
72 | | -if (before == null && after == null) { |
73 | | -// TODO: cli.getLogger().warning("Middleware \"" + name + "\" not found!"); |
74 | | -continue; |
75 | | - } |
76 | | -if (before != null) |
77 | | -route.getBeforeMiddlewares().add(before); |
78 | | -if (after != null) |
79 | | -route.getAfterMiddlewares().add(after); |
80 | | - } |
81 | | - } |
82 | | - |
83 | 66 | private static <T extends Annotation> List<T> getAnnotations(Class<T> type, Method method) { |
84 | 67 | return Arrays.asList(method.getDeclaredAnnotationsByType(type)); |
85 | 68 | } |
|