Merge ccf38f8 into b597b7c

qcdyx · web-flow · commit 0b24cc986391 · 2024-08-23T11:09:59.000-04:00
diff --git a/core/src/main/java/org/mobilitydata/gtfsvalidator/table/AnyTableLoader.java b/core/src/main/java/org/mobilitydata/gtfsvalidator/table/AnyTableLoader.java
@@ -32,10 +32,14 @@ public final class AnyTableLoader {
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
   private static final List<Class<? extends FileValidator>> singleFileValidatorsWithParsingErrors =
       new ArrayList<>();
-
+  private static boolean hasTranslations = false;
   private static final List<Class<? extends SingleEntityValidator>>
       singleEntityValidatorsWithParsingErrors = new ArrayList<>();
 
+  public static void setHasTranslations(boolean translations) {
+    hasTranslations = translations;
+  }
+
   public List<Class<? extends FileValidator>> getValidatorsWithParsingErrors() {
     return Collections.unmodifiableList(singleFileValidatorsWithParsingErrors);
   }
@@ -206,7 +210,11 @@ public static GtfsTableContainer loadMissingFile(
         tableDescriptor.createContainerForInvalidStatus(
             GtfsTableContainer.TableStatus.MISSING_FILE);
     if (tableDescriptor.isRecommended()) {
-      noticeContainer.addValidationNotice(new MissingRecommendedFileNotice(gtfsFilename));
+      if (hasTranslations && gtfsFilename.contains("feed_info")) {
+        noticeContainer.addValidationNotice(new MissingRequiredFileNotice(gtfsFilename));
+      } else {
+        noticeContainer.addValidationNotice(new MissingRecommendedFileNotice(gtfsFilename));
+      }
     }
     if (tableDescriptor.isRequired()) {
       noticeContainer.addValidationNotice(new MissingRequiredFileNotice(gtfsFilename));
diff --git a/core/src/main/java/org/mobilitydata/gtfsvalidator/table/GtfsFeedLoader.java b/core/src/main/java/org/mobilitydata/gtfsvalidator/table/GtfsFeedLoader.java
@@ -100,6 +100,9 @@ public GtfsFeedContainer loadAndValidate(
     Map<String, GtfsTableDescriptor<?>> remainingDescriptors =
         (Map<String, GtfsTableDescriptor<?>>) tableDescriptors.clone();
     for (String filename : gtfsInput.getFilenames()) {
+      if (filename.contains("translations")) {
+        AnyTableLoader.setHasTranslations(true);
+      }
       GtfsTableDescriptor<?> tableDescriptor = remainingDescriptors.remove(filename.toLowerCase());
       if (tableDescriptor == null) {
         noticeContainer.addValidationNotice(new UnknownFileNotice(filename));
diff --git a/core/src/main/java/org/mobilitydata/gtfsvalidator/table/GtfsTableDescriptor.java b/core/src/main/java/org/mobilitydata/gtfsvalidator/table/GtfsTableDescriptor.java
@@ -12,6 +12,9 @@ public abstract class GtfsTableDescriptor<T extends GtfsEntity> {
   // True if the specified file is required in a feed.
   private boolean required;
 
+  // True if the specified file is conditionally required.
+  private boolean conditionallyRequired;
+
   public abstract GtfsTableContainer createContainerForInvalidStatus(
       GtfsTableContainer.TableStatus tableStatus);
 
@@ -36,6 +39,14 @@ public void setRequired(boolean required) {
     this.required = required;
   }
 
+  public boolean isConditionallyRequired() {
+    return this.conditionallyRequired;
+  }
+
+  public void setConditionallyRequired(boolean conditionallyRequired) {
+    this.conditionallyRequired = conditionallyRequired;
+  }
+
   public abstract Optional<Integer> maxCharsPerColumn();
 
   public abstract ImmutableList<GtfsColumnDescriptor> getColumns();
