From d0781192c7d05326e0dd050618cad9b0ec928cdb Mon Sep 17 00:00:00 2001
From: Jingsi Lu <jingsi@mobilitydata.org>
Date: Wed, 28 Jun 2023 12:21:24 -0400
Subject: [PATCH] remove "feedContactEmail" and "feedContactUrl" as they are
 either null or empty in the case of MissingFeedContactEmailAndUrlNotice

---
 .../validator/FeedContactValidator.java            | 14 ++------------
 .../validator/FeedContactValidatorTest.java        |  2 +-
 .../gtfsvalidator/validator/NoticeFieldsTest.java  |  4 +---
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/main/src/main/java/org/mobilitydata/gtfsvalidator/validator/FeedContactValidator.java b/main/src/main/java/org/mobilitydata/gtfsvalidator/validator/FeedContactValidator.java
index 1a4d97f98a..0e371a152b 100644
--- a/main/src/main/java/org/mobilitydata/gtfsvalidator/validator/FeedContactValidator.java
+++ b/main/src/main/java/org/mobilitydata/gtfsvalidator/validator/FeedContactValidator.java
@@ -29,8 +29,7 @@ public void validate(GtfsFeedInfo entity, NoticeContainer noticeContainer) {
     if (!entity.hasFeedContactEmail() && !entity.hasFeedContactUrl()
         || entity.feedContactEmail().isBlank() && entity.feedContactUrl().isBlank()) {
       noticeContainer.addValidationNotice(
-          new MissingFeedContactEmailAndUrlNotice(
-              entity.csvRowNumber(), entity.feedContactEmail(), entity.feedContactUrl()));
+          new MissingFeedContactEmailAndUrlNotice(entity.csvRowNumber()));
     }
   }
 
@@ -52,17 +51,8 @@ static class MissingFeedContactEmailAndUrlNotice extends ValidationNotice {
     /** The row number of the validated record. */
     private final int rowNumber;
 
-    /** The email contact information of a feed. */
-    private final String feedContactEmail;
-
-    /** The url contact information of a feed. */
-    private final String feedContactUrl;
-
-    MissingFeedContactEmailAndUrlNotice(
-        int rowNumber, String feedContactEmail, String feedContactUrl) {
+    MissingFeedContactEmailAndUrlNotice(int rowNumber) {
       this.rowNumber = rowNumber;
-      this.feedContactEmail = feedContactEmail;
-      this.feedContactUrl = feedContactUrl;
     }
   }
 }
diff --git a/main/src/test/java/org/mobilitydata/gtfsvalidator/validator/FeedContactValidatorTest.java b/main/src/test/java/org/mobilitydata/gtfsvalidator/validator/FeedContactValidatorTest.java
index 0165223c8d..14063fa302 100644
--- a/main/src/test/java/org/mobilitydata/gtfsvalidator/validator/FeedContactValidatorTest.java
+++ b/main/src/test/java/org/mobilitydata/gtfsvalidator/validator/FeedContactValidatorTest.java
@@ -182,6 +182,6 @@ public void nonFeedContactEmailAndUrlShouldGenerateNotice() {
     FeedContactValidator underTest = new FeedContactValidator();
     underTest.validate(entity, noticeContainer);
     assertThat(noticeContainer.getValidationNotices())
-        .containsExactly(new FeedContactValidator.MissingFeedContactEmailAndUrlNotice(2, "", ""));
+        .containsExactly(new FeedContactValidator.MissingFeedContactEmailAndUrlNotice(2));
   }
 }
diff --git a/main/src/test/java/org/mobilitydata/gtfsvalidator/validator/NoticeFieldsTest.java b/main/src/test/java/org/mobilitydata/gtfsvalidator/validator/NoticeFieldsTest.java
index 0b131d1eff..3fed46aaf8 100644
--- a/main/src/test/java/org/mobilitydata/gtfsvalidator/validator/NoticeFieldsTest.java
+++ b/main/src/test/java/org/mobilitydata/gtfsvalidator/validator/NoticeFieldsTest.java
@@ -190,9 +190,7 @@ public void testNoticeClassFieldNames() {
             "tripIdB",
             "tripIdFieldName",
             "validator",
-            "value",
-            "feedContactEmail",
-            "feedContactUrl");
+            "value");
   }
 
   private static List<String> discoverValidationNoticeFieldNames() {