diff --git a/src/dev/peerat/framework/Client.java b/src/dev/peerat/framework/Client.java index 6dd0484..26ece7e 100644 --- a/src/dev/peerat/framework/Client.java +++ b/src/dev/peerat/framework/Client.java @@ -30,7 +30,7 @@ public class Client extends Thread{ writer.close(); }catch(InvalidJwtException e){ this.router.getExceptionLogger().setValue(e); - }catch(Exception e){ + }catch(Throwable e){ this.router.getExceptionLogger().setValue(e); if(context != null && context.getResponseCode() == 0){ try{ diff --git a/src/dev/peerat/framework/DependencyInjector.java b/src/dev/peerat/framework/DependencyInjector.java index cf6abbc..fdb3595 100644 --- a/src/dev/peerat/framework/DependencyInjector.java +++ b/src/dev/peerat/framework/DependencyInjector.java @@ -43,7 +43,7 @@ public class DependencyInjector{ Object applyDependency(Constructor constructor, Parameter parameter, Map, Object> cache){ Injection annotation = parameter.getAnnotation(Injection.class); - if(annotation != null) return this.map.get(annotation.name()); + if(annotation != null) return this.map.get(annotation.value()); for(BiFunction, Parameter, Object> function : builders){ Object result = function.apply(constructor, parameter); if(result != null) return result; @@ -63,4 +63,4 @@ public class DependencyInjector{ } return result; } -} +} \ No newline at end of file diff --git a/src/dev/peerat/framework/Injection.java b/src/dev/peerat/framework/Injection.java index eb96257..e96ee2d 100644 --- a/src/dev/peerat/framework/Injection.java +++ b/src/dev/peerat/framework/Injection.java @@ -2,6 +2,6 @@ package dev.peerat.framework; public @interface Injection{ - String name(); + String value(); } diff --git a/src/dev/peerat/framework/Router.java b/src/dev/peerat/framework/Router.java index a9be239..882ca4d 100644 --- a/src/dev/peerat/framework/Router.java +++ b/src/dev/peerat/framework/Router.java @@ -4,20 +4,17 @@ import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Parameter; import java.net.ServerSocket; import java.net.Socket; import java.security.Key; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Consumer; import java.util.function.Function; -import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.net.ssl.SSLServerSocket; @@ -37,8 +34,12 @@ import org.jose4j.lang.JoseException; public class Router{ + public static void main(String[] args) { + + } + private Locker logger; - private Locker exceptions; + private Locker exceptions; private RouteMapper[] mappers; private List interceptors; private Response noFileFound; @@ -226,7 +227,7 @@ public class Router{ return this.logger; } - public Locker getExceptionLogger(){ + public Locker getExceptionLogger(){ return this.exceptions; }