timeout for parallel processed batches

Author: Наводников Максим Александрович

src/main/java/com/googlecode/jsonrpc4j/JsonRpcBasicServer.java

@@ -20,6 +20,7 @@
 import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
 
 import static com.googlecode.jsonrpc4j.ErrorResolver.JsonError.ERROR_NOT_HANDLED;
@@ -78,6 +79,7 @@ public class JsonRpcBasicServer {
 	private boolean shouldLogInvocationErrors = true;
 	private List<JsonRpcInterceptor> interceptorList = new ArrayList<>();
     private ExecutorService batchExecutorService = null;
+    private long parallelBatchProcessingTimeout;
 
 	/**
 	 * Creates the server with the given {@link ObjectMapper} delegating
@@ -389,7 +391,7 @@ private void handleRethrowException(JsonResponse response, JsonResponse singleJs
     private JsonResponse getSingleJsonResponse(Map.Entry<Object, Future<JsonResponse>> responseFuture) {
         JsonResponse response;
 	    try {
-            response = responseFuture.getValue().get();
+            response = responseFuture.getValue().get(parallelBatchProcessingTimeout, TimeUnit.MILLISECONDS);
         } catch (Throwable t) {
             JsonError jsonError = new JsonError(INTERNAL_ERROR.code, t.getMessage(), t.getClass().getName());
             return createResponseError(VERSION, responseFuture.getKey(), jsonError);
@@ -1101,8 +1103,12 @@ public void setShouldLogInvocationErrors(boolean shouldLogInvocationErrors) {
     public void setBatchExecutorService(ExecutorService batchExecutorService) {
         this.batchExecutorService = batchExecutorService;
     }
-	
-	private static class ErrorObjectWithJsonError {
+
+    public void setParallelBatchProcessingTimeout(long parallelBatchProcessingTimeout) {
+        this.parallelBatchProcessingTimeout = parallelBatchProcessingTimeout;
+    }
+
+    private static class ErrorObjectWithJsonError {
 		private final ObjectNode node;
 		private final JsonError error;
 

src/main/java/com/googlecode/jsonrpc4j/spring/AbstractJsonServiceExporter.java

@@ -35,6 +35,7 @@ abstract class AbstractJsonServiceExporter extends RemoteExporter implements Ini
 	private String contentType = null;
 	private List<JsonRpcInterceptor> interceptorList;
 	private ExecutorService batchExecutorService = null;
+	private long parallelBatchProcessingTimeout;
 
 	/**
 	 * {@inheritDoc}
@@ -73,6 +74,7 @@ public void afterPropertiesSet() throws Exception {
 		jsonRpcServer.setConvertedParameterTransformer(convertedParameterTransformer);
 		jsonRpcServer.setShouldLogInvocationErrors(shouldLogInvocationErrors);
 		jsonRpcServer.setBatchExecutorService(batchExecutorService);
+		jsonRpcServer.setParallelBatchProcessingTimeout(parallelBatchProcessingTimeout);
 
 		if (contentType != null) {
 			jsonRpcServer.setContentType(contentType);

src/test/java/com/googlecode/jsonrpc4j/server/JsonRpcServerParallelBatchProcessingTest.java

@@ -20,7 +20,7 @@ public void setup() {
                 50,
                 1000,
                 TimeUnit.MILLISECONDS,
-                new ArrayBlockingQueue<Runnable>(50));
+                new ArrayBlockingQueue<>(50));
         jsonRpcServer.setBatchExecutorService(threadPoolExecutor);
     }
 }