Merge pull request #17 from rollno748/csv-config-2.1

Added handling for empty line - Issue-16
rollno748 · Jan 4, 2024 · 2d6f379 · 2d6f379
2 parents d8175dd + 8e78872
commit 2d6f379
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.di.jmeter.ecsv</groupId>
     <artifactId>di-extended-csv</artifactId>
-    <version>2.0</version>
+    <version>2.1</version>
 <!--Properties-->
     <properties>
         <jmeter-version>5.1.1</jmeter-version>

diff --git a/src/main/java/com/di/jmeter/config/ExtendedCsvDataSetConfig.java b/src/main/java/com/di/jmeter/config/ExtendedCsvDataSetConfig.java
@@ -105,6 +105,10 @@ public void iterationStart(LoopIterationEvent iterationEvent) {
                     for (int a = 0; a < variables.length && a < lineValues.length; a++) {
                         jMeterVariables.put(variables[a], lineValues[a]);
                     }
+                }else {
+                    for (String variable : variables) {
+                        jMeterVariables.put(variable, null);
+                    }
                 }
                 break;
             case "once":
@@ -329,4 +333,4 @@ public void setBlockSize(String blockSize) {
     public String printAllProperties() {
         return String.format("Filename: %s\n,FileEncoding: %s\n VariableName: %s\n IgnoreFirstLine: %s\n Delimiter: %s\n IsQuotedData: %s\n SelectRow: %s\n UpdateValue: %s\n OOValue: %s\n AutoAllocate: %s\n Allocate: %s\n BlockSize: %s\n",getFilename(),getFileEncoding(),getVariableNames(),isIgnoreFirstLine(),getDelimiter(),isQuotedData(),getSelectRow(),getUpdateValue(),getOoValue(),isAllocate(),isAutoAllocate(),getBlockSize());
     }
-}
+}
diff --git a/src/main/java/com/di/jmeter/config/gui/ExtendedCsvDataSetConfigGui.java b/src/main/java/com/di/jmeter/config/gui/ExtendedCsvDataSetConfigGui.java
@@ -282,7 +282,7 @@ private void init() {
             try {
                 File file = new File(filenameField.getText());
                 Desktop desktop = Desktop.getDesktop();
-                if(filenameField.getText().equals("") || filenameField.getText().isEmpty()){
+                if(filenameField.getText().isEmpty() || filenameField.getText().isEmpty()){
                     throw new FileNotFoundException();
                 }
                 if(!file.exists()){

diff --git a/src/main/java/com/di/jmeter/utils/FileServerExtended.java b/src/main/java/com/di/jmeter/utils/FileServerExtended.java
@@ -63,9 +63,9 @@ public class FileServerExtended {
 
     private File base;
     private static int rowCount;
-    private static ThreadLocal<Integer> endPos =  new ThreadLocal<>();
-    private static ThreadLocal<Integer> startPos =  new ThreadLocal<>();
-    private static ThreadLocal<Integer> readPos =  new ThreadLocal<>();
+    private static final ThreadLocal<Integer> endPos =  new ThreadLocal<>();
+    private static final ThreadLocal<Integer> startPos =  new ThreadLocal<>();
+    private static final ThreadLocal<Integer> readPos =  new ThreadLocal<>();
     private final Map<String, FileEntry> files = new HashMap<>();
     private static final FileServerExtended server = new FileServerExtended();
 
@@ -591,7 +591,8 @@ public void calculateRowCount(String filename, boolean ignoreFirstLine) {
         try (BufferedReader br = new BufferedReader(new FileReader(String.valueOf(fileEntry.file.toPath())))) {
             count = (int) br.lines().count();
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error(e.toString());
+
         }
         this.setRowCount(ignoreFirstLine ? count-1 : count );
     }