From 1e6769a2d4f4018a63b6680264bd318a913ea6ce Mon Sep 17 00:00:00 2001
From: Robin Beer <robin.beer@arcadis.com>
Date: Wed, 13 Nov 2024 09:06:27 +0000
Subject: [PATCH] refactor(Update to make use of the new CSVReaderUtil):

---
 pom.xml                                                    | 2 +-
 .../datatools/manager/jobs/feedmerge/MergeLineContext.java | 3 ++-
 .../manager/jobs/feedmerge/StopsMergeLineContext.java      | 3 ++-
 .../models/transform/NormalizeFieldTransformation.java     | 7 ++++++-
 .../conveyal/datatools/manager/utils/MergeFeedUtils.java   | 5 +++--
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index d23073715..934e52c58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -271,7 +271,7 @@
         <dependency>
             <groupId>com.github.ibi-group</groupId>
             <artifactId>gtfs-lib</artifactId>
-            <version>c9908447dad0720cd606c3c753752e6850f7b572</version>
+            <version>14f98acdf4a6bc0a496d7e808531b605a9c1d8cf</version>
             <!-- Latest dev-flex build on jitpack.io -->
             <!-- Exclusions added in order to silence SLF4J warnings about multiple bindings:
                 http://www.slf4j.org/codes.html#multiple_bindings
diff --git a/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/MergeLineContext.java b/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/MergeLineContext.java
index 51b5a255c..380b2d603 100644
--- a/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/MergeLineContext.java
+++ b/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/MergeLineContext.java
@@ -7,6 +7,7 @@
 import com.conveyal.gtfs.loader.Field;
 import com.conveyal.gtfs.loader.ReferenceTracker;
 import com.conveyal.gtfs.loader.Table;
+import com.conveyal.gtfs.util.CsvReaderUtil;
 import com.csvreader.CsvReader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -131,7 +132,7 @@ public void startNewFeed(int feedIndex) throws IOException {
         keyFieldMissing = false;
 
         idScope = makeIdScope(version);
-        csvReader = table.getCsvReader(feed.zipFile, null);
+        csvReader = CsvReaderUtil.getCsvReaderAccordingToFileName(table, feed.zipFile, null);
         // If csv reader is null, the table was not found in the zip file. There is no need
         // to handle merging this table for this zip file.
         // No need to iterate over second (active) file if strategy is to simply extend the future GTFS
diff --git a/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/StopsMergeLineContext.java b/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/StopsMergeLineContext.java
index 4644c8c3a..c1d69f604 100644
--- a/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/StopsMergeLineContext.java
+++ b/src/main/java/com/conveyal/datatools/manager/jobs/feedmerge/StopsMergeLineContext.java
@@ -4,6 +4,7 @@
 import com.conveyal.gtfs.error.NewGTFSError;
 import com.conveyal.gtfs.loader.Field;
 import com.conveyal.gtfs.loader.Table;
+import com.conveyal.gtfs.util.CsvReaderUtil;
 import com.csvreader.CsvReader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -74,7 +75,7 @@ private void checkThatStopCodesArePopulatedWhereRequired() throws IOException {
             int stopCodeIndex = getFieldIndex("stop_code");
             // Get special stops reader to iterate over every stop and determine if stop_code values
             // are present.
-            CsvReader stopsReader = table.getCsvReader(feed.zipFile, null);
+            CsvReader stopsReader = CsvReaderUtil.getCsvReaderAccordingToFileName(table, feed.zipFile, null);
             while (stopsReader.readRecord()) {
                 stopsCount++;
                 // Special stop records (i.e., a station, entrance, or anything with
diff --git a/src/main/java/com/conveyal/datatools/manager/models/transform/NormalizeFieldTransformation.java b/src/main/java/com/conveyal/datatools/manager/models/transform/NormalizeFieldTransformation.java
index f06840ed8..515523b04 100644
--- a/src/main/java/com/conveyal/datatools/manager/models/transform/NormalizeFieldTransformation.java
+++ b/src/main/java/com/conveyal/datatools/manager/models/transform/NormalizeFieldTransformation.java
@@ -6,6 +6,7 @@
 import com.conveyal.datatools.manager.utils.json.JsonUtil;
 import com.conveyal.gtfs.loader.Field;
 import com.conveyal.gtfs.loader.Table;
+import com.conveyal.gtfs.util.CsvReaderUtil;
 import com.csvreader.CsvReader;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.WordUtils;
@@ -198,7 +199,11 @@ public void transform(FeedTransformZipTarget zipTarget, MonitorableJob.Status st
             Files.copy(originalZipPath, tempZipPath, StandardCopyOption.REPLACE_EXISTING);
 
             Table gtfsTable = GtfsUtils.getGtfsTable(table);
-            CsvReader csvReader = gtfsTable.getCsvReader(new ZipFile(tempZipPath.toAbsolutePath().toString()), null);
+            CsvReader csvReader = CsvReaderUtil.getCsvReaderAccordingToFileName(
+                gtfsTable,
+                new ZipFile(tempZipPath.toAbsolutePath().toString()),
+                null
+            );
             final String[] headers = csvReader.getHeaders();
             Field[] fieldsFoundInZip = gtfsTable.getFieldsFromFieldHeaders(headers, null);
             int transformFieldIndex = getFieldIndex(fieldsFoundInZip, fieldName);
diff --git a/src/main/java/com/conveyal/datatools/manager/utils/MergeFeedUtils.java b/src/main/java/com/conveyal/datatools/manager/utils/MergeFeedUtils.java
index 0205ef003..606c39a4d 100644
--- a/src/main/java/com/conveyal/datatools/manager/utils/MergeFeedUtils.java
+++ b/src/main/java/com/conveyal/datatools/manager/utils/MergeFeedUtils.java
@@ -15,6 +15,7 @@
 import com.conveyal.gtfs.loader.Field;
 import com.conveyal.gtfs.loader.Table;
 import com.conveyal.gtfs.model.StopTime;
+import com.conveyal.gtfs.util.CsvReaderUtil;
 import com.csvreader.CsvReader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,7 +46,7 @@ public class MergeFeedUtils {
     public static Set<String> getIdsForTable(ZipFile zipFile, Table table) throws IOException {
         Set<String> ids = new HashSet<>();
         String keyField = table.getKeyFieldName();
-        CsvReader csvReader = table.getCsvReader(zipFile, null);
+        CsvReader csvReader = CsvReaderUtil.getCsvReaderAccordingToFileName(table, zipFile, null);
         if (csvReader == null) {
             LOG.warn("Table {} not found in zip file: {}", table.name, zipFile.getName());
             return ids;
@@ -117,7 +118,7 @@ public static Set<Field> getAllFields(List<FeedToMerge> feedsToMerge, Table tabl
         Set<Field> sharedFields = new HashSet<>();
         // First, iterate over each feed to collect the shared fields that need to be output in the merged table.
         for (FeedToMerge feed : feedsToMerge) {
-            CsvReader csvReader = table.getCsvReader(feed.zipFile, null);
+            CsvReader csvReader = CsvReaderUtil.getCsvReaderAccordingToFileName(table, feed.zipFile, null);
             // If csv reader is null, the table was not found in the zip file.
             if (csvReader == null) {
                 continue;