Merge remote-tracking branch 'upstream/master' into rename_example_prefix

Author: poseidontor

.github/pull_request_template.md

@@ -1,7 +1,7 @@
 # <Feature Title>
 
-## Fixes Issue
-- [ ] Which issue or ticket was(will be) fixed by this PR? (capture the issue number)
+## Fixed Which Issue?
+- [ ] Which issue or ticket was(will be) fixed by this PR? (capture the issue link here)
 
 PR Branch
 **_#ADD LINK TO THE PR BRANCH_**
@@ -23,6 +23,15 @@ PR Branch
 * [ ] PR doesn't break any of the earlier features for end users
   * [ ] WARNING! This might break one or more earlier earlier features, hence left a comment tagging all reviewrs
 
+* [ ] PR doesn't break the HTML report features directly
+  * [ ] Yes! I've manually run it locally and seen the HTML reports are generated perfectly fine
+  * [ ] Yes! I've opened the generated HTML reports from the `/target` folder and they look fine
+
+* [ ] PR doesn't break any HTML report features indirectly
+  * [ ] I have not added or amended any dependencies in this PR
+  * [ ] I have double checked, the new dependency added or removed has not affected the report generation indirectly
+  * [ ] Yes! I've seen the Sample report screenshots [here](https://github.com/authorjapps/zerocode/issues/694#issuecomment-2505958433), and HTML report of the current PR looks simillar.
+
 * [ ] Branch build passed in CI
 
 * [ ] No 'package.*' in the imports

.github/workflows/main.yml

@@ -10,26 +10,46 @@ on:
       - master
 jobs:
   build:
+    strategy:
+      matrix:
+        version: [8, 11, 17, 21, 23]
+      fail-fast: false
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Setting up JDK8
-        uses: actions/setup-java@v3
+      - name: Setting up JDK ${{ matrix.version }}
+        uses: actions/setup-java@v4
         with:
-          java-version: '8'
-          distribution: 'adopt'
-
-      - name: Install Docker Compose
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y docker-compose
-          
+          java-version: "${{ matrix.version }}"
+          distribution: 'temurin'
+          cache: 'maven'
+
       - name: Running Kafka
-        run: docker-compose -f docker/compose/kafka-schema-registry.yml up -d && sleep 10
+        run: docker compose -f docker/compose/kafka-schema-registry.yml up -d && sleep 10
 
       - name: Running PostgreSQL (to test DB SQL Executor)
-        run: docker-compose -f docker/compose/pg_compose.yml up -d
+        run: docker compose -f docker/compose/pg_compose.yml up -d
 
       - name: Building and testing the changes
-        run: mvn clean test
+        run: mvn clean test -ntp
+
+      - if: always()
+        name: Junit html report
+        uses: javiertuya/junit-report-action@v1.3.0
+        with:
+          surefire-files: "**/target/surefire-reports/TEST-*.xml"
+          report-dir: target/reports
+
+      - if: always()
+        name: Interactive and granular reports
+        run: cp core/target/*.html target/reports/ && cp core/target/*.csv target/reports/
+
+      - if: always()
+        name: Publish test report files
+        uses: actions/upload-artifact@v4.6.2
+        with:
+          name: "test-report-java${{ matrix.version }}"
+          path: |
+            target/reports
+            !target/reports/someFileName.html

core/pom.xml

@@ -62,10 +62,6 @@
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.univocity</groupId>
-            <artifactId>univocity-parsers</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
@@ -116,11 +112,6 @@
             <groupId>com.google.classpath-explorer</groupId>
             <artifactId>classpath-explorer</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jukito</groupId>
-            <artifactId>jukito</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
@@ -150,6 +141,11 @@
             <artifactId>junit</artifactId>
             <!--<scope>test</scope>--> <!-- added with compile scope. Do not change this -->
         </dependency>
+         <dependency>
+             <groupId>org.mockito</groupId>
+             <artifactId>mockito-core</artifactId>
+             <scope>test</scope>
+         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>

core/src/main/java/org/jsmart/zerocode/core/db/DbCsvLoader.java

@@ -10,20 +10,20 @@
 
 import org.apache.commons.dbutils.QueryRunner;
 import org.apache.commons.lang3.StringUtils;
+import org.jsmart.zerocode.core.di.provider.CsvParserProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.univocity.parsers.csv.CsvParser;
 
 /**
  * Data loading in the database from a CSV external source
  */
 class DbCsvLoader {
 	private static final Logger LOGGER = LoggerFactory.getLogger(DbCsvLoader.class);
 	private Connection conn;
-	private CsvParser csvParser;
+	private CsvParserProvider csvParser;
 
-	public DbCsvLoader(Connection conn, CsvParser csvParser) {
+	public DbCsvLoader(Connection conn, CsvParserProvider csvParser) {
 		this.conn = conn;
 		this.csvParser = csvParser;
 	}

core/src/main/java/org/jsmart/zerocode/core/db/DbSqlExecutor.java

@@ -3,9 +3,9 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
-import com.univocity.parsers.csv.CsvParser;
 
 import org.apache.commons.dbutils.DbUtils;
+import org.jsmart.zerocode.core.di.provider.CsvParserProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import java.sql.Connection;
@@ -36,7 +36,7 @@ public class DbSqlExecutor {
 	@Named("db.driver.password") private String password;
 
     @Inject
-    private CsvParser csvParser;
+    private CsvParserProvider csvParser;
 
 	/**
 	 * The LOADCSV operation inserts the content of a CSV file into a table,

core/src/main/java/org/jsmart/zerocode/core/di/module/CsvParserModule.java

@@ -2,15 +2,15 @@
 
 import com.google.inject.Binder;
 import com.google.inject.Module;
-import com.univocity.parsers.csv.CsvParser;
 import jakarta.inject.Singleton;
+import org.jsmart.zerocode.core.di.provider.CsvParserInterface;
 import org.jsmart.zerocode.core.di.provider.CsvParserProvider;
 
 public class CsvParserModule implements Module {
 
     @Override
     public void configure(Binder binder) {
-        binder.bind(CsvParser.class).toProvider(CsvParserProvider.class).in(Singleton.class);
+        binder.bind(CsvParserInterface.class).toProvider(CsvParserProvider.class).in(Singleton.class);
     }
 }
 

core/src/main/java/org/jsmart/zerocode/core/di/module/OptionalTypeAdapter.java

@@ -0,0 +1,38 @@
+package org.jsmart.zerocode.core.di.module;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.util.Optional;
+
+public class OptionalTypeAdapter<T> extends TypeAdapter<Optional<T>> {
+    private final TypeAdapter<T> delegate;
+
+    public OptionalTypeAdapter(TypeAdapter<T> delegate) {
+        this.delegate = delegate;
+    }
+
+    @Override
+    public void write(JsonWriter out, Optional<T> value) throws IOException {
+        if (value == null || !value.isPresent()) {
+            out.nullValue();
+        } else {
+            delegate.write(out, value.get());
+        }
+    }
+
+    @Override
+    public Optional<T> read(JsonReader in) throws IOException {
+        if (in.peek() == com.google.gson.stream.JsonToken.NULL) {
+            in.nextNull();
+            return Optional.empty();
+        } else {
+            return Optional.ofNullable(delegate.read(in));
+        }
+    }
+
+    public static <T> TypeAdapter<Optional<T>> factory(TypeAdapter<T> delegate) {
+        return new OptionalTypeAdapter<>(delegate);
+    }
+}

core/src/main/java/org/jsmart/zerocode/core/di/module/OptionalTypeAdapterFactory.java

@@ -0,0 +1,29 @@
+package org.jsmart.zerocode.core.di.module;
+
+import com.google.gson.Gson;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Optional;
+
+public class OptionalTypeAdapterFactory implements TypeAdapterFactory {
+
+    @Override
+    public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> typeToken) {
+        if (!Optional.class.isAssignableFrom(typeToken.getRawType())) {
+            return null;
+        }
+
+        Type type = typeToken.getType();
+        if (type instanceof ParameterizedType) {
+            Type elementType = ((ParameterizedType) type).getActualTypeArguments()[0];
+            TypeAdapter<?> elementAdapter = gson.getAdapter(TypeToken.get(elementType));
+            return (TypeAdapter<T>) OptionalTypeAdapter.factory(elementAdapter);
+        }
+
+        return null;
+    }
+}

core/src/main/java/org/jsmart/zerocode/core/di/provider/CsvParserConfig.java

@@ -0,0 +1,72 @@
+package org.jsmart.zerocode.core.di.provider;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * /
+ *  Configuration class for parsing CSV files with Jackson's CSV module,
+ *  using a custom deserializer to maintain compatibility with non-standard formats previously handled by uniVocity.
+ *
+ */
+public class CsvParserConfig {
+
+    public static class CustomStringDeserializer extends StdDeserializer<String> {
+        // Immutable map of replacement rules: pattern → replacement
+        private static final Map<String, String> REPLACEMENTS = createReplacements();
+
+        /**
+         * Creates an immutable map of replacement rules for escape patterns.
+         * @return A map containing patterns and their replacements.
+         */
+        private static Map<String, String> createReplacements() {
+            Map<String, String> map = new HashMap<>();
+            map.put("\\'", "'"); // Backslash-escaped single quote
+            map.put("''", "'");  // Double single quote (single-quoted CSV)
+            map.put("\\\\", "\\"); // Double backslash to preserve literal backslash
+            return Collections.unmodifiableMap(map);
+        }
+
+        public CustomStringDeserializer() {
+            super(String.class);
+        }
+
+        /**
+         * Deserializes a String value from the CSV parser, applying custom escape pattern replacements.
+         * <p>
+         * The method processes the input string to handle non-standard escape patterns required
+         * for the expected output (e.g., <code>["a'c", "d\"f", "x\y"]</code>). It uses a stream-based
+         * approach to apply replacements only when the pattern is present, ensuring efficiency.
+         * <p>
+         * Without this deserializer, Jackson's default CSV parser may:
+         * <ul>
+         *     <li>Strip literal backslashes (e.g., <code>x\y</code> becomes <code>xy</code>).</li>
+         *     <li>Misinterpret single-quote escaping (e.g., <code>\'</code> or <code>''</code>).</li>
+         * </ul>
+         * <p>
+         * This implementation ensures compatibility with the previous CSV parsing library's behavior
+         * and handles inputs like <code>"a'c","d""f","x\y"</code> or <code>"a\'c","d\"f","x\y"</code>.
+         *
+         * @return The processed string with escape patterns replaced, or null if the input is null.
+         * @throws IOException If an I/O error occurs during parsing.
+         */
+        @Override
+        public String deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+            final String value = p.getText();
+            if (Objects.isNull(value)) {
+                return null;
+            }
+            return REPLACEMENTS.entrySet().stream()
+                    .filter(entry -> value.contains(entry.getKey()))
+                    .reduce(value, (current, entry) -> current.replace(entry.getKey(), entry.getValue()), (v1, v2) -> v1);
+        }
+    }
+
+}

core/src/main/java/org/jsmart/zerocode/core/di/provider/CsvParserInterface.java

@@ -0,0 +1,21 @@
+package org.jsmart.zerocode.core.di.provider;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+/**
+ * Defines a contract for parsing a single line of CSV data into a string array.
+ * Implementations should handle CSV lines with a specified format, such as
+ * comma-separated fields with optional quoting and escaping.
+ */
+public interface CsvParserInterface {
+    /**
+     * Parses a single line of CSV data into an array of fields.
+     *
+     * @param line the CSV line to parse, which may include quoted fields and escaped characters
+     * @return an array of strings representing the parsed fields; may be empty if the line is invalid
+     * @throws IOException if an error occurs during parsing, such as malformed CSV data
+     */
+    String[] parseLine(final String line) throws IOException;
+}