Fix for Penetration test _ Session and cookie management

[vid.git] / vid-app-common / src / main / java / org / onap / vid / services / CsvServiceImpl.java

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 c34bf4e..45ac78a 100644 (file)
--- 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
@@ -1,21 +1,41 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * VID
+ * ================================================================================
+ * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
 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{
@@ -64,7 +84,7 @@ public class CsvServiceImpl implements CsvService{
     }
 
 
-    private  List<String[]> readCsv(CSVReader reader) throws IOException {
+    private  List<String[]> readCsv(CSVReader reader) {
         try {
             List<String[]> myEntries = new ArrayList<>() ;
             String [] line;
@@ -80,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);
         }
 
     }
@@ -165,7 +185,7 @@ public class CsvServiceImpl implements CsvService{
      * @throws IllegalAccessException
      * @throws InstantiationException
      */
-    private <T, E> T putJson(T json, String key, E values) throws IllegalAccessException, InstantiationException {
+    private <T, E> T putJson(T json, String key, E values) {
         if (json instanceof JSONArray){
             JSONArray currentJson= ((JSONArray)json);
             if (values == null) //array of strings (for last item)
@@ -176,11 +196,10 @@ public class CsvServiceImpl implements CsvService{
                 if (keyExistsOrFirstElement(currentJson, key)) {
                     currentJson.put(new JSONObject().put(key, values));
                 } else {
-                    JSONObject lastItem = lastItemInArray(currentJson);
-                    if(lastItem != null){
+                JSONObject lastItem = lastItemInArray(currentJson);
+                    if(lastItem != null) {
                         lastItem.put(key, values);
                     }
-
                 }
             }
         }