From 904eaac80a52cb25117254501b9f8cc483b60fca Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Wed, 26 Feb 2020 18:50:28 +0200 Subject: Bump opencsv, c3p0, snakeyaml, h2 database to latests Issue-ID: VID-755 Change-Id: If34239ebc6c9e4b067c22a3fae0a680a160cb00b Signed-off-by: Ittay Stern --- epsdk-app-onap/pom.xml | 2 +- vid-app-common/pom.xml | 8 ++++---- .../java/org/onap/vid/services/CsvServiceImpl.java | 22 +++++++++++----------- vid-automation/pom.xml | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml index c8da0ea09..94bd5152a 100755 --- a/epsdk-app-onap/pom.xml +++ b/epsdk-app-onap/pom.xml @@ -368,7 +368,7 @@ com.mchange c3p0 - 0.9.5.4 + 0.9.5.5 io.searchbox diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml index b894dc5bf..3b255d8c9 100755 --- a/vid-app-common/pom.xml +++ b/vid-app-common/pom.xml @@ -515,7 +515,7 @@ com.opencsv opencsv - 4.6 + 5.0 @@ -652,7 +652,7 @@ com.mchange c3p0 - 0.9.5.4 + 0.9.5.5 io.searchbox @@ -828,7 +828,7 @@ org.yaml snakeyaml - 1.24 + 1.25 org.skyscreamer @@ -893,7 +893,7 @@ com.h2database h2 - 1.4.199 + 1.4.200 test diff --git a/vid-app-common/src/main/java/org/onap/vid/services/CsvServiceImpl.java b/vid-app-common/src/main/java/org/onap/vid/services/CsvServiceImpl.java index 4aabdae21..45ac78ab0 100644 --- a/vid-app-common/src/main/java/org/onap/vid/services/CsvServiceImpl.java +++ b/vid-app-common/src/main/java/org/onap/vid/services/CsvServiceImpl.java @@ -20,22 +20,22 @@ package org.onap.vid.services; -import com.opencsv.CSVReader; -import org.json.JSONArray; -import org.json.JSONObject; -import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; +import static org.apache.commons.lang3.exception.ExceptionUtils.rethrow; +import static org.onap.vid.utils.Logging.getMethodName; -import javax.ws.rs.BadRequestException; +import com.opencsv.CSVReader; import java.io.FileReader; import java.io.IOException; import java.io.InputStreamReader; import java.util.ArrayList; import java.util.Arrays; import java.util.List; - -import static org.onap.vid.utils.Logging.getMethodName; +import javax.ws.rs.BadRequestException; +import org.json.JSONArray; +import org.json.JSONObject; +import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; @Service public class CsvServiceImpl implements CsvService{ @@ -84,7 +84,7 @@ public class CsvServiceImpl implements CsvService{ } - private List readCsv(CSVReader reader) throws IOException { + private List readCsv(CSVReader reader) { try { List myEntries = new ArrayList<>() ; String [] line; @@ -100,7 +100,7 @@ public class CsvServiceImpl implements CsvService{ } catch (Exception e){ logger.error("error during reading CSV file. exception:" + e.getMessage()); - throw e; + return rethrow(e); } } diff --git a/vid-automation/pom.xml b/vid-automation/pom.xml index 5c77a8111..d633054dc 100644 --- a/vid-automation/pom.xml +++ b/vid-automation/pom.xml @@ -83,7 +83,7 @@ org.yaml snakeyaml - 1.14 + 1.25 joda-time -- cgit 1.2.3-korg