From 13966ab288578be392c5d2c64d5a9d7b6f600327 Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Wed, 30 Aug 2017 05:49:27 -0700 Subject: Fix Sonar bugs In client java packages Blocker issues fixed Change-Id: I7ea1fb546ad32422da7eef596a989e4696238651 Issue-Id: CLAMP-43 Signed-off-by: Determe, Sebastien (sd378r) --- .../clamp/clds/client/DcaeDispatcherServices.java | 20 ++++---- .../org/onap/clamp/clds/client/PolicyClient.java | 36 +++++++-------- .../onap/clamp/clds/client/SdcCatalogServices.java | 53 ++++++++++++---------- 3 files changed, 53 insertions(+), 56 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/org/onap/clamp/clds/client/DcaeDispatcherServices.java b/src/main/java/org/onap/clamp/clds/client/DcaeDispatcherServices.java index 3d8d5d53a..718a2e997 100644 --- a/src/main/java/org/onap/clamp/clds/client/DcaeDispatcherServices.java +++ b/src/main/java/org/onap/clamp/clds/client/DcaeDispatcherServices.java @@ -96,18 +96,16 @@ public class DcaeDispatcherServices { if (inStream != null) { BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inStream)); String inputLine = null; - StringBuffer response = new StringBuffer(); + StringBuilder response = new StringBuilder(); while ((inputLine = bufferedReader.readLine()) != null) { response.append(inputLine); } responseStr = response.toString(); } - if (responseStr != null) { - if (requestFailed) { - logger.error("requestFailed - responseStr=" + responseStr); - throw new BadRequestException(responseStr); - } + if (responseStr != null && requestFailed) { + logger.error("requestFailed - responseStr=" + responseStr); + throw new BadRequestException(responseStr); } logger.debug("response code " + responseCode); @@ -270,7 +268,7 @@ public class DcaeDispatcherServices { String inputLine = null; - StringBuffer response = new StringBuffer(); + StringBuilder response = new StringBuilder(); while ((inputLine = in.readLine()) != null) { response.append(inputLine); @@ -279,11 +277,9 @@ public class DcaeDispatcherServices { responseStr = response.toString(); } - if (responseStr != null) { - if (requestFailed) { - logger.error("requestFailed - responseStr=" + responseStr); - throw new BadRequestException(responseStr); - } + if (responseStr != null && requestFailed) { + logger.error("requestFailed - responseStr=" + responseStr); + throw new BadRequestException(responseStr); } logger.debug("response code " + responseCode); diff --git a/src/main/java/org/onap/clamp/clds/client/PolicyClient.java b/src/main/java/org/onap/clamp/clds/client/PolicyClient.java index e16f056ce..6095af155 100644 --- a/src/main/java/org/onap/clamp/clds/client/PolicyClient.java +++ b/src/main/java/org/onap/clamp/clds/client/PolicyClient.java @@ -61,8 +61,11 @@ import org.springframework.context.ApplicationContext; * Policy utility methods - specifically, send the policy. */ public class PolicyClient { - protected static final EELFLogger logger = EELFManager.getInstance().getLogger(PolicyClient.class); - protected static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger(); + + protected static final String LOG_POLICY_PREFIX = "Response is "; + + protected static final EELFLogger logger = EELFManager.getInstance().getLogger(PolicyClient.class); + protected static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger(); @Value("${org.onap.clamp.config.files.cldsPolicyConfig:'classpath:/clds/clds-policy-config.properties'}") protected String cldsPolicyConfigFile; @@ -73,10 +76,6 @@ public class PolicyClient { @Autowired protected RefProp refProp; - public PolicyClient() { - - } - /** * Perform send of microservice policy. * @@ -189,11 +188,11 @@ public class PolicyClient { // API method to create or update Policy. PolicyChangeResponse response = null; - String responseMessage; + String responseMessage = ""; Date startTime = new Date(); try { List versions = getVersions(policyNamePrefix, prop); - if (versions.size() <= 0) { + if (versions.isEmpty()) { LoggingUtils.setTargetContext("Policy", "createPolicy"); logger.info("Attempting to create policy for action=" + prop.getActionCd()); response = policyEngine.createPolicy(policyParameters); @@ -205,9 +204,9 @@ public class PolicyClient { responseMessage = response.getResponseMessage(); } } catch (Exception e) { - responseMessage = e.toString(); + logger.error("Exception occurred during policy communnication", e); } - logger.info("response is " + responseMessage); + logger.info(LOG_POLICY_PREFIX + responseMessage); LoggingUtils.setTimeContext(startTime, new Date()); @@ -261,15 +260,15 @@ public class PolicyClient { // API method to create or update Policy. PolicyChangeResponse response = null; - String responseMessage; + String responseMessage = ""; try { logger.info("Attempting to push policy..."); response = policyEngine.pushPolicy(pushPolicyParameters); responseMessage = response.getResponseMessage(); } catch (Exception e) { - responseMessage = e.toString(); + logger.error("Exception occurred during policy communnication", e); } - logger.info("response is " + responseMessage); + logger.info(LOG_POLICY_PREFIX + responseMessage); if (response != null && (response.getResponseCode() == 200 || response.getResponseCode() == 204)) { logger.info("Policy push successful"); @@ -333,7 +332,7 @@ public class PolicyClient { logger.info("Policy versions.size()=" + versions.size()); } catch (Exception e) { // just print warning - if no policy version found - logger.warn("warning: policy not found...policy name - " + policyName); + logger.warn("warning: policy not found...policy name - " + policyName, e); } return versions; @@ -401,8 +400,7 @@ public class PolicyClient { deletePolicyParameters.setPdpGroup(refProp.getStringValue("policy.pdp.group")); deletePolicyParameters.setPolicyType(policyType); // send delete request - String responseMessage = null; - responseMessage = sendDeletePolicy(deletePolicyParameters, prop); + String responseMessage = sendDeletePolicy(deletePolicyParameters, prop); logger.info("Deleting policy from PAP..."); deletePolicyParameters.setPolicyComponent("PAP"); @@ -438,15 +436,15 @@ public class PolicyClient { // API method to create or update Policy. PolicyChangeResponse response = null; - String responseMessage; + String responseMessage = ""; try { logger.info("Attempting to delete policy..."); response = policyEngine.deletePolicy(deletePolicyParameters); responseMessage = response.getResponseMessage(); } catch (Exception e) { - responseMessage = e.toString(); + logger.error("Exception occurred during policy communnication", e); } - logger.info("response is " + responseMessage); + logger.info(LOG_POLICY_PREFIX + responseMessage); if (response != null && response.getResponseCode() == 200) { logger.info("Policy delete successful"); diff --git a/src/main/java/org/onap/clamp/clds/client/SdcCatalogServices.java b/src/main/java/org/onap/clamp/clds/client/SdcCatalogServices.java index a4e332a39..24a3d3c41 100644 --- a/src/main/java/org/onap/clamp/clds/client/SdcCatalogServices.java +++ b/src/main/java/org/onap/clamp/clds/client/SdcCatalogServices.java @@ -423,14 +423,14 @@ public class SdcCatalogServices { // To remove duplicate resources from serviceDetail and add valid // vfs to service - if (cldsSdcServiceDetail != null && cldsSdcServiceDetail.getResources() != null) { + if (cldsSdcServiceDetail.getResources() != null) { List cldsSdcResourceList = removeDuplicateSdcResourceInstances( cldsSdcServiceDetail.getResources()); - if (cldsSdcResourceList != null && cldsSdcResourceList.size() > 0) { + if (cldsSdcResourceList != null && !cldsSdcResourceList.isEmpty()) { List cldsVfDataList = new ArrayList<>(); for (CldsSdcResource currCldsSdcResource : cldsSdcResourceList) { if (currCldsSdcResource != null && currCldsSdcResource.getResoucreType() != null - && currCldsSdcResource.getResoucreType().equalsIgnoreCase("VF")) { + && "VF".equalsIgnoreCase(currCldsSdcResource.getResoucreType())) { CldsVfData currCldsVfData = new CldsVfData(); currCldsVfData.setVfName(currCldsSdcResource.getResourceInstanceName()); currCldsVfData.setVfInvariantResourceUUID(currCldsSdcResource.getResourceInvariantUUID()); @@ -454,7 +454,7 @@ public class SdcCatalogServices { */ private void getAllVfcForVfList(List cldsVfDataList, String catalogUrl) throws IOException { // todo : refact this.. - if (cldsVfDataList != null && cldsVfDataList.size() > 0) { + if (cldsVfDataList != null && !cldsVfDataList.isEmpty()) { List allVfResources = getAllSdcVForVfcResourcesBasedOnResourceType( RESOURCE_VF_TYPE); List allVfcResources = getAllSdcVForVfcResourcesBasedOnResourceType( @@ -475,7 +475,7 @@ public class SdcCatalogServices { List vfcDataListFromVfResponse = getVfcDataListFromVfResponse(vfResponse); if (vfcDataListFromVfResponse != null) { currCldsVfData.setCldsVfcs(vfcDataListFromVfResponse); - if (vfcDataListFromVfResponse.size() > 0) { + if (!vfcDataListFromVfResponse.isEmpty()) { // To get artifacts for every VFC and get // alarm conditions from artifact for (CldsVfcData currCldsVfcData : vfcDataListFromVfResponse) { @@ -537,7 +537,7 @@ public class SdcCatalogServices { private List getVFCfromCVFC(String resourceUUID) { String catalogUrl = refProp.getStringValue("sdc.catalog.url"); - List cldsVfcDataList = new ArrayList(); + List cldsVfcDataList = new ArrayList<>(); if (resourceUUID != null) { String vfcResourceUUIDUrl = catalogUrl + "resources" + "/" + resourceUUID + "/metadata"; @@ -569,10 +569,11 @@ public class SdcCatalogServices { } private String removeUnwantedBracesFromString(String id) { + String idReworked = ""; if (id != null && id.contains("\"")) { - id = id.replaceAll("\"", ""); + idReworked = id.replaceAll("\"", ""); } - return id; + return idReworked; } private List getAlarmCondtionsFromVfc(String vfcResponse) throws IOException { @@ -611,7 +612,7 @@ public class SdcCatalogServices { // Method to get the artifact for any particular VF private List getFieldPathFromVF(String vfResponse) throws JsonProcessingException, IOException { - List cldsVfKPIDataList = new ArrayList(); + List cldsVfKPIDataList = new ArrayList<>(); ObjectMapper mapper = new ObjectMapper(); ObjectNode vfResponseNode = (ObjectNode) mapper.readTree(vfResponse); ArrayNode artifactsArrayNode = (ArrayNode) vfResponseNode.get("artifacts"); @@ -664,7 +665,7 @@ public class SdcCatalogServices { // Method to get the artifactURL Data and set the CldsVfKPIData node private List parseCsvToGetFieldPath(String allFieldPathValues) throws IOException { - List cldsVfKPIDataList = new ArrayList(); + List cldsVfKPIDataList = new ArrayList<>(); Reader alarmReader = new StringReader(allFieldPathValues); Iterable records = CSVFormat.RFC4180.parse(alarmReader); if (records != null) { @@ -701,8 +702,8 @@ public class SdcCatalogServices { public String getResponsesFromArtifactUrl(String artifactsUrl) { String hostUrl = refProp.getStringValue("sdc.hostUrl"); - artifactsUrl = artifactsUrl.replaceAll("\"", ""); - String artifactUrl = hostUrl + artifactsUrl; + String artifactsUrlReworked = artifactsUrl.replaceAll("\"", ""); + String artifactUrl = hostUrl + artifactsUrlReworked; logger.info("value of artifactURl:" + artifactUrl); String currArtifactResponse = getCldsServicesOrResourcesBasedOnURL(artifactUrl, true); logger.info("value of artifactResponse:" + currArtifactResponse); @@ -720,8 +721,8 @@ public class SdcCatalogServices { */ public String getCldsServicesOrResourcesBasedOnURL(String url, boolean alarmConditions) { try { - url = removeUnwantedBracesFromString(url); - URL urlObj = new URL(url); + String urlReworked = removeUnwantedBracesFromString(url); + URL urlObj = new URL(urlReworked); HttpURLConnection conn = (HttpURLConnection) urlObj.openConnection(); String basicAuth = SdcReq.getSdcBasicAuth(refProp); @@ -738,7 +739,9 @@ public class SdcCatalogServices { response = new StringBuilder(); String inputLine; while ((inputLine = in.readLine()) != null) { - response.append(inputLine); + if (!inputLine.isEmpty()) { + response.append(inputLine); + } if (alarmConditions) { response.append("\n"); } @@ -780,7 +783,7 @@ public class SdcCatalogServices { // To create byKpi ObjectNode kpiObjectNode = mapper.createObjectNode(); - if (cldsServiceData.getCldsVfs() != null && cldsServiceData.getCldsVfs().size() > 0) { + if (cldsServiceData.getCldsVfs() != null && !cldsServiceData.getCldsVfs().isEmpty()) { for (CldsVfData currCldsVfData : cldsServiceData.getCldsVfs()) { if (currCldsVfData != null) { createKpiObjectNodeByVfUuid(mapper, kpiObjectNode, currCldsVfData.getCldsKPIList()); @@ -791,7 +794,7 @@ public class SdcCatalogServices { // To create byVfc and alarmCondition with vfcResourceUUID ObjectNode vfcResourceUuidObjectNode = mapper.createObjectNode(); - if (cldsServiceData.getCldsVfs() != null && cldsServiceData.getCldsVfs().size() > 0) { + if (cldsServiceData.getCldsVfs() != null && !cldsServiceData.getCldsVfs().isEmpty()) { for (CldsVfData currCldsVfData : cldsServiceData.getCldsVfs()) { if (currCldsVfData != null) { createAlarmCondObjectNodeByVfcUuid(mapper, vfcResourceUuidObjectNode, @@ -902,7 +905,7 @@ public class SdcCatalogServices { List cldsAlarmCondList) { ObjectNode alarmCondKeyNode = mapper.createObjectNode(); - if (cldsAlarmCondList != null && cldsAlarmCondList.size() > 0) { + if (cldsAlarmCondList != null && !cldsAlarmCondList.isEmpty()) { for (CldsAlarmCondition currCldsAlarmCondition : cldsAlarmCondList) { if (currCldsAlarmCondition != null) { ObjectNode alarmCondNode = mapper.createObjectNode(); @@ -925,7 +928,7 @@ public class SdcCatalogServices { ObjectNode vfObjectNode = mapper.createObjectNode(); ObjectNode vfUuidNode = mapper.createObjectNode(); List cldsVfsList = cldsServiceData.getCldsVfs(); - if (cldsVfsList != null && cldsVfsList.size() > 0) { + if (cldsVfsList != null && !cldsVfsList.isEmpty()) { for (CldsVfData currCldsVfData : cldsVfsList) { if (currCldsVfData != null) { vfUuidNode.put(currCldsVfData.getVfInvariantResourceUUID(), currCldsVfData.getVfName()); @@ -941,7 +944,7 @@ public class SdcCatalogServices { private void createKpiObjectNodeByVfUuid(ObjectMapper mapper, ObjectNode vfResourceUuidObjectNode, List cldsVfKpiDataList) { - if (cldsVfKpiDataList != null && cldsVfKpiDataList.size() > 0) { + if (cldsVfKpiDataList != null && !cldsVfKpiDataList.isEmpty()) { for (CldsVfKPIData currCldsVfKpiData : cldsVfKpiDataList) { if (currCldsVfKpiData != null) { ObjectNode thresholdNameObjectNode = mapper.createObjectNode(); @@ -967,11 +970,11 @@ public class SdcCatalogServices { ObjectNode vfcObjectNode = mapper.createObjectNode(); ObjectNode alarmCondNode = mapper.createObjectNode(); ObjectNode alertDescNode = mapper.createObjectNode(); - if (cldsVfcDataList != null && cldsVfcDataList.size() > 0) { + if (cldsVfcDataList != null && !cldsVfcDataList.isEmpty()) { for (CldsVfcData currCldsVfcData : cldsVfcDataList) { if (currCldsVfcData != null) { if (currCldsVfcData.getCldsAlarmConditions() != null - && currCldsVfcData.getCldsAlarmConditions().size() > 0) { + && !currCldsVfcData.getCldsAlarmConditions().isEmpty()) { for (CldsAlarmCondition currCldsAlarmCondition : currCldsVfcData.getCldsAlarmConditions()) { alarmCondNode.put(currCldsAlarmCondition.getAlarmConditionKey(), currCldsAlarmCondition.getAlarmConditionKey()); @@ -1001,12 +1004,12 @@ public class SdcCatalogServices { private ObjectNode createVfcObjectNodeByVfUuid(ObjectMapper mapper, List cldsVfDataList) { ObjectNode vfUuidObjectNode = mapper.createObjectNode(); - if (cldsVfDataList != null && cldsVfDataList.size() > 0) { + if (cldsVfDataList != null && !cldsVfDataList.isEmpty()) { for (CldsVfData currCldsVfData : cldsVfDataList) { if (currCldsVfData != null) { ObjectNode vfcObjectNode = mapper.createObjectNode(); ObjectNode vfcUuidNode = mapper.createObjectNode(); - if (currCldsVfData.getCldsVfcs() != null && currCldsVfData.getCldsVfcs().size() > 0) { + if (currCldsVfData.getCldsVfcs() != null && !currCldsVfData.getCldsVfcs().isEmpty()) { for (CldsVfcData currCldsVfcData : currCldsVfData.getCldsVfcs()) { vfcUuidNode.put(currCldsVfcData.getVfcInvariantResourceUUID(), currCldsVfcData.getVfcName()); @@ -1126,7 +1129,7 @@ public class SdcCatalogServices { private String getResourceUuidFromResourceInvariantUuid(String resourceInvariantUuid, List resourceInfoList) throws IOException { String resourceUuid = null; - if (resourceInfoList != null && resourceInfoList.size() > 0) { + if (resourceInfoList != null && !resourceInfoList.isEmpty()) { for (CldsSdcResourceBasicInfo currResource : resourceInfoList) { if (currResource != null && currResource.getInvariantUUID() != null && currResource.getUuid() != null && currResource.getInvariantUUID().equalsIgnoreCase(resourceInvariantUuid)) { -- cgit 1.2.3-korg