From 659c945506a2854003a38364dd32a8ff84f78106 Mon Sep 17 00:00:00 2001 From: cagache Date: Thu, 7 Nov 2019 10:10:25 +0200 Subject: [PATCH] Sonar: Format specifiers should be used instead of string concatenation. Sonar: Replace the type specification in this constructor call with the diamond operator ("<>") --- .../src/main/java/org/alfresco/rest/core/v0/BaseAPI.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java index 2306424f57..0785748fb5 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java @@ -103,7 +103,7 @@ public abstract class BaseAPI */ protected List getPropertyValues(JSONObject result, String propertyName) { - ArrayList results = new ArrayList(); + ArrayList results = new ArrayList<>(); try { JSONArray items = result.getJSONArray("items"); @@ -541,7 +541,6 @@ public abstract class BaseAPI AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject(); T request = requestType.newInstance(); - HttpResponse response = null; JSONObject responseBody = null; JSONObject returnValues = null; @@ -555,7 +554,7 @@ public abstract class BaseAPI } LOGGER.info("Sending {} request to {}", requestType.getSimpleName(), requestUrl); LOGGER.info("Request body: {}", requestParams); - response = client.execute(adminUser, adminPassword, request); + HttpResponse response = client.execute(adminUser, adminPassword, request); LOGGER.info("Response: {}", response.getStatusLine()); try @@ -587,13 +586,13 @@ public abstract class BaseAPI case HttpStatus.SC_UNPROCESSABLE_ENTITY: if (responseBody != null && responseBody.has(EXCEPTION_KEY)) { - LOGGER.error("Request failed: " + responseBody.getString(EXCEPTION_KEY)); + LOGGER.error("Request failed: {}", responseBody.getString(EXCEPTION_KEY)); returnValues = responseBody; } break; default: - LOGGER.error("Request returned unexpected HTTP status " + response.getStatusLine().getStatusCode()); + LOGGER.error("Request returned unexpected HTTP status {}", response.getStatusLine().getStatusCode()); break; } }