fix formatting issues, http status code unit tests and upgrade dependency versions

Author: gaborbernat

build.gradle

@@ -1,18 +1,18 @@
 plugins {
     id 'java'
-    id 'nebula.optional-base' version '3.0.3'
-    id 'nebula.provided-base' version '3.0.3'
+    id 'nebula.optional-base' version '3.1.0'
+    id 'nebula.provided-base' version '3.1.0'
     id 'findbugs'
     id 'pmd'
     id 'jacoco'
     id 'build-announcements'
-    id 'nebula.info' version '3.0.3'
-    id 'com.github.ben-manes.versions' version '0.12.0'
+    id 'nebula.info' version '3.4.1'
+    id 'com.github.ben-manes.versions' version '0.13.0'
     id 'osgi'
     id 'maven-publish'
     id 'nebula.nebula-javadoc-jar' version '2.2.2'
     id 'nebula.nebula-source-jar' version '2.2.2'
-    id 'com.jfrog.bintray' version '1.6'
+    id 'com.jfrog.bintray' version '1.7.3'
 }
 
 description = 'This project aims to provide the facility to easily implement JSON-RPC for the java programming language.'
@@ -26,6 +26,9 @@ compileJava {
     options.encoding = 'UTF-8'
     options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
 }
+test {
+    maxParallelForks 5
+}
 compileTestJava {
     options.encoding = 'UTF-8'
     options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
@@ -37,11 +40,11 @@ repositories {
 
 dependencies {
     ext {
-        jacksonVersion = '2.7.2'
-        springVersion = '4.2.5.RELEASE'
-        springBotVersion = '1.3.3.RELEASE'
-        jettyVersion = '9.3.8.RC0'
-        slf4jVersion = '1.7.9'
+        jacksonVersion = '2.8.5'
+        springVersion = '4.3.5.RELEASE'
+        springBotVersion = '1.4.3.RELEASE'
+        jettyVersion = '9.4.0.RC3'
+        slf4jVersion = '1.7.22'
     }
 
     compile 'net.iharder:base64:2.3.9'
@@ -59,7 +62,7 @@ dependencies {
     compile "org.springframework:spring-webmvc:${springVersion}", optional
 
     compile 'commons-codec:commons-codec:1.10', optional
-    compile 'org.apache.httpcomponents:httpcore-nio:4.4.4', optional
+    compile 'org.apache.httpcomponents:httpcore-nio:4.4.5', optional
 
     testCompile 'junit:junit:4.12'
     testCompile 'org.easymock:easymock:3.4'
@@ -73,22 +76,22 @@ dependencies {
     testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}") {
         exclude module: 'org.eclipse.jetty.orbit'
     }
-    testRuntime 'org.apache.logging.log4j:log4j-slf4j-impl:2.5'
-    testRuntime 'org.apache.logging.log4j:log4j-core:2.5'
+    testRuntime 'org.apache.logging.log4j:log4j-slf4j-impl:2.7'
+    testRuntime 'org.apache.logging.log4j:log4j-core:2.7'
 
 }
 
 jar {
     manifest {
-        instruction 'Import-Package', 
-            'org.aopalliance.intercept;resolution:="optional"',
-            'org.apache.http.*;resolution:="optional"',
-            'org.springframework.*;resolution:="optional"',
-            'org.apache.commons.logging;resolution:="optional"',
-            'javax.portlet;resolution:="optional"',
-            'javax.servlet*;version=0.0.0',
-            '*'
-  }
+        instruction 'Import-Package',
+                'org.aopalliance.intercept;resolution:="optional"',
+                'org.apache.http.*;resolution:="optional"',
+                'org.springframework.*;resolution:="optional"',
+                'org.apache.commons.logging;resolution:="optional"',
+                'javax.portlet;resolution:="optional"',
+                'javax.servlet*;version=0.0.0',
+                '*'
+    }
 }
 
 jacoco {
@@ -171,4 +174,4 @@ bintray {
 
 bintrayUpload {
     dependsOn "publishToMavenLocal"
-}
+}

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

@@ -10,44 +10,46 @@
  */
 public enum AnnotationsErrorResolver implements ErrorResolver {
 	INSTANCE;
-
+	
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public JsonError resolveError(Throwable thrownException, Method method, List<JsonNode> arguments) {
 		JsonRpcError resolver = getResolverForException(thrownException, method);
 		if (notFoundResolver(resolver)) return null;
-
+		
 		String message = hasErrorMessage(resolver) ? resolver.message() : thrownException.getMessage();
 		return new JsonError(resolver.code(), message, new ErrorData(resolver.exception().getName(), message));
 	}
-
+	
 	private JsonRpcError getResolverForException(Throwable thrownException, Method method) {
 		JsonRpcErrors errors = ReflectionUtil.getAnnotation(method, JsonRpcErrors.class);
 		if (hasAnnotations(errors)) {
 			for (JsonRpcError errorDefined : errors.value()) {
-				if (isExceptionInstanceOfError(thrownException, errorDefined)) { return errorDefined; }
+				if (isExceptionInstanceOfError(thrownException, errorDefined)) {
+					return errorDefined;
+				}
 			}
 		}
 		return null;
 	}
-
+	
 	private boolean notFoundResolver(JsonRpcError resolver) {
 		return resolver == null;
 	}
-
+	
 	private boolean hasErrorMessage(JsonRpcError em) {
 		// noinspection ConstantConditions
 		return em.message() != null && em.message().trim().length() > 0;
 	}
-
+	
 	private boolean hasAnnotations(JsonRpcErrors errors) {
 		return errors != null;
 	}
-
+	
 	private boolean isExceptionInstanceOfError(Throwable target, JsonRpcError em) {
 		return em.exception().isInstance(target);
 	}
-
+	
 }

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

@@ -4,12 +4,12 @@
  * Implementations of this interface are able to transform the converted parameters before a method invocation in the
  * JSON-RPC service. This allows for mutation of the deserialized arguments before a method invocation or for validation
  * of the actual argument objects.
- *
+ * <p>
  * Any exceptions thrown in the {@link ConvertedParameterTransformer#transformConvertedParameters(Object, Object[])}
  * method, will be returned as an error to the JSON-RPC client.
  */
 public interface ConvertedParameterTransformer {
-
+	
 	/**
 	 * Returns the parameters that will be passed to the method on invocation.
 	 *

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

@@ -1,27 +1,26 @@
 package com.googlecode.jsonrpc4j;
 
-import static com.googlecode.jsonrpc4j.ErrorResolver.JsonError.ERROR_NOT_HANDLED;
-
 import com.fasterxml.jackson.databind.JsonNode;
 
 import java.lang.reflect.Method;
 import java.util.List;
 
+import static com.googlecode.jsonrpc4j.ErrorResolver.JsonError.ERROR_NOT_HANDLED;
+
 /**
  * An {@link ErrorResolver} that puts type information into the
  * data portion of the error.  This {@link ErrorResolver} always
  * returns a {@link com.googlecode.jsonrpc4j.ErrorResolver.JsonError JsonError}.
- *
  */
 @SuppressWarnings("WeakerAccess")
 public enum DefaultErrorResolver implements ErrorResolver {
 	INSTANCE;
-
+	
 	/**
 	 * {@inheritDoc}
 	 */
 	public JsonError resolveError(Throwable t, Method method, List<JsonNode> arguments) {
 		return new JsonError(ERROR_NOT_HANDLED.code, t.getMessage(), new ErrorData(t.getClass().getName(), t.getMessage()));
 	}
-
+	
 }

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

@@ -1,16 +1,15 @@
 package com.googlecode.jsonrpc4j;
 
-import static com.googlecode.jsonrpc4j.Util.hasNonNullObjectData;
-import static com.googlecode.jsonrpc4j.Util.hasNonNullTextualData;
-
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
+import static com.googlecode.jsonrpc4j.Util.hasNonNullObjectData;
+import static com.googlecode.jsonrpc4j.Util.hasNonNullTextualData;
+
 /**
  * Default implementation of the {@link ExceptionResolver} interface that attempts to re-throw the same exception
  * that was thrown by the server.  This always returns a {@link Throwable}.
@@ -19,17 +18,19 @@
 public enum DefaultExceptionResolver implements ExceptionResolver {
 	INSTANCE;
 	private static final Logger logger = LoggerFactory.getLogger(DefaultExceptionResolver.class);
-
+	
 	/**
 	 * {@inheritDoc}
 	 */
 	public Throwable resolveException(ObjectNode response) {
 		ObjectNode errorObject = ObjectNode.class.cast(response.get(JsonRpcBasicServer.ERROR));
-		if (!hasNonNullObjectData(errorObject, JsonRpcBasicServer.DATA)) return createJsonRpcClientException(errorObject);
-
+		if (!hasNonNullObjectData(errorObject, JsonRpcBasicServer.DATA))
+			return createJsonRpcClientException(errorObject);
+		
 		ObjectNode dataObject = ObjectNode.class.cast(errorObject.get(JsonRpcBasicServer.DATA));
-		if (!hasNonNullTextualData(dataObject, JsonRpcBasicServer.EXCEPTION_TYPE_NAME)) return createJsonRpcClientException(errorObject);
-
+		if (!hasNonNullTextualData(dataObject, JsonRpcBasicServer.EXCEPTION_TYPE_NAME))
+			return createJsonRpcClientException(errorObject);
+		
 		try {
 			String exceptionTypeName = dataObject.get(JsonRpcBasicServer.EXCEPTION_TYPE_NAME).asText();
 			String message = hasNonNullTextualData(dataObject, JsonRpcBasicServer.ERROR_MESSAGE) ? dataObject.get(JsonRpcBasicServer.ERROR_MESSAGE).asText() : null;
@@ -39,7 +40,7 @@ public Throwable resolveException(ObjectNode response) {
 			return createJsonRpcClientException(errorObject);
 		}
 	}
-
+	
 	/**
 	 * Creates a {@link JsonRpcClientException} from the given
 	 * {@link ObjectNode}.
@@ -51,7 +52,7 @@ private JsonRpcClientException createJsonRpcClientException(ObjectNode errorObje
 		int code = errorObject.has(JsonRpcBasicServer.ERROR_CODE) ? errorObject.get(JsonRpcBasicServer.ERROR_CODE).asInt() : 0;
 		return new JsonRpcClientException(code, errorObject.get(JsonRpcBasicServer.ERROR_MESSAGE).asText(), errorObject.get(JsonRpcBasicServer.DATA));
 	}
-
+	
 	/**
 	 * Attempts to create an {@link Throwable} of the given type  with the given message.  For this method to create a
 	 * {@link Throwable} it must have either a default (no-args) constructor or a  constructor that takes a {@code String}
@@ -68,10 +69,10 @@ private JsonRpcClientException createJsonRpcClientException(ObjectNode errorObje
 	private Throwable createThrowable(String typeName, String message) throws IllegalAccessException, InvocationTargetException, InstantiationException {
 		Class<? extends Throwable> clazz = loadThrowableClass(typeName);
 		if (clazz == null) return null;
-
+		
 		Constructor<? extends Throwable> defaultCtr = getDefaultConstructor(clazz);
 		Constructor<? extends Throwable> messageCtr = getMessageConstructor(clazz);
-
+		
 		if (message != null && messageCtr != null) {
 			return messageCtr.newInstance(message);
 		} else if (message != null && defaultCtr != null) {
@@ -87,7 +88,7 @@ private Throwable createThrowable(String typeName, String message) throws Illega
 			return null;
 		}
 	}
-
+	
 	private Class<? extends Throwable> loadThrowableClass(String typeName) {
 		Class<?> clazz;
 		try {
@@ -102,7 +103,7 @@ private Class<? extends Throwable> loadThrowableClass(String typeName) {
 		}
 		return null;
 	}
-
+	
 	private Constructor<? extends Throwable> getDefaultConstructor(Class<? extends Throwable> clazz) {
 		Constructor<? extends Throwable> defaultCtr = null;
 		try {
@@ -112,7 +113,7 @@ private Constructor<? extends Throwable> getDefaultConstructor(Class<? extends T
 		}
 		return defaultCtr;
 	}
-
+	
 	private Constructor<? extends Throwable> getMessageConstructor(Class<? extends Throwable> clazz) {
 		Constructor<? extends Throwable> messageCtr = null;
 		try {
@@ -122,9 +123,9 @@ private Constructor<? extends Throwable> getMessageConstructor(Class<? extends T
 		}
 		return messageCtr;
 	}
-
+	
 	@SuppressWarnings("UnusedParameters")
 	private void handleException(Exception e) {
-		/* do nothing */
+	      /* do nothing */
 	}
 }