fixed sonarlint issue

Author: a-brandt

src/main/java/com/arangodb/http/BatchHttpManager.java

@@ -15,12 +15,12 @@ public class BatchHttpManager extends HttpManager {
 
 	private InvocationObject currentObject;
 
+	private boolean batchModeActive = false;
+
 	public BatchHttpManager(ArangoConfigure configure) {
 		super(configure);
 	}
 
-	public boolean batchModeActive = false;
-
 	@Override
 	public HttpResponseEntity execute(HttpRequestEntity requestEntity) throws ArangoException {
 		if (!this.isBatchModeActive()) {

src/main/java/com/arangodb/http/CURLLogger.java

@@ -23,6 +23,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.arangodb.http.HttpRequestEntity.RequestType;
+import com.arangodb.util.StringUtils;
 
 /**
  * @author tamtam180 - kirscheless at gmail.com
@@ -32,10 +33,14 @@ public class CURLLogger {
 
 	private static Logger logger = LoggerFactory.getLogger(CURLLogger.class);
 
+	private CURLLogger() {
+		// this is a helper class
+	}
+
 	public static void log(String url, HttpRequestEntity requestEntity, String userAgent, Credentials credencials) {
 
-		boolean includeBody = (requestEntity.type == RequestType.POST || requestEntity.type == RequestType.PUT || requestEntity.type == RequestType.PATCH)
-				&& (requestEntity.bodyText != null && requestEntity.bodyText.length() != 0);
+		boolean includeBody = (requestEntity.type == RequestType.POST || requestEntity.type == RequestType.PUT
+				|| requestEntity.type == RequestType.PATCH) && StringUtils.isNotEmpty(requestEntity.bodyText);
 
 		StringBuilder buffer = new StringBuilder();
 
@@ -48,7 +53,7 @@ public static void log(String url, HttpRequestEntity requestEntity, String userA
 		buffer.append(" --dump -");
 
 		// header
-		if (requestEntity.headers != null && !requestEntity.headers.isEmpty()) {
+		if (requestEntity.hasHeaders()) {
 			for (Entry<String, Object> header : requestEntity.headers.entrySet()) {
 				buffer.append(" -H '").append(header.getKey()).append(":").append(header.getValue()).append("'");
 			}

src/main/java/com/arangodb/http/HttpManager.java

@@ -100,7 +100,7 @@ public class HttpManager {
 
 	private Map<String, InvocationObject> jobs = new HashMap<String, InvocationObject>();
 
-	public static enum HttpMode {
+	public enum HttpMode {
 		SYNC, ASYNC, FIREANDFORGET
 	}
 
@@ -117,12 +117,7 @@ public void init() {
 		ConnectionSocketFactory plainsf = new PlainConnectionSocketFactory();
 
 		// socket factory for HTTPS
-		SSLConnectionSocketFactory sslsf = null;
-		if (configure.getSslContext() != null) {
-			sslsf = new SSLConnectionSocketFactory(configure.getSslContext());
-		} else {
-			sslsf = new SSLConnectionSocketFactory(SSLContexts.createSystemDefault());
-		}
+		SSLConnectionSocketFactory sslsf = initSSLConnectionSocketFactory();
 
 		// register socket factories
 		Registry<ConnectionSocketFactory> r = RegistryBuilder.<ConnectionSocketFactory> create()
@@ -162,15 +157,16 @@ public long getKeepAliveDuration(HttpResponse response, HttpContext context) {
 					HeaderElement he = it.nextElement();
 					String param = he.getName();
 					String value = he.getValue();
-					if (value != null && param.equalsIgnoreCase("timeout")) {
+					if (value != null && "timeout".equalsIgnoreCase(param)) {
 						try {
-							return Long.parseLong(value) * 1000;
+							return Long.parseLong(value) * 1000L;
 						} catch (NumberFormatException ignore) {
+							// ignore this exception
 						}
 					}
 				}
 				// otherwise keep alive for 30 seconds
-				return 30 * 1000;
+				return 30L * 1000L;
 			}
 
 		};
@@ -404,11 +400,8 @@ private HttpResponseEntity executeInternal(String baseUrl, HttpRequestEntity req
 			}
 		}
 
-		HttpRequestBase request = null;
+		HttpRequestBase request;
 		switch (requestEntity.type) {
-		case GET:
-			request = new HttpGet(url);
-			break;
 		case POST:
 			HttpPost post = new HttpPost(url);
 			configureBodyParams(requestEntity, post);
@@ -430,6 +423,10 @@ private HttpResponseEntity executeInternal(String baseUrl, HttpRequestEntity req
 		case DELETE:
 			request = new HttpDelete(url);
 			break;
+		case GET:
+		default:
+			request = new HttpGet(url);
+			break;
 		}
 
 		// common-header
@@ -468,7 +465,7 @@ private HttpResponseEntity executeInternal(String baseUrl, HttpRequestEntity req
 		if (configure.isEnableCURLLogger()) {
 			CURLLogger.log(url, requestEntity, userAgent, credentials);
 		}
-		HttpResponse response = null;
+		HttpResponse response;
 		if (preDefinedResponse != null) {
 			return preDefinedResponse;
 		}
@@ -624,12 +621,23 @@ public void addJob(String jobId, InvocationObject invocationObject) {
 	}
 
 	public String getLastJobId() {
-		return jobIds.size() == 0 ? null : jobIds.get(jobIds.size() - 1);
+		return jobIds.isEmpty() ? null : jobIds.get(jobIds.size() - 1);
 	}
 
 	public void resetJobs() {
 		this.jobIds = new ArrayList<String>();
 		this.jobs.clear();
 
 	}
+
+	private SSLConnectionSocketFactory initSSLConnectionSocketFactory() {
+		SSLConnectionSocketFactory sslsf;
+		if (configure.getSslContext() != null) {
+			sslsf = new SSLConnectionSocketFactory(configure.getSslContext());
+		} else {
+			sslsf = new SSLConnectionSocketFactory(SSLContexts.createSystemDefault());
+		}
+		return sslsf;
+	}
+
 }

src/main/java/com/arangodb/http/HttpRequestEntity.java

@@ -26,13 +26,8 @@
  */
 public class HttpRequestEntity {
 
-	public static enum RequestType {
-		GET,
-		POST,
-		PUT,
-		DELETE,
-		HEAD,
-		PATCH
+	public enum RequestType {
+		GET, POST, PUT, DELETE, HEAD, PATCH
 	}
 
 	public Map<String, Object> headers;
@@ -44,4 +39,72 @@ public static enum RequestType {
 	public String bodyText;
 	public HttpEntity entity;
 
+	public Map<String, Object> getHeaders() {
+		return headers;
+	}
+
+	public void setHeaders(Map<String, Object> headers) {
+		this.headers = headers;
+	}
+
+	public boolean hasHeaders() {
+		return headers != null && !headers.isEmpty();
+	}
+
+	public RequestType getType() {
+		return type;
+	}
+
+	public void setType(RequestType type) {
+		this.type = type;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public Map<String, Object> getParameters() {
+		return parameters;
+	}
+
+	public void setParameters(Map<String, Object> parameters) {
+		this.parameters = parameters;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	public String getBodyText() {
+		return bodyText;
+	}
+
+	public void setBodyText(String bodyText) {
+		this.bodyText = bodyText;
+	}
+
+	public HttpEntity getEntity() {
+		return entity;
+	}
+
+	public void setEntity(HttpEntity entity) {
+		this.entity = entity;
+	}
+
 }

src/main/java/com/arangodb/http/JsonSequenceEntity.java

@@ -43,40 +43,40 @@ public JsonSequenceEntity(Iterator<?> it, Gson gson) {
 		setContentType("binary/octet-stream");
 	}
 
+	@Override
 	public boolean isRepeatable() {
 		return false;
 	}
 
+	@Override
 	public long getContentLength() {
 		return -1;
 	}
 
-	public InputStream getContent() throws IOException, IllegalStateException {
+	@Override
+	public InputStream getContent() throws IOException {
 		throw new IllegalStateException("cannot support this method.");
 	}
 
+	@Override
 	public boolean isStreaming() {
 		return true;
 	}
 
+	@Override
 	public void writeTo(OutputStream outstream) throws IOException {
 
 		if (outstream == null) {
 			throw new IllegalArgumentException("Output stream may not be null");
 		}
 
-		BufferedWriter writer = null;
-		try {
-			writer = new BufferedWriter(new OutputStreamWriter(outstream, "UTF-8"));
-			while (it.hasNext()) {
-				Object value = it.next();
-				gson.toJson(value, writer);
-				writer.newLine();
-			}
-			writer.flush();
-		} finally {
+		BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(outstream, "UTF-8"));
+		while (it.hasNext()) {
+			Object value = it.next();
+			gson.toJson(value, writer);
+			writer.newLine();
 		}
-
+		writer.flush();
 	}
 
 }