Addresses comments from code review.

* Makes a method name change. * asserts that exception strings in the RequiredFilterValuesTest are as expected.
entur · Nov 27, 2024 · a621865 · a621865
1 parent 81980ba
commit a621865
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/...in/java/org/opentripplanner/apis/transmodel/model/timetable/DatedServiceJourneyQuery.java b/...in/java/org/opentripplanner/apis/transmodel/model/timetable/DatedServiceJourneyQuery.java
@@ -117,7 +117,7 @@ public static GraphQLFieldDefinition createQuery(GraphQLOutputType datedServiceJ
           "privateCodes",
           environment.<List<String>>getArgument("privateCodes")
         );
-        var operatingDays = FilterValues.ofEmptyIsInvalid(
+        var operatingDays = FilterValues.ofRequired(
           "operatingDays",
           environment.<List<LocalDate>>getArgument("operatingDays")
         );

diff --git a/application/src/main/java/org/opentripplanner/transit/api/model/FilterValues.java b/application/src/main/java/org/opentripplanner/transit/api/model/FilterValues.java
@@ -51,7 +51,7 @@ public static <E> FilterValues<E> ofEmptyIsEverything(
    * @param values - The {@link Collection} of filter values.
    * @return RequiredFilterValues
    */
-  public static <E> RequiredFilterValues<E> ofEmptyIsInvalid(
+  public static <E> RequiredFilterValues<E> ofRequired(
     String name,
     @Nullable Collection<E> values
   ) {

diff --git a/...ication/src/test/java/org/opentripplanner/transit/api/model/RequiredFilterValuesTest.java b/...ication/src/test/java/org/opentripplanner/transit/api/model/RequiredFilterValuesTest.java
@@ -9,22 +9,24 @@ class RequiredFilterValuesTest {
 
   @Test
   void testEmptyIsInvalid() {
-    assertThrows(
+    IllegalArgumentException e = assertThrows(
       IllegalArgumentException.class,
       () -> {
-        FilterValues.ofEmptyIsInvalid("empty", List.of());
+        FilterValues.ofRequired("empty", List.of());
       }
     );
+    assertEquals("Filter empty values must not be empty.", e.getMessage());
   }
 
   @Test
   void testNullIsInvalid() {
     List<String> nullList = null;
-    assertThrows(
+    IllegalArgumentException e = assertThrows(
       IllegalArgumentException.class,
       () -> {
-        FilterValues.ofEmptyIsInvalid("null", nullList);
+        FilterValues.ofRequired("null", nullList);
       }
     );
+    assertEquals("Filter null values must not be empty.", e.getMessage());
   }
 }
diff --git a/...org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactoryTest.java b/...org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactoryTest.java
@@ -103,7 +103,7 @@ void setup() {
   @Test
   void testMatchOperatingDays() {
     TripOnServiceDateRequest request = TripOnServiceDateRequest
-      .of(FilterValues.ofEmptyIsInvalid("serviceDates", List.of(LocalDate.of(2024, 2, 22))))
+      .of(FilterValues.ofRequired("serviceDates", List.of(LocalDate.of(2024, 2, 22))))
       .build();
 
     Matcher<TripOnServiceDate> matcher = TripOnServiceDateMatcherFactory.of(request);
@@ -116,7 +116,7 @@ void testMatchOperatingDays() {
   @Test
   void testMatchMultiple() {
     TripOnServiceDateRequest request = TripOnServiceDateRequest
-      .of(FilterValues.ofEmptyIsInvalid("serviceDates", List.of(LocalDate.of(2024, 2, 22))))
+      .of(FilterValues.ofRequired("serviceDates", List.of(LocalDate.of(2024, 2, 22))))
       .withAgencies(
         FilterValues.ofEmptyIsEverything("agencies", List.of(new FeedScopedId("F", "RUT:1")))
       )
@@ -141,7 +141,7 @@ void testMatchMultiple() {
   @Test
   void testMatchMultipleServiceJourneyMatchers() {
     TripOnServiceDateRequest request = TripOnServiceDateRequest
-      .of(FilterValues.ofEmptyIsInvalid("serviceDates", List.of(LocalDate.of(2024, 2, 22))))
+      .of(FilterValues.ofRequired("serviceDates", List.of(LocalDate.of(2024, 2, 22))))
       .withAgencies(
         FilterValues.ofEmptyIsEverything(
           "agencies",