add abort request method

lets-blade · Dec 28, 2015 · d26e0b5 · d26e0b5
1 parent 449caf8
commit d26e0b5
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 20 deletions.
diff --git a/blade-core/src/main/java/com/blade/web/AsynRequestHandler.java b/blade-core/src/main/java/com/blade/web/AsynRequestHandler.java
@@ -107,17 +107,21 @@ public void run(){
 			// If find it
 			if (route != null) {
 				request.setRoute(route);
+
+				boolean result = false;
 				// before inteceptor
 				List<Route> befores = routeMatcher.getBefore(uri);
-				invokeInterceptor(request, response, befores);
-
-				// execute
-				handle(request, response, route);
-
-				// after inteceptor
-				List<Route> afters = routeMatcher.getAfter(uri);
-				invokeInterceptor(request, response, afters);
-				asyncContext.complete();
+				result = invokeInterceptor(request, response, befores);
+				if(result){
+					// execute
+					handle(request, response, route);
+
+					if(!request.isAbort()){
+						// after inteceptor
+						List<Route> afters = routeMatcher.getAfter(uri);
+						invokeInterceptor(request, response, afters);
+					}
+				}
 				return;
 			}
 
@@ -166,11 +170,16 @@ private void render404(Response response, String uri) {
 	 * @param request		request object
 	 * @param response		response object
 	 * @param interceptors	execute the interceptor list
+	 * @return				Return execute is ok
 	 */
-	private void invokeInterceptor(Request request, Response response, List<Route> interceptors) {
+	private boolean invokeInterceptor(Request request, Response response, List<Route> interceptors) {
 		for(Route route : interceptors){
 			handle(request, response, route);
+			if(request.isAbort()){
+				return false;
+			}
 		}
+		return true;
 	}
 
 	/**

diff --git a/blade-core/src/main/java/com/blade/web/SyncRequestHandler.java b/blade-core/src/main/java/com/blade/web/SyncRequestHandler.java
@@ -97,16 +97,19 @@ public void handle(HttpServletRequest httpRequest, HttpServletResponse httpRespo
 			// If find it
 			if (route != null) {
 				request.setRoute(route);
+				boolean result = false;
 				// before inteceptor
 				List<Route> befores = routeMatcher.getBefore(uri);
-				invokeInterceptor(request, response, befores);
-
-				// execute
-				handle(request, response, route);
-
-				// after inteceptor
-				List<Route> afters = routeMatcher.getAfter(uri);
-				invokeInterceptor(request, response, afters);
+				result = invokeInterceptor(request, response, befores);
+				if(result){
+					// execute
+					handle(request, response, route);
+					if(!request.isAbort()){
+						// after inteceptor
+						List<Route> afters = routeMatcher.getAfter(uri);
+						invokeInterceptor(request, response, afters);
+					}
+				}
 				return;
 			}
 
@@ -153,11 +156,16 @@ private void render404(Response response, String uri) {
 	 * @param request		request object
 	 * @param response		response object
 	 * @param interceptors	execute the interceptor list
+	 * @return				Return execute is ok
 	 */
-	private void invokeInterceptor(Request request, Response response, List<Route> interceptors) {
+	private boolean invokeInterceptor(Request request, Response response, List<Route> interceptors) {
 		for(Route route : interceptors){
 			handle(request, response, route);
+			if(request.isAbort()){
+				return false;
+			}
 		}
+		return true;
 	}
 
 	/**

diff --git a/blade-core/src/main/java/com/blade/web/http/Request.java b/blade-core/src/main/java/com/blade/web/http/Request.java
@@ -339,6 +339,16 @@ public interface Request {
 	 */
 	Route route();
 
+	/**
+	 * Abort current request
+	 */
+	void abort();
+
+	/**
+	 * @return	Return is abort request
+	 */
+	boolean isAbort();
+
 	/**
 	 * Request body interface
 	 * @author biezhi

diff --git a/blade-core/src/main/java/com/blade/web/http/wrapper/ServletRequest.java b/blade-core/src/main/java/com/blade/web/http/wrapper/ServletRequest.java
@@ -77,6 +77,8 @@ public class ServletRequest implements Request {
 
 	private Blade blade = null;
 
+	private boolean isAbort = false;
+
 	public ServletRequest(HttpServletRequest request) throws MultipartException, IOException {
 		this.request = request;
 		this.pathParams = new HashMap<String,String>();
@@ -513,6 +515,16 @@ public Route route() {
 		return this.route;
 	}
 
+	@Override
+	public void abort() {
+		this.isAbort = true;
+	}
+
+	@Override
+	public boolean isAbort() {
+		 return this.isAbort;
+	}
+
 	@Override
 	public <T> T model(String slug, Class<? extends Serializable> clazz) {
 		if(StringKit.isNotBlank(slug) && null != clazz){
@@ -573,4 +585,4 @@ public byte[] asByte() {
 		};
 	}
 
-}
+}