RouteBinder -> When declaring a Route, developper can now auto-bind other types than [Matcher, Context, HttpReader, HttpWriter]. Currently, the value will be bind with an interceptor.

src/dev/peerat/framework/HttpReader.java

@@ -1,12 +1,9 @@
 package dev.peerat.framework;
 
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.Socket;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

src/dev/peerat/framework/RouteInterceptor.java

@@ -5,6 +5,6 @@ import java.util.regex.Matcher;
 
 public interface RouteInterceptor{
 	
-	boolean intercept(Matcher matcher, Context context, HttpReader reader, HttpWriter writer, Method method);
+	boolean intercept(Matcher matcher, Context context, HttpReader reader, HttpWriter writer, Method method, Object[] params);
 
 }

src/dev/peerat/framework/RouteMapper.java

@@ -27,6 +27,16 @@ public class RouteMapper<U extends User>{
 		if(this.calls != null) this.calls = new int[length];
 	}
 	
+	public void bind(RouteFilter filter, Class<?>... types){
+		for(RouteState state : this.states){
+			if(filter.accept(state.getMethod(), state.getRoute(), state.getPattern())) state.getBinder().bind(types);
+		}
+	}
+	
+	public void bindAll(){
+		for(RouteState state : this.states) state.getBinder().bindIndexes(state.getMethod());
+	}
+	
 	public void activeReOrdering(){
 		this.calls = new int[states.length];
 		this.dif = 2;
@@ -63,10 +73,12 @@ public class RouteMapper<U extends User>{
 			}
 		}
 		if(target != null){
+			Object[] params = new Object[target.getBinder().getParameterCount()];
 			for(RouteInterceptor interceptor : interceptors){
-				if(!interceptor.intercept(matcher, context, reader, writer, target.getMethod())) return true;
+				if(!interceptor.intercept(matcher, context, reader, writer, target.getMethod(), params)) return true;
 			}
-			target.getMethod().invoke(target.getInstance(), target.bindMethod(matcher, context, reader, writer));
+			Object[] inv = target.getBinder().bindMethod(target.getMethod(), matcher, context, reader, writer, params);
+			target.getMethod().invoke(target.getInstance(), inv);
 			return true;
 		}
 		return false;

src/dev/peerat/framework/RouteState.java

@@ -10,20 +10,18 @@ public class RouteState {
 	private Method method;
 	private Route route;
 	private Pattern pattern;
-	private int[] bindMethod;
+	private RouteBinder binder;
 	
 	public RouteState(Object instance, Method method, Route route){
 		this.instance = instance;
 		this.method = method;
 		this.route = route;
 		this.pattern = Pattern.compile(route.path());
+		this.binder = new RouteBinder();
+	}
 	
-		Class<?>[] parameters = method.getParameterTypes();
+	public void bindIndexes(){
-		this.bindMethod = new int[4];
+		this.binder.bindIndexes(this.method);
-		this.bindMethod[0] = findIndex(parameters, Matcher.class);
-		this.bindMethod[1] = findIndex(parameters, Context.class);
-		this.bindMethod[2] = findIndex(parameters, HttpReader.class);
-		this.bindMethod[3] = findIndex(parameters, HttpWriter.class);
 	}
 	
 	public Matcher match(String path){
@@ -31,12 +29,16 @@ public class RouteState {
 		return matcher.matches() ? matcher : null;
 	}
 	
+	public Route getRoute(){
+		return this.route;
+	}
+	
 	public boolean isWebSocket(){
-		return route.websocket();
+		return this.route.websocket();
 	}
 	
 	public boolean needLogin(){
-		return route.needLogin();
+		return this.route.needLogin();
 	}
 	
 	public Method getMethod(){
@@ -47,26 +49,12 @@ public class RouteState {
 		return this.instance;
 	}
 	
-	public Object[] bindMethod(Matcher matcher, Context context, HttpReader reader, HttpWriter writer){
+	public Pattern getPattern(){
-		Object[] result = new Object[method.getParameterCount()];
+		return this.pattern;
-		setElement(result, bindMethod[0], matcher);
-		setElement(result, bindMethod[1], context);
-		setElement(result, bindMethod[2], reader);
-		setElement(result, bindMethod[3], writer);
-		return result;
 	}
 	
-	private void setElement(Object[] array, int position, Object element){
+	public RouteBinder getBinder(){
-		if(position < 0) return;
+		return this.binder;
-		array[position] = element; 
-	}
-	
-	private int findIndex(Class<?>[] array, Class<?> type){
-		for(int i = 0; i < array.length; i++){
-			Class<?> clazz = array[i];
-			if(type.isAssignableFrom(clazz)) return i;
-		}
-		return -1;
 	}
 	
 }

src/dev/peerat/framework/Router.java

@@ -1,11 +1,6 @@
 package dev.peerat.framework;
 
-import static dev.peerat.framework.RequestType.OPTIONS;
-import static dev.peerat.framework.RequestType.POST;
-
 import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.lang.reflect.Constructor;
@@ -14,7 +9,6 @@ import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.regex.Matcher;
 
 import javax.net.ssl.SSLServerSocket;
 import javax.net.ssl.SSLServerSocketFactory;
@@ -141,6 +135,15 @@ public class Router<U extends User>{
 		return this;
 	}
 	
+	public Router<U> bind(RouteFilter filter, Class<?>... types){
+		for(RouteMapper<U> mapper : this.mappers) mapper.bind(filter, types);
+		return this;
+	}
+	
+	private void bindAll(){
+		for(RouteMapper<U> mapper : this.mappers) mapper.bindAll();
+	}
+	
 	public Router<U> activeReOrdering(){
 		for(RouteMapper<?> mapper : this.mappers) mapper.activeReOrdering();
 		return this;
@@ -186,6 +189,7 @@ public class Router<U extends User>{
 	}
 	
 	public void listen(int port, boolean ssl) throws Exception{
+		bindAll();
 		if (ssl) { // Not needed with the use of a proxy
 			try {
 				SSLServerSocketFactory ssf = (SSLServerSocketFactory) SSLServerSocketFactory.getDefault();

src/dev/peerat/framework/utils/json/JsonArray.java

@@ -3,16 +3,25 @@ package dev.peerat.framework.utils.json;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
-import java.util.List;
 
 public class JsonArray extends Json{
 	
-	private List<Object> list;
+	private Collection<Object> list;
 	
 	public JsonArray(){
 		this.list = new ArrayList<>();
 	}
 	
+	public JsonArray(Collection<Object> collection){
+		this();
+		this.list.addAll(collection);
+	}
+	
+	public JsonArray(Iterator<Object> iterator){
+		this();
+		while(iterator.hasNext()) this.list.add(iterator.next());
+	}
+	
 	public <E> Collection<E> toList(){
 		return (Collection<E>) this.list;
 	}

src/dev/peerat/framework/utils/json/JsonMap.java

@@ -14,6 +14,11 @@ public class JsonMap extends Json{
 		this.map = new HashMap<>();
 	}
 	
+	public JsonMap(Map<String, Object> map){
+		this();
+		for(Entry<String, Object> entry : map.entrySet()) this.map.put(entry.getKey(), entry.getValue());
+	}
+	
 	public Set<Entry<String, Object>> entries(){
 		return this.map.entrySet();
 	}

src/dev/peerat/framework/utils/json/JsonParser.java

@@ -1,5 +1,7 @@
 package dev.peerat.framework.utils.json;
 
+import static be.jeffcheasey88.peeratcode.parser.TokenType.*;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -8,7 +10,6 @@ import java.util.Map.Entry;
 
 import be.jeffcheasey88.peeratcode.parser.Parser;
 import be.jeffcheasey88.peeratcode.parser.Token;
-import be.jeffcheasey88.peeratcode.parser.TokenType;
 import be.jeffcheasey88.peeratcode.parser.state.RedirectStateTree;
 import be.jeffcheasey88.peeratcode.parser.state.StateTree;
 
@@ -43,16 +44,16 @@ public class JsonParser extends Parser<Json>{
 			.then(content_array_element);
 		
 		content.then(new RedirectStateTree<>(base, (global, local) -> global.set(local.get()))).end();
-		content.then((validator) -> validator.validate((token) -> token.getType().equals(TokenType.STRING), (bag, token) -> bag.set(token))).end();
+		content.then((validator) -> validator.validate((token) -> token.getType().equals(STRING), (bag, token) -> bag.set(token))).end();
-		content.then((validator) -> validator.validate((token) -> token.getType().equals(TokenType.CHAR), (bag, token) -> bag.set(token))).end();
+		content.then((validator) -> validator.validate((token) -> token.getType().equals(CHAR), (bag, token) -> bag.set(token))).end();
-		StateTree<Json> number = content.then((validator) -> validator.validate((token) -> token.getType().equals(TokenType.NAME), (bag, token) -> bag.set(token)));
+		StateTree<Json> number = content.then((validator) -> validator.validate((token) -> token.getType().equals(NAME), (bag, token) -> bag.set(token)));
 		number.end();
 		number.then((validator) -> validator.validate((token) -> token.getValue().equals("."), (bag, token) -> bag.set(bag.<Token>get().concat(token))))
-			.then((validator) -> validator.validate((token) -> token.getType().equals(TokenType.NAME), (bag, token) -> bag.set(bag.<Token>get().concat(token))))
+			.then((validator) -> validator.validate((token) -> token.getType().equals(NAME), (bag, token) -> bag.set(bag.<Token>get().concat(token))))
 			.end();
 		
 		StateTree<Json> mapper = new StateTree<>();
-		StateTree<Json> mapper_key = mapper.then((validator) -> validator.validate((token) -> token.getType().equals(TokenType.STRING), (bag, token) -> {
+		StateTree<Json> mapper_key = mapper.then((validator) -> validator.validate((token) -> token.getType().equals(STRING), (bag, token) -> {
 			Map<Token, Object> map = bag.get("map");
 			if(map == null){
 				map = new HashMap<>();
@@ -105,20 +106,20 @@ public class JsonParser extends Parser<Json>{
 		if(value instanceof Token){
 			Token token = (Token) value;
 			String content = token.getValue();
-			if(token.getType().equals(TokenType.STRING)){
+			if(token.getType().equals(STRING)){
 				return content;
-			}else if(token.getType().equals(TokenType.CHAR)){
+			}else if(token.getType().equals(CHAR)){
 				return content.charAt(0);
 			}else{
 				try{
 					return Long.parseLong(content);
-				}catch(Exception _){
+				}catch(Exception e){
 					try {
 						return  Double.parseDouble(content);
-					}catch(Exception __){
+					}catch(Exception ex){
 						try{
 							return Boolean.parseBoolean(content);
-						}catch(Exception ___){}
+						}catch(Exception exc){}
 					}
 				}
 			}