Fixed file creation issue. Now plugin creates CSV file when there is …

…data to write.
mderevyankoaqa · Feb 16, 2022 · 37b98e0 · 37b98e0
1 parent a858524
commit 37b98e0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ repositories {
 }
 
 sourceCompatibility = 11
-version = '1.0'
+version = '1.1'
 def title = 'JMeterCSVListener'
 def archiveName = 'jmeter-plugin-csv-listener'
 

diff --git a/src/main/java/org/md/jmeter/csv/results/writer/CsvBackendListenerClient.java b/src/main/java/org/md/jmeter/csv/results/writer/CsvBackendListenerClient.java
@@ -163,7 +163,7 @@ public void handleSampleResults(List<SampleResult> sampleResults, BackendListene
                 Result resultToWrite = ResultController.process(this.resultContext, result);
 
                 if (resultToWrite != null) {
-                    String separator = this.resultContext.getBackendListenerContext().getParameter(KEY_SEPARATOR);
+
                     String resultRow = ResultRow.getRow(this.resultContext, result);
                     Writer.getInstance(this.resultContext, LOGGER).collectData(resultRow);
                 }

diff --git a/src/main/java/org/md/jmeter/csv/results/writer/csv/Writer.java b/src/main/java/org/md/jmeter/csv/results/writer/csv/Writer.java
@@ -98,19 +98,20 @@ public synchronized void close() {
      */
     public synchronized void writeData() {
 
-        if (!this.isHeaderWritten)
-        {
-            this.writeHeader();
-            this.isHeaderWritten = true;
-        }
-
-        if (this.results.size() != 0) {
+         if (this.results.size() != 0) {
             try {
 
-                long start = System.currentTimeMillis();
+                // Write header and setup the file while the first things writing - one time.
+                if (!this.isHeaderWritten)
+                {
+                    this.writeHeader();
+                    this.isHeaderWritten = true;
+                }
+
                 String results = getString(this.results);
-                this.writeStrings(Objects.requireNonNull(results));
 
+                long start = System.currentTimeMillis();
+                this.writeStrings(Objects.requireNonNull(results));
                 long end = System.currentTimeMillis();
 
                 LOGGER.info("Data has been written successfully, batch with size is --> " + this.results.size() + ", elapsed time is --> " + (end - start) + " ms");
@@ -119,9 +120,7 @@ public synchronized void writeData() {
                 LOGGER.debug("Results have been cleaned");
 
             } catch (Exception e) {
-
                 LOGGER.error("Error has occurred, batch with size " + this.results.size() + " was not imported, see the details --> " + e.getMessage());
-
             }
         }
     }
@@ -135,7 +134,6 @@ public synchronized void setupClient() {
         LOGGER.info("The Path : " + path + " is going to be used.");
 
         this.csvFile = new File(path);
-
     }
 
     /**
@@ -151,7 +149,6 @@ private synchronized void writeHeader()
         this.writeStrings(header);
     }
 
-
     /**
      * Checks the batch size.
      */

diff --git a/src/main/java/org/md/jmeter/csv/results/writer/result/Response.java b/src/main/java/org/md/jmeter/csv/results/writer/result/Response.java
@@ -73,7 +73,7 @@ public void setBody(String body) {
 
     /**
      * Gets the assertion error message in case of error.
-     * @return theassertion error message in case of error.
+     * @return the assertion error message in case of error.
      */
     public String getAssertionError() {
         return this.assertionError;