Made code multithread safe. (#1653)

MobilityData · Jan 19, 2024 · 18952e4 · 18952e4
1 parent 86f9484
commit 18952e4
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/main/src/main/java/org/mobilitydata/gtfsvalidator/runner/ValidationRunner.java b/main/src/main/java/org/mobilitydata/gtfsvalidator/runner/ValidationRunner.java
@@ -30,6 +30,7 @@
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
 import org.mobilitydata.gtfsvalidator.input.DateForValidation;
 import org.mobilitydata.gtfsvalidator.input.GtfsInput;
 import org.mobilitydata.gtfsvalidator.notice.IOError;
@@ -51,7 +52,6 @@ public class ValidationRunner {
 
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
   private static final String GTFS_ZIP_FILENAME = "gtfs.zip";
-  private static NoticeContainer noticeContainer;
 
   private final VersionResolver versionResolver;
 
@@ -96,11 +96,11 @@ public Status run(ValidationRunnerConfig config) {
     final long startNanos = System.nanoTime();
     // Input.
     feedLoader.setNumThreads(config.numThreads());
-    noticeContainer = new NoticeContainer();
+    NoticeContainer noticeContainer = new NoticeContainer();
     GtfsFeedContainer feedContainer;
     GtfsInput gtfsInput = null;
     try {
-      gtfsInput = createGtfsInput(config, versionInfo.currentVersion().get());
+      gtfsInput = createGtfsInput(config, versionInfo.currentVersion().get(), noticeContainer);
     } catch (IOException e) {
       logger.atSevere().withCause(e).log("Cannot load GTFS feed");
       noticeContainer.addSystemError(new IOError(e));
@@ -311,6 +311,14 @@ public static void exportReport(
    */
   public static GtfsInput createGtfsInput(ValidationRunnerConfig config, String validatorVersion)
       throws IOException, URISyntaxException {
+    return createGtfsInput(config, validatorVersion, new NoticeContainer());
+  }
+
+  private static GtfsInput createGtfsInput(
+      ValidationRunnerConfig config,
+      String validatorVersion,
+      @Nonnull NoticeContainer noticeContainer)
+      throws IOException, URISyntaxException {
     URI source = config.gtfsSource();
     if (source.getScheme().equals("file")) {
       return GtfsInput.createFromPath(Paths.get(source), noticeContainer);