Merge 12dcf7c into b597b7c

Author: qcdyx

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<>();
 

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();

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));
+      }
+    }
+  }
+}

main/src/test/java/org/mobilitydata/gtfsvalidator/validator/MissingFeedInfoValidatorTest.java

@@ -0,0 +1,43 @@
+package org.mobilitydata.gtfsvalidator.validator;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import java.util.List;
+import org.junit.Test;
+import org.mobilitydata.gtfsvalidator.notice.MissingRecommendedFileNotice;
+import org.mobilitydata.gtfsvalidator.notice.MissingRequiredFileNotice;
+import org.mobilitydata.gtfsvalidator.notice.NoticeContainer;
+import org.mobilitydata.gtfsvalidator.notice.ValidationNotice;
+import org.mobilitydata.gtfsvalidator.table.*;
+
+public class MissingFeedInfoValidatorTest {
+
+  private static List<ValidationNotice> generateNotices(
+      GtfsFeedInfoTableContainer feedInfoTableContainer,
+      GtfsTranslationTableContainer translationTableContainer) {
+    NoticeContainer noticeContainer = new NoticeContainer();
+    new MissingFeedInfoValidator(feedInfoTableContainer, translationTableContainer)
+        .validate(noticeContainer);
+    return noticeContainer.getValidationNotices();
+  }
+
+  @Test
+  public void missingFeedInfoTranslationTableNotPresent() {
+    assertThat(
+            generateNotices(
+                GtfsFeedInfoTableContainer.forStatus(GtfsTableContainer.TableStatus.MISSING_FILE),
+                GtfsTranslationTableContainer.forStatus(
+                    GtfsTableContainer.TableStatus.MISSING_FILE)))
+        .containsExactly(new MissingRecommendedFileNotice(GtfsFeedInfo.FILENAME));
+  }
+
+  @Test
+  public void missingFeedInfoWhenTranslationTableIsPresent() {
+    assertThat(
+            generateNotices(
+                GtfsFeedInfoTableContainer.forStatus(GtfsTableContainer.TableStatus.MISSING_FILE),
+                GtfsTranslationTableContainer.forStatus(
+                    GtfsTableContainer.TableStatus.PARSABLE_HEADERS_AND_ROWS)))
+        .contains(new MissingRequiredFileNotice(GtfsFeedInfo.FILENAME));
+  }
+}