Merge pull request #23 from ChillyCheesy/feat/controller

Feat/controller

Author: AymericHenouille

gradle.properties

@@ -1,2 +1,2 @@
 modulo_modulename=ModuloServer
-modulo_version=BINKS-0.3.1
+modulo_version=BINKS-0.4.0

modulo-api/src/main/java/com/chillycheesy/modulo/ModuloAPI.java

@@ -3,8 +3,6 @@
 import com.chillycheesy.modulo.controllers.ControllerContainer;
 import com.chillycheesy.modulo.events.EventContainer;
 import com.chillycheesy.modulo.modules.ModuleContainer;
-import com.chillycheesy.modulo.pages.PageContainer;
-import com.chillycheesy.modulo.signals.SignalContainer;
 import com.chillycheesy.modulo.utils.Logger;
 
 /**
@@ -23,14 +21,6 @@ public class ModuloAPI {
      * Event section.
      */
     private static EventContainer event;
-    /**
-     * Signal section.
-     */
-    private static SignalContainer signal;
-    /**
-     * Page manager.
-     */
-    private static PageContainer page;
     /**
      * Controller container.
      */
@@ -58,24 +48,6 @@ public static EventContainer getEvent() {
         return event = event == null ? new EventContainer() : event;
     }
 
-    /**
-     * Getter for Signal logic section.
-     *
-     * @return The Signal section.
-     */
-    public static SignalContainer getSignal() {
-        return signal = signal == null ? new SignalContainer() : signal;
-    }
-
-    /**
-     * Getter for Signal logic section.
-     *
-     * @return The Signal section.
-     */
-    public static PageContainer getPage() {
-        return page = page == null ? new PageContainer() : page;
-    }
-
     /**
      * Getter for Logger logic section.
      *

modulo-api/src/main/java/com/chillycheesy/modulo/controllers/HttpPathVariableController.java

@@ -99,17 +99,22 @@ private boolean match(List<String> requestPathList, List<String> pathVariableSpl
             final String requestPath = requestPathIterator.next();
             final String pathVariable = pathVariableIterator.next();
             if (argMatch(requestPath, pathVariable, configuration)) {
-                if (pathVariable.equals("**")) {
-                    final StringBuilder additionalPath = new StringBuilder(requestPath);
-                    requestPathIterator.forEachRemaining(value -> additionalPath.append("/").append(value));
-                    configuration.set("additional-path", additionalPath.toString());
+                if (isAdditionalPath(requestPathIterator, requestPath, pathVariable, configuration))
                     return true;
-                }
-            } else {
-                return false;
-            }
+            } else return false;
         }
-        return true;
+        if (!requestPathIterator.hasNext() && !pathVariableIterator.hasNext()) return true;
+        else return pathVariableIterator.hasNext() && isAdditionalPath(requestPathIterator, "", pathVariableIterator.next(), configuration);
+    }
+
+    private boolean isAdditionalPath(Iterator<String> requestPathIterator, String base, String pathVariable, Configuration configuration) {
+        if (pathVariable.equals("**")) {
+            final StringBuilder additionalPath = new StringBuilder(base);
+            requestPathIterator.forEachRemaining(value -> additionalPath.append("/").append(value));
+            configuration.set("additional-path", additionalPath.toString());
+            return true;
+        }
+        return false;
     }
 
     /**

modulo-api/src/main/java/com/chillycheesy/modulo/controllers/MethodController.java

@@ -1,10 +1,10 @@
 package com.chillycheesy.modulo.controllers;
 
 import com.chillycheesy.modulo.config.Configuration;
-import com.chillycheesy.modulo.controllers.annotations.HttpParamMethodControllerParameterAnnotationApplier;
-import com.chillycheesy.modulo.controllers.annotations.MethodControllerParameterAnnotationApplier;
-import com.chillycheesy.modulo.controllers.annotations.PathVariableMethodControllerParameterAnnotationApplier;
-import com.chillycheesy.modulo.controllers.annotations.RequestBodyMethodControllerParameterAnnotationApplier;
+import com.chillycheesy.modulo.controllers.methodcontroller.HttpParamMethodControllerParameterAnnotationApplier;
+import com.chillycheesy.modulo.controllers.methodcontroller.MethodControllerParameterAnnotationApplier;
+import com.chillycheesy.modulo.controllers.methodcontroller.PathVariableMethodControllerParameterAnnotationApplier;
+import com.chillycheesy.modulo.controllers.methodcontroller.RequestBodyMethodControllerParameterAnnotationApplier;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

modulo-api/src/main/java/com/chillycheesy/modulo/controllers/annotations/HttpParam.java renamed to modulo-api/src/main/java/com/chillycheesy/modulo/controllers/methodcontroller/HttpParam.java

@@ -1,4 +1,4 @@
-package com.chillycheesy.modulo.controllers.annotations;
+package com.chillycheesy.modulo.controllers.methodcontroller;
 
 import java.lang.annotation.*;
 

modulo-api/src/main/java/com/chillycheesy/modulo/controllers/annotations/HttpParamMethodControllerParameterAnnotationApplier.java renamed to modulo-api/src/main/java/com/chillycheesy/modulo/controllers/methodcontroller/HttpParamMethodControllerParameterAnnotationApplier.java

@@ -1,4 +1,4 @@
-package com.chillycheesy.modulo.controllers.annotations;
+package com.chillycheesy.modulo.controllers.methodcontroller;
 
 import com.chillycheesy.modulo.config.Configuration;
 

modulo-api/src/main/java/com/chillycheesy/modulo/controllers/annotations/MethodControllerParameterAnnotationApplier.java renamed to modulo-api/src/main/java/com/chillycheesy/modulo/controllers/methodcontroller/MethodControllerParameterAnnotationApplier.java

@@ -1,4 +1,4 @@
-package com.chillycheesy.modulo.controllers.annotations;
+package com.chillycheesy.modulo.controllers.methodcontroller;
 
 import com.chillycheesy.modulo.config.Configuration;
 

modulo-api/src/main/java/com/chillycheesy/modulo/controllers/annotations/PathVariable.java renamed to modulo-api/src/main/java/com/chillycheesy/modulo/controllers/methodcontroller/PathVariable.java

@@ -1,4 +1,4 @@
-package com.chillycheesy.modulo.controllers.annotations;
+package com.chillycheesy.modulo.controllers.methodcontroller;
 
 import java.lang.annotation.*;
 

modulo-api/src/main/java/com/chillycheesy/modulo/controllers/annotations/PathVariableMethodControllerParameterAnnotationApplier.java renamed to modulo-api/src/main/java/com/chillycheesy/modulo/controllers/methodcontroller/PathVariableMethodControllerParameterAnnotationApplier.java

@@ -1,4 +1,4 @@
-package com.chillycheesy.modulo.controllers.annotations;
+package com.chillycheesy.modulo.controllers.methodcontroller;
 
 
 import com.chillycheesy.modulo.config.Configuration;

modulo-api/src/main/java/com/chillycheesy/modulo/controllers/annotations/RequestBody.java renamed to modulo-api/src/main/java/com/chillycheesy/modulo/controllers/methodcontroller/RequestBody.java

@@ -1,4 +1,4 @@
-package com.chillycheesy.modulo.controllers.annotations;
+package com.chillycheesy.modulo.controllers.methodcontroller;
 
 import java.lang.annotation.*;