Interchange wait time and active dates validation

Author: mansoor-sajjad

pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.entur.ror</groupId>
         <artifactId>superpom</artifactId>
-        <version>3.2</version>
+        <version>3.3</version>
     </parent>
 
     <groupId>no.entur.antu</groupId>
@@ -26,13 +26,13 @@
         <java.version>17</java.version>
         <entur.google.pubsub.emulator.download.skip>false</entur.google.pubsub.emulator.download.skip>
         <camel.version>4.4.4</camel.version>
-        <entur.helpers.version>4.7</entur.helpers.version>
-        <netex-validator-java.version>9.0.0</netex-validator-java.version>
-        <netex-parser-java.version>3.1.34</netex-parser-java.version>
+        <entur.helpers.version>4.8</entur.helpers.version>
+        <netex-validator-java.version>9.1.1</netex-validator-java.version>
+        <netex-parser-java.version>3.1.36</netex-parser-java.version>
         <jts-core.version>1.20.0</jts-core.version>
         <commons-io.version>2.11.0</commons-io.version>
         <zt-zip.version>1.17</zt-zip.version>
-        <redisson.version>3.40.2</redisson.version>
+        <redisson.version>3.42.0</redisson.version>
         <kryo.version>5.6.2</kryo.version>
         <embedded-redis.version>0.9.1</embedded-redis.version>
         <prettier-java.version>2.1.0</prettier-java.version>

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;
@@ -42,7 +46,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;
@@ -106,6 +113,19 @@ public DuplicateLineNameValidator duplicateLineNameValidator(
     );
   }
 
+  @Bean
+  public UnexpectedWaitTimeAndActiveDatesValidator unexpectedWaitTimeValidator(
+    @Qualifier(
+      "validationReportEntryFactory"
+    ) ValidationReportEntryFactory validationReportEntryFactory,
+    NetexDataRepository netexDataRepository
+  ) {
+    return new UnexpectedWaitTimeAndActiveDatesValidator(
+      validationReportEntryFactory,
+      netexDataRepository
+    );
+  }
+
   @Bean
   public NetexValidatorsRunner timetableDataValidatorsRunner(
     @Qualifier(
@@ -125,10 +145,14 @@ public NetexValidatorsRunner timetableDataValidatorsRunner(
     ) NetexIdUniquenessValidator netexIdUniquenessValidator,
     StopPointsInVehicleJourneyValidator stopPointsInVehicleJourneyValidator,
     DuplicateLineNameValidator duplicateLineNameValidator,
+    UnexpectedWaitTimeAndActiveDatesValidator unexpectedWaitTimeAndActiveDatesValidator,
     LineInfoCollector lineInfoCollector,
     ServiceJourneyStopsCollector serviceJourneyStopsCollector,
     ServiceJourneyInterchangeInfoCollector serviceJourneyInterchangeInfoCollector,
-    CommonDataRepositoryLoader commonDataRepository,
+    ActiveDatesCollector activeDatesCollector,
+    ServiceJourneyDayTypesCollector serviceJourneyDayTypesCollector,
+    DatedServiceJourneysCollector datedServiceJourneysCollector,
+    CommonDataRepositoryLoader commonDataRepositoryLoader,
     NetexDataRepository netexDataRepository,
     StopPlaceRepository stopPlaceRepository
   ) {
@@ -165,13 +189,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
@@ -182,7 +210,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/finland/validator/EnturTimetableDataFinlandValidationTreeFactory.java

@@ -23,6 +23,8 @@ public EnturTimetableDataFinlandValidationTreeFactory() {
 
   @Override
   public ValidationTreeBuilder builder() {
+    ValidationTreeBuilder builder = super.builder();
+
     // accept SiteFrame, they are part of Finnish datasets
     siteFrameValidationTreeBuilder()
       .removeRuleForCommonFile(
@@ -44,6 +46,6 @@ public ValidationTreeBuilder builder() {
       .removeRule(
         DefaultServiceFrameValidationTreeFactory.CODE_PASSENGER_STOP_ASSIGNMENT_3
       );
-    return super.builder();
+    return builder;
   }
 }