Merge pull request #146 from TanyaEf/master

Fixed errors handling

Author: yaroslav-kovalchyk

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/JerseyRequest.java

@@ -155,7 +155,7 @@ private OperationResult<ResponseType> executeRequest(int httpMethod, Invocation.
 
     private OperationResult<ResponseType> executeRequest(int httpMethod, Invocation.Builder request, Object entity) {
         Response response = null;
-        if (restrictedHttpMethods && (httpMethod != POST || httpMethod != GET) ) {
+        if (restrictedHttpMethods && (httpMethod != POST || httpMethod != GET)) {
             request.header("X-HTTP-Method-Override", RequestMethod.values()[httpMethod].toString());
             response = request.post(Entity.entity(entity, contentType));
         } else {
@@ -181,17 +181,13 @@ private OperationResult<ResponseType> executeRequest(int httpMethod, Invocation.
         }
 
         if (response != null && response.getStatus() >= 400) {
-            if (handleErrors) {
-                errorHandler.handleError(response);
-            } else {
-                return (responseGenericType != null) ? new NullEntityOperationResult<ResponseType>(response, responseGenericType, errorHandler)
-                        : new NullEntityOperationResult<ResponseType>(response, responseClass, errorHandler);
-            }
-                errorHandler.handleError(response);
-            } else {
+            if (!handleErrors) {
                 return (responseGenericType != null) ? new NullEntityOperationResult<ResponseType>(response, responseGenericType, errorHandler)
                         : new NullEntityOperationResult<ResponseType>(response, responseClass, errorHandler);
+
             }
+            errorHandler.handleError(response);
+        }
 
         return (responseGenericType != null) ? operationResultFactory.getOperationResult(response, responseGenericType)
                 : operationResultFactory.getOperationResult(response, responseClass);

src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/BatchResourcesAdapterTest.java

@@ -204,8 +204,6 @@ public Void execute(OperationResult data) {
         assertNotNull(retrieved);
         assertNotSame(currentThreadId, newThreadId.get());
         assertNotNull(retrieved.getFuture());
-        assertTrue(retrieved.getFuture().isDone());
-
         Mockito.verify(callback, times(1)).execute(objectOperationResultMock);
         Mockito.verify(objectJerseyRequestMock, times(1)).delete();
     }