From 76845918c0e8a7739444ba8333f1581c33385a54 Mon Sep 17 00:00:00 2001 From: "k.kazak" Date: Tue, 19 Feb 2019 15:39:56 +0100 Subject: fix sonar blocker try-with-resources BpmnInstaller: use try-with-resources in containsWorkflows remove unnecessary type casting to ZipEntry BpmnInstallerTest: add tests for containsWorkflows fix test for installBpmn (was silently failing with file not found) Change-Id: I3122bcd19204bf498fe1a9b10630076e2df9d70b Issue-ID: SO-1516 Signed-off-by: k.kazak --- .../onap/so/asdc/installer/bpmn/BpmnInstaller.java | 48 +++++++++++----------- 1 file changed, 23 insertions(+), 25 deletions(-) (limited to 'asdc-controller/src/main/java/org') diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/installer/bpmn/BpmnInstaller.java b/asdc-controller/src/main/java/org/onap/so/asdc/installer/bpmn/BpmnInstaller.java index cd9a121ddb..59030e6c22 100644 --- a/asdc-controller/src/main/java/org/onap/so/asdc/installer/bpmn/BpmnInstaller.java +++ b/asdc-controller/src/main/java/org/onap/so/asdc/installer/bpmn/BpmnInstaller.java @@ -4,6 +4,8 @@ * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. * ================================================================================ + * Modifications Copyright (c) 2019 Samsung + * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -31,7 +33,6 @@ import java.util.Enumeration; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; import java.util.zip.ZipInputStream; - import org.apache.commons.io.IOUtils; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; @@ -110,32 +111,29 @@ public class BpmnInstaller { ex.getMessage(), "", "", MsoLogger.ErrorCode.DataError, "ASDC reading CSAR with workflows failed"); } return; - } + } - public boolean containsWorkflows(String csarFilePath) { - boolean workflowsInCsar = false; - try { - ZipFile zipFile = new ZipFile(csarFilePath); - Enumeration zipEntries = zipFile.entries(); - while (zipEntries.hasMoreElements()) { - String fileName = ((ZipEntry) zipEntries.nextElement()).getName(); - if (fileName.endsWith(BPMN_SUFFIX)) { - workflowsInCsar = true; - break; - } - } - } - catch (Exception e) { - LOGGER.debug("Exception :",e); + public boolean containsWorkflows(String csarFilePath) { + boolean workflowsInCsar = false; + try (ZipFile zipFile = new ZipFile(csarFilePath)) { + Enumeration zipEntries = zipFile.entries(); + while (zipEntries.hasMoreElements()) { + String fileName = zipEntries.nextElement().getName(); + if (fileName.endsWith(BPMN_SUFFIX)) { + workflowsInCsar = true; + break; + } + } + } catch (Exception e) { + LOGGER.debug("Exception :", e); LOGGER.error(MessageEnum.ASDC_ARTIFACT_CHECK_EXC, - csarFilePath, - "", - "", - e.getMessage(), "", "", MsoLogger.ErrorCode.DataError, "ASDC Unable to check CSAR entries"); - } - return workflowsInCsar; - } - + csarFilePath,"","", + e.getMessage(), "", "", + MsoLogger.ErrorCode.DataError, "ASDC Unable to check CSAR entries"); + } + return workflowsInCsar; + } + protected HttpResponse sendDeploymentRequest(String bpmnFileName) throws Exception { HttpClient client = HttpClientBuilder.create().build(); URI deploymentUri = new URI(this.env.getProperty(CAMUNDA_URL) + CREATE_DEPLOYMENT_PATH); -- cgit 1.2.3-korg