Trie implementation for Route matching (#58)

Co-authored-by: Alex Danilenko <[email protected]>

Author: lazer-dev

build.gradle

@@ -13,12 +13,7 @@ subprojects {
     apply plugin: 'jacoco'
     apply plugin: 'org.unbroken-dome.test-sets'
 
-    ext {
-        jvmVersion = JavaVersion.VERSION_1_8
-    }
-
-    sourceCompatibility = jvmVersion
-    targetCompatibility = jvmVersion
+    java.toolchain.languageVersion = JavaLanguageVersion.of(8)
 
     compileJava.options.encoding = 'UTF-8'
 

core/src/main/java/spotty/common/exception/SpottyRouteDuplicationException.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2022 - Alex Danilenko
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package spotty.common.exception;
+
+public class SpottyRouteDuplicationException extends SpottyException {
+
+    public SpottyRouteDuplicationException(String message, Object... args) {
+        super(message, args);
+    }
+
+}

core/src/main/java/spotty/common/utils/Memoized.java

@@ -26,7 +26,7 @@ private Memoized() {
 
     public static <T> Supplier<T> lazy(Supplier<T> supplier) {
         return new Supplier<T>() {
-            private T memoized;
+            private volatile T memoized;
 
             @Override
             public T get() {
@@ -41,8 +41,8 @@ public T get() {
 
     public static IntSupplier lazy(IntSupplier supplier) {
         return new IntSupplier() {
-            private boolean isMemoized = false;
-            private int value;
+            private volatile boolean isMemoized = false;
+            private volatile int value;
 
             @Override
             public int getAsInt() {

core/src/main/java/spotty/common/utils/RouterUtils.java

@@ -45,7 +45,12 @@ public static Result compileMatcher(String pathTemplate) {
     }
 
     public static String normalizePath(String path) {
-        return path.replaceAll(REGEX, "*$2");
+        if (!path.startsWith("/")) {
+            path = "/" + path;
+        }
+
+        return path.replaceAll(REGEX, "*$2")
+            .replaceAll("\\*+", "*");
     }
 
     public static class Result {

core/src/main/java/spotty/server/files/detector/FileTypeDetector.java

@@ -18,14 +18,17 @@
 import org.apache.tika.Tika;
 
 import java.net.URL;
+import java.util.function.Supplier;
+
+import static spotty.common.utils.Memoized.lazy;
 
 public final class FileTypeDetector implements TypeDetector {
 
-    private final Tika tika = new Tika();
+    private static final Supplier<Tika> tika = lazy(() -> new Tika());
 
     @Override
     public String detect(URL path) throws Exception {
-        return tika.detect(path);
+        return tika.get().detect(path);
     }
 
 }