Merge 6fe7e3e into b597b7c

MobilityData · Aug 27, 2024 · 3a4dbdc · 3a4dbdc
2 parents b597b7c + 6fe7e3e
commit 3a4dbdc
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 8 deletions.
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,7 +32,6 @@ public final class AnyTableLoader {
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
   private static final List<Class<? extends FileValidator>> singleFileValidatorsWithParsingErrors =
       new ArrayList<>();
-
   private static final List<Class<? extends SingleEntityValidator>>
       singleEntityValidatorsWithParsingErrors = new ArrayList<>();
 

diff --git a/main/src/main/java/org/mobilitydata/gtfsvalidator/table/GtfsFeedInfoSchema.java b/main/src/main/java/org/mobilitydata/gtfsvalidator/table/GtfsFeedInfoSchema.java
@@ -17,16 +17,11 @@
 package org.mobilitydata.gtfsvalidator.table;
 
 import java.util.Locale;
-import org.mobilitydata.gtfsvalidator.annotation.EndRange;
-import org.mobilitydata.gtfsvalidator.annotation.FieldType;
-import org.mobilitydata.gtfsvalidator.annotation.FieldTypeEnum;
-import org.mobilitydata.gtfsvalidator.annotation.GtfsTable;
-import org.mobilitydata.gtfsvalidator.annotation.Recommended;
-import org.mobilitydata.gtfsvalidator.annotation.Required;
+import org.mobilitydata.gtfsvalidator.annotation.*;
 import org.mobilitydata.gtfsvalidator.type.GtfsDate;
 
 @GtfsTable(value = "feed_info.txt", singleRow = true)
-@Recommended
+@ConditionallyRequired
 public interface GtfsFeedInfoSchema extends GtfsEntity {
   @Required
   String feedPublisherName();

diff --git a/main/src/main/java/org/mobilitydata/gtfsvalidator/validator/MissingFeedInfoValidator.java b/main/src/main/java/org/mobilitydata/gtfsvalidator/validator/MissingFeedInfoValidator.java
@@ -0,0 +1,36 @@
+package org.mobilitydata.gtfsvalidator.validator;
+
+import javax.inject.Inject;
+import org.mobilitydata.gtfsvalidator.annotation.GtfsValidator;
+import org.mobilitydata.gtfsvalidator.notice.MissingRecommendedFileNotice;
+import org.mobilitydata.gtfsvalidator.notice.MissingRequiredFileNotice;
+import org.mobilitydata.gtfsvalidator.notice.NoticeContainer;
+import org.mobilitydata.gtfsvalidator.table.GtfsFeedInfo;
+import org.mobilitydata.gtfsvalidator.table.GtfsFeedInfoTableContainer;
+import org.mobilitydata.gtfsvalidator.table.GtfsTranslationTableContainer;
+
+@GtfsValidator
+public class MissingFeedInfoValidator extends FileValidator {
+
+  private final GtfsFeedInfoTableContainer feedInfoTable;
+  private final GtfsTranslationTableContainer translationTable;
+
+  @Inject
+  public MissingFeedInfoValidator(
+      GtfsFeedInfoTableContainer feedInfoTable, GtfsTranslationTableContainer translationTable) {
+    this.feedInfoTable = feedInfoTable;
+    this.translationTable = translationTable;
+  }
+
+  @Override
+  public void validate(NoticeContainer noticeContainer) {
+    if (feedInfoTable.isMissingFile()) {
+      if (translationTable.isMissingFile()) {
+        noticeContainer.addValidationNotice(
+            new MissingRecommendedFileNotice(GtfsFeedInfo.FILENAME));
+      } else {
+        noticeContainer.addValidationNotice(new MissingRequiredFileNotice(GtfsFeedInfo.FILENAME));
+      }
+    }
+  }
+}