buffer

src/main/java/group/goforward/ballistic/services/impl/MerchantFeedImportServiceImpl.java

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 import java.io.Reader;
+import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
@@ -330,15 +331,42 @@ public class MerchantFeedImportServiceImpl implements MerchantFeedImportService
 
         List<MerchantFeedRow> rows = new ArrayList<>();
 
-        try (Reader reader = (feedUrl.startsWith("http://") || feedUrl.startsWith("https://"))
+        try (Reader baseReader = (feedUrl.startsWith("http://") || feedUrl.startsWith("https://"))
                 ? new InputStreamReader(new URL(feedUrl).openStream(), StandardCharsets.UTF_8)
                 : java.nio.file.Files.newBufferedReader(java.nio.file.Paths.get(feedUrl), StandardCharsets.UTF_8);
-             CSVParser parser = CSVFormat.DEFAULT
+             BufferedReader reader = new BufferedReader(baseReader)) {
-                     .withFirstRecordAsHeader()
-                     .withIgnoreSurroundingSpaces()
-                     .withTrim()
-                     .parse(reader)) {
 
+            // --- Step 1: peek at the first line to detect delimiter ---
+            reader.mark(10_000);
+            String firstLine = reader.readLine();
+            reader.reset();
+
+            if (firstLine == null || firstLine.isEmpty()) {
+                throw new RuntimeException("Empty feed received from " + feedUrl);
+            }
+
+            // --- Step 2: detect delimiter (TSV vs CSV) ---
+            char delimiter;
+            if (firstLine.contains("\t")) {
+                delimiter = '\t'; // TSV (AvantLink-style)
+            } else if (firstLine.contains(",")) {
+                delimiter = ',';  // CSV
+            } else {
+                // Fallback: default to comma
+                delimiter = ',';
+            }
+
+            // --- Step 3: build CSVFormat with detected delimiter ---
+            CSVFormat format = CSVFormat.DEFAULT.builder()
+                    .setDelimiter(delimiter)
+                    .setHeader()
+                    .setSkipHeaderRecord(true)
+                    .setIgnoreSurroundingSpaces(true)
+                    .setTrim(true)
+                    .build();
+
+            // --- Step 4: parse the rows into MerchantFeedRow records ---
+            try (CSVParser parser = new CSVParser(reader, format)) {
                 for (CSVRecord rec : parser) {
                     MerchantFeedRow row = new MerchantFeedRow(
                             rec.get("SKU"),
@@ -369,6 +397,7 @@ public class MerchantFeedImportServiceImpl implements MerchantFeedImportService
 
                     rows.add(row);
                 }
+            }
         } catch (Exception ex) {
             throw new RuntimeException("Failed to read feed for merchant "
                     + merchant.getName() + " from " + feedUrl, ex);