# This is a combination of 3 commits.

# This is the 1st commit message:

Refactor NetexEntitiesTestFactory and unit tests.

# The commit message #2 will be skipped:

# Interchange wait time and active dates validation

# The commit message #3 will be skipped:

# Interchange wait time and active dates validation

src/main/java/no/entur/antu/config/NetexDataConfig.java

@@ -1,7 +1,10 @@
 package no.entur.antu.config;
 
+import static no.entur.antu.config.cache.CacheConfig.ACTIVE_DATES_CACHE;
 import static no.entur.antu.config.cache.CacheConfig.LINE_INFO_CACHE;
+import static no.entur.antu.config.cache.CacheConfig.SERVICE_JOURNEY_DAY_TYPES_CACHE;
 import static no.entur.antu.config.cache.CacheConfig.SERVICE_JOURNEY_INTERCHANGE_INFO_CACHE;
+import static no.entur.antu.config.cache.CacheConfig.SERVICE_JOURNEY_OPERATING_DAYS_CACHE;
 import static no.entur.antu.config.cache.CacheConfig.SERVICE_JOURNEY_STOPS_CACHE;
 
 import java.util.List;
@@ -25,6 +28,15 @@ NetexDataRepository netexDataRepository(
     @Qualifier(
       SERVICE_JOURNEY_STOPS_CACHE
     ) Map<String, Map<String, List<String>>> serviceJourneyStopsCache,
+    @Qualifier(
+      SERVICE_JOURNEY_DAY_TYPES_CACHE
+    ) Map<String, Map<String, String>> serviceJourneyDayTypesCache,
+    @Qualifier(
+      ACTIVE_DATES_CACHE
+    ) Map<String, Map<String, String>> activeDatesCache,
+    @Qualifier(
+      SERVICE_JOURNEY_OPERATING_DAYS_CACHE
+    ) Map<String, Map<String, String>> serviceJourneyOperatingDaysCache,
     @Qualifier(
       SERVICE_JOURNEY_INTERCHANGE_INFO_CACHE
     ) Map<String, List<String>> serviceJourneyInterchangeInfoCache
@@ -33,6 +45,9 @@ NetexDataRepository netexDataRepository(
       redissonClient,
       lineInfoCache,
       serviceJourneyStopsCache,
+      serviceJourneyDayTypesCache,
+      activeDatesCache,
+      serviceJourneyOperatingDaysCache,
       serviceJourneyInterchangeInfoCache
     );
   }

src/main/java/no/entur/antu/config/TimetableDataValidatorConfig.java

@@ -18,15 +18,19 @@
 
 import java.util.List;
 import java.util.Set;
+import no.entur.antu.netexdata.collectors.DatedServiceJourneysCollector;
 import no.entur.antu.netexdata.collectors.LineInfoCollector;
+import no.entur.antu.netexdata.collectors.ServiceJourneyDayTypesCollector;
 import no.entur.antu.netexdata.collectors.ServiceJourneyInterchangeInfoCollector;
 import no.entur.antu.netexdata.collectors.ServiceJourneyStopsCollector;
+import no.entur.antu.netexdata.collectors.activedatecollector.ActiveDatesCollector;
 import no.entur.antu.organisation.OrganisationRepository;
 import no.entur.antu.validation.validator.id.NetexIdValidator;
 import no.entur.antu.validation.validator.interchange.distance.UnexpectedInterchangeDistanceValidator;
 import no.entur.antu.validation.validator.interchange.duplicate.DuplicateInterchangesValidator;
 import no.entur.antu.validation.validator.interchange.mandatoryfields.MandatoryFieldsValidator;
 import no.entur.antu.validation.validator.interchange.stoppoints.StopPointsInVehicleJourneyValidator;
+import no.entur.antu.validation.validator.interchange.waittime.UnexpectedWaitTimeAndActiveDatesValidator;
 import no.entur.antu.validation.validator.journeypattern.stoppoint.distance.UnexpectedDistanceBetweenStopPointsValidator;
 import no.entur.antu.validation.validator.journeypattern.stoppoint.identicalstoppoints.IdenticalStopPointsValidator;
 import no.entur.antu.validation.validator.journeypattern.stoppoint.samequayref.SameQuayRefValidator;
@@ -41,7 +45,10 @@
 import no.entur.antu.validation.validator.servicelink.distance.UnexpectedDistanceInServiceLinkValidator;
 import no.entur.antu.validation.validator.servicelink.stoppoints.MismatchedStopPointsValidator;
 import no.entur.antu.validation.validator.xpath.EnturTimetableDataValidationTreeFactory;
-import org.entur.netex.validation.validator.*;
+import org.entur.netex.validation.validator.DatasetValidator;
+import org.entur.netex.validation.validator.NetexValidatorsRunner;
+import org.entur.netex.validation.validator.ValidationReportEntryFactory;
+import org.entur.netex.validation.validator.XPathValidator;
 import org.entur.netex.validation.validator.id.NetexIdUniquenessValidator;
 import org.entur.netex.validation.validator.id.NetexReferenceValidator;
 import org.entur.netex.validation.validator.id.ReferenceToValidEntityTypeValidator;
@@ -180,6 +187,19 @@ public DuplicateLineNameValidator duplicateLineNameValidator(
     );
   }
 
+  @Bean
+  public UnexpectedWaitTimeAndActiveDatesValidator unexpectedWaitTimeValidator(
+    @Qualifier(
+      "validationReportEntryFactory"
+    ) ValidationReportEntryFactory validationReportEntryFactory,
+    NetexDataRepository netexDataRepository
+  ) {
+    return new UnexpectedWaitTimeAndActiveDatesValidator(
+      validationReportEntryFactory,
+      netexDataRepository
+    );
+  }
+
   @Bean
   public NetexValidatorsRunner timetableDataValidatorsRunner(
     @Qualifier(
@@ -214,10 +234,14 @@ public NetexValidatorsRunner timetableDataValidatorsRunner(
     StopPointsInVehicleJourneyValidator stopPointsInVehicleJourneyValidator,
     DuplicateLineNameValidator duplicateLineNameValidator,
     MissingReplacementValidator missingReplacementValidator,
+    UnexpectedWaitTimeAndActiveDatesValidator unexpectedWaitTimeAndActiveDatesValidator,
     LineInfoCollector lineInfoCollector,
     ServiceJourneyStopsCollector serviceJourneyStopsCollector,
     ServiceJourneyInterchangeInfoCollector serviceJourneyInterchangeInfoCollector,
-    CommonDataRepositoryLoader commonDataRepository,
+    ActiveDatesCollector activeDatesCollector,
+    ServiceJourneyDayTypesCollector serviceJourneyDayTypesCollector,
+    DatedServiceJourneysCollector datedServiceJourneysCollector,
+    CommonDataRepositoryLoader commonDataRepositoryLoader,
     NetexDataRepository netexDataRepository,
     StopPlaceRepository stopPlaceRepository
   ) {
@@ -254,13 +278,17 @@ public NetexValidatorsRunner timetableDataValidatorsRunner(
 
     List<DatasetValidator> netexTimetableDatasetValidators = List.of(
       duplicateLineNameValidator,
-      stopPointsInVehicleJourneyValidator
+      stopPointsInVehicleJourneyValidator,
+      unexpectedWaitTimeAndActiveDatesValidator
     );
 
     List<NetexDataCollector> commonDataCollectors = List.of(
       lineInfoCollector,
       serviceJourneyInterchangeInfoCollector,
-      serviceJourneyStopsCollector
+      serviceJourneyStopsCollector,
+      activeDatesCollector,
+      serviceJourneyDayTypesCollector,
+      datedServiceJourneysCollector
     );
 
     return NetexValidatorsRunner
@@ -271,7 +299,7 @@ public NetexValidatorsRunner timetableDataValidatorsRunner(
       .withJaxbValidators(jaxbValidators)
       .withDatasetValidators(netexTimetableDatasetValidators)
       .withNetexDataCollectors(commonDataCollectors)
-      .withCommonDataRepository(commonDataRepository)
+      .withCommonDataRepository(commonDataRepositoryLoader)
       .withNetexDataRepository(netexDataRepository)
       .withStopPlaceRepository(stopPlaceRepository)
       .withValidationReportEntryFactory(validationReportEntryFactory)

src/main/java/no/entur/antu/config/cache/CacheConfig.java

@@ -40,8 +40,13 @@ public class CacheConfig {
   public static final String LINE_INFO_CACHE = "linesInfoCache";
   public static final String SERVICE_JOURNEY_INTERCHANGE_INFO_CACHE =
     "serviceJourneyInterchangeInfoCache";
+  public static final String SERVICE_JOURNEY_DAY_TYPES_CACHE =
+    "serviceJourneyDayTypesCache";
   public static final String SERVICE_JOURNEY_STOPS_CACHE =
     "serviceJourneyStopsCache";
+  public static final String SERVICE_JOURNEY_OPERATING_DAYS_CACHE =
+    "serviceJourneyOperatingDaysCache";
+  public static final String ACTIVE_DATES_CACHE = "activeDatesCache";
   public static final String QUAY_ID_NOT_FOUND_CACHE = "quayIdNotFoundCache";
 
   private static final Kryo5Codec DEFAULT_CODEC = new Kryo5Codec();
@@ -172,6 +177,17 @@ public Map<String, List<String>> serviceJourneyInterchangeInfoCache(
     );
   }
 
+  @Bean(name = SERVICE_JOURNEY_DAY_TYPES_CACHE)
+  public Map<String, Map<String, String>> serviceJourneyDayTypesCache(
+    RedissonClient redissonClient
+  ) {
+    return getOrCreateReportScopedCache(
+      redissonClient,
+      SERVICE_JOURNEY_DAY_TYPES_CACHE,
+      new CompositeCodec(new StringCodec(), new StringCodec())
+    );
+  }
+
   @Bean(name = SERVICE_JOURNEY_STOPS_CACHE)
   public Map<String, Map<String, List<String>>> serviceJourneyStopsCache(
     RedissonClient redissonClient
@@ -183,6 +199,28 @@ public Map<String, Map<String, List<String>>> serviceJourneyStopsCache(
     );
   }
 
+  @Bean(name = ACTIVE_DATES_CACHE)
+  public Map<String, Map<String, String>> activeDatesCache(
+    RedissonClient redissonClient
+  ) {
+    return getOrCreateReportScopedCache(
+      redissonClient,
+      ACTIVE_DATES_CACHE,
+      new CompositeCodec(new StringCodec(), new StringCodec())
+    );
+  }
+
+  @Bean(name = SERVICE_JOURNEY_OPERATING_DAYS_CACHE)
+  public Map<String, Map<String, String>> serviceJourneyOperatingDaysCache(
+    RedissonClient redissonClient
+  ) {
+    return getOrCreateReportScopedCache(
+      redissonClient,
+      SERVICE_JOURNEY_OPERATING_DAYS_CACHE,
+      new CompositeCodec(new StringCodec(), new StringCodec())
+    );
+  }
+
   @Bean
   public NetexIdRepository netexIdRepository(
     RedissonClient redissonClient,

src/main/java/no/entur/antu/config/cache/NetexDataCollectorConfig.java

@@ -1,14 +1,20 @@
 package no.entur.antu.config.cache;
 
+import static no.entur.antu.config.cache.CacheConfig.ACTIVE_DATES_CACHE;
 import static no.entur.antu.config.cache.CacheConfig.LINE_INFO_CACHE;
+import static no.entur.antu.config.cache.CacheConfig.SERVICE_JOURNEY_DAY_TYPES_CACHE;
 import static no.entur.antu.config.cache.CacheConfig.SERVICE_JOURNEY_INTERCHANGE_INFO_CACHE;
+import static no.entur.antu.config.cache.CacheConfig.SERVICE_JOURNEY_OPERATING_DAYS_CACHE;
 import static no.entur.antu.config.cache.CacheConfig.SERVICE_JOURNEY_STOPS_CACHE;
 
 import java.util.List;
 import java.util.Map;
+import no.entur.antu.netexdata.collectors.DatedServiceJourneysCollector;
 import no.entur.antu.netexdata.collectors.LineInfoCollector;
+import no.entur.antu.netexdata.collectors.ServiceJourneyDayTypesCollector;
 import no.entur.antu.netexdata.collectors.ServiceJourneyInterchangeInfoCollector;
 import no.entur.antu.netexdata.collectors.ServiceJourneyStopsCollector;
+import no.entur.antu.netexdata.collectors.activedatecollector.ActiveDatesCollector;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
@@ -25,6 +31,29 @@ public LineInfoCollector lineInfoScraper(
     return new LineInfoCollector(redissonClient, lineInfoCache);
   }
 
+  @Bean
+  public ActiveDatesCollector activeDatesCollector(
+    RedissonClient redissonClient,
+    @Qualifier(
+      ACTIVE_DATES_CACHE
+    ) Map<String, Map<String, String>> activeDatesCache
+  ) {
+    return new ActiveDatesCollector(redissonClient, activeDatesCache);
+  }
+
+  @Bean
+  public DatedServiceJourneysCollector datedServiceJourneysCollector(
+    RedissonClient redissonClient,
+    @Qualifier(
+      SERVICE_JOURNEY_OPERATING_DAYS_CACHE
+    ) Map<String, Map<String, String>> serviceJourneyOperatingDaysCache
+  ) {
+    return new DatedServiceJourneysCollector(
+      redissonClient,
+      serviceJourneyOperatingDaysCache
+    );
+  }
+
   @Bean
   public ServiceJourneyInterchangeInfoCollector serviceJourneyInterchangeInfoCollector(
     RedissonClient redissonClient,
@@ -38,6 +67,19 @@ public ServiceJourneyInterchangeInfoCollector serviceJourneyInterchangeInfoColle
     );
   }
 
+  @Bean
+  public ServiceJourneyDayTypesCollector serviceJourneyDayTypesCollector(
+    RedissonClient redissonClient,
+    @Qualifier(
+      SERVICE_JOURNEY_DAY_TYPES_CACHE
+    ) Map<String, Map<String, String>> serviceJourneyDayTypesCache
+  ) {
+    return new ServiceJourneyDayTypesCollector(
+      redissonClient,
+      serviceJourneyDayTypesCache
+    );
+  }
+
   @Bean
   public ServiceJourneyStopsCollector serviceJourneyStopsCollector(
     RedissonClient redissonClient,

src/main/java/no/entur/antu/netexdata/DefaultNetexDataRepository.java

@@ -5,6 +5,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import no.entur.antu.exception.AntuException;
 import org.entur.netex.validation.validator.model.ActiveDates;
 import org.entur.netex.validation.validator.model.ActiveDatesId;
@@ -23,15 +24,24 @@ public class DefaultNetexDataRepository implements NetexDataRepositoryLoader {
 
   private final Map<String, List<String>> lineInfoCache;
   private final Map<String, Map<String, List<String>>> serviceJourneyStopsCache;
+  private final Map<String, Map<String, String>> serviceJourneyDayTypesCache;
+  private final Map<String, Map<String, String>> activeDatesCache;
+  private final Map<String, Map<String, String>> serviceJourneyOperatingDaysCache;
   private final Map<String, List<String>> serviceJourneyInterchangeInfoCache;
 
   public DefaultNetexDataRepository(
     Map<String, List<String>> lineInfoCache,
     Map<String, Map<String, List<String>>> serviceJourneyStopsCache,
+    Map<String, Map<String, String>> serviceJourneyDayTypesCache,
+    Map<String, Map<String, String>> activeDatesCache,
+    Map<String, Map<String, String>> serviceJourneyOperatingDaysCache,
     Map<String, List<String>> serviceJourneyInterchangeInfoCache
   ) {
     this.lineInfoCache = lineInfoCache;
     this.serviceJourneyStopsCache = serviceJourneyStopsCache;
+    this.serviceJourneyDayTypesCache = serviceJourneyDayTypesCache;
+    this.activeDatesCache = activeDatesCache;
+    this.serviceJourneyOperatingDaysCache = serviceJourneyOperatingDaysCache;
     this.serviceJourneyInterchangeInfoCache =
       serviceJourneyInterchangeInfoCache;
   }
@@ -67,40 +77,79 @@ public Map<ServiceJourneyId, List<ServiceJourneyStop>> serviceJourneyStops(
       );
   }
 
-  @Override
-  public List<ServiceJourneyInterchangeInfo> serviceJourneyInterchangeInfos(
+  public Map<ServiceJourneyId, List<DayTypeId>> serviceJourneyDayTypes(
     String validationReportId
   ) {
-    return Optional
-      .ofNullable(serviceJourneyInterchangeInfoCache)
-      .map(Map::entrySet)
+    return serviceJourneyDayTypesCache
+      .keySet()
       .stream()
-      .flatMap(Set::stream)
-      .filter(entry -> entry.getKey().startsWith(validationReportId))
-      .flatMap(entry -> entry.getValue().stream())
-      .map(ServiceJourneyInterchangeInfo::fromString)
-      .toList();
+      .filter(k -> k.startsWith(validationReportId))
+      .map(serviceJourneyDayTypesCache::get)
+      .flatMap(m -> m.entrySet().stream())
+      .collect(
+        Collectors.toMap(
+          entry -> ServiceJourneyId.ofValidId(entry.getKey()),
+          entry ->
+            Stream.of(entry.getValue().split(",")).map(DayTypeId::new).toList(),
+          (p, n) -> n
+        )
+      );
   }
 
   @Override
-  public Map<ServiceJourneyId, List<DayTypeId>> serviceJourneyDayTypes(
+  public Map<ServiceJourneyId, List<OperatingDayId>> serviceJourneyOperatingDays(
     String validationReportId
   ) {
-    throw new UnsupportedOperationException();
+    return serviceJourneyOperatingDaysCache
+      .keySet()
+      .stream()
+      .filter(k -> k.startsWith(validationReportId))
+      .map(serviceJourneyOperatingDaysCache::get)
+      .flatMap(m -> m.entrySet().stream())
+      .collect(
+        Collectors.toMap(
+          entry -> ServiceJourneyId.ofValidId(entry.getKey()),
+          entry ->
+            Stream
+              .of(entry.getValue().split(","))
+              .map(OperatingDayId::new)
+              .toList(),
+          (p, n) -> n
+        )
+      );
   }
 
-  @Override
   public Map<ActiveDatesId, ActiveDates> activeDates(
     String validationReportId
   ) {
-    throw new UnsupportedOperationException();
+    return activeDatesCache
+      .keySet()
+      .stream()
+      .filter(k -> k.startsWith(validationReportId))
+      .map(activeDatesCache::get)
+      .flatMap(m -> m.entrySet().stream())
+      .collect(
+        Collectors.toMap(
+          entry -> ActiveDatesId.of(entry.getKey()),
+          entry -> ActiveDates.fromString(entry.getValue()),
+          (p, n) -> n
+        )
+      );
   }
 
   @Override
-  public Map<ServiceJourneyId, List<OperatingDayId>> serviceJourneyOperatingDays(
+  public List<ServiceJourneyInterchangeInfo> serviceJourneyInterchangeInfos(
     String validationReportId
   ) {
-    throw new UnsupportedOperationException();
+    return Optional
+      .ofNullable(serviceJourneyInterchangeInfoCache)
+      .map(Map::entrySet)
+      .stream()
+      .flatMap(Set::stream)
+      .filter(entry -> entry.getKey().startsWith(validationReportId))
+      .flatMap(entry -> entry.getValue().stream())
+      .map(ServiceJourneyInterchangeInfo::fromString)
+      .toList();
   }
 
   @Override