Merge pull request #11 from spdx/updateopencsv

Update OpenCSV to later version
spdx · Nov 12, 2021 · db6caf0 · db6caf0
2 parents d6162ba + 05e9f5c
commit db6caf0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -111,7 +111,7 @@
     <dependency>
     	<groupId>com.opencsv</groupId>
     	<artifactId>opencsv</artifactId>
-    	<version>4.1</version>
+    	<version>5.5.2</version>
     </dependency>
     <dependency>
     	<groupId>org.apache.poi</groupId>

diff --git a/src/main/java/org/spdx/spreadsheetstore/AbstractSheet.java b/src/main/java/org/spdx/spreadsheetstore/AbstractSheet.java
@@ -58,6 +58,7 @@
 import com.opencsv.CSVReader;
 import com.opencsv.CSVReaderBuilder;
 import com.opencsv.CSVWriter;
+import com.opencsv.exceptions.CsvValidationException;
 
 /**
  * Abstract class representing a workbook sheet used in storing structured data
@@ -444,7 +445,9 @@ public static List<String> csvToStrings(String csv) {
 		try {
 			return Arrays.asList(csvReader.readNext());
 		} catch (IOException e) {
-			return Arrays.asList(new String[] {"ERROR PARSING CSV String"});
+			return Arrays.asList(new String[] {"I/O ERROR PARSING CSV String"});
+		} catch (CsvValidationException e) {
+			return Arrays.asList(new String[] {"CSV VALIDATION ERROR PARSING CSV String"});
 		} finally {
 			try {
 				csvReader.close();