Monte crystal/master

src/main/java/spark/route/RouteEntry.java

@@ -56,6 +56,7 @@ boolean matches(HttpMethod httpMethod, String path) {
         return match;
     }
 
+    //CS304 Issue link: https://github.com/perwendel/spark/issues/1151
     private boolean matchPath(String path) { // NOSONAR
         if (!this.path.endsWith("*") && ((path.endsWith("/") && !this.path.endsWith("/")) // NOSONAR
                 || (this.path.endsWith("/") && !path.endsWith("/")))) {
@@ -122,6 +123,19 @@ private boolean matchPath(String path) { // NOSONAR
                 }
                 // End check wild card
             }
+            if (thisPathSize > pathSize) {
+                for (int i = pathSize - 1; i > -1; i--) {
+                    if(!thisPathList.get(i).equals(pathList.get(i))){
+                        return false;
+                    }
+                }
+                for (int i = pathSize; i < thisPathSize; i++) {
+                    if (!thisPathList.get(i).endsWith("?")) {
+                        return false;
+                    }
+                }
+                return true;
+            }
             return false;
         }
     }

src/test/java/spark/route/RouteEntryTest.java

@@ -116,4 +116,26 @@ public void testMatches_longRoutePathWildcard() {
                    entry.matches(HttpMethod.get, "/test/this/resource/child/id"));
     }
 
-}
+    //CS304 (manually written) Issue link: https://github.com/perwendel/spark/issues/1151
+    @Test
+    public void testMatches_WithoutOptionalParameters() {
+        RouteEntry entry = new RouteEntry();
+        entry.httpMethod = HttpMethod.get;
+        entry.path = "/test/:name?";
+
+        assertTrue("Should return true because the :name? section in path is optional",
+            entry.matches(HttpMethod.get, "/test"));
+    }
+    //CS304 (manually written) Issue link: https://github.com/perwendel/spark/issues/1151
+    @Test
+    public void testMatches_WithOptionalParameters() {
+        RouteEntry entry = new RouteEntry();
+        entry.httpMethod = HttpMethod.get;
+        entry.path = "/test/:name?";
+
+        assertTrue("Should return true because the :name? section in path is optional," +
+                "the statement can match /test/*",
+            entry.matches(HttpMethod.get, "/test/foo"));
+    }
+
+}