diff --git a/src/main/java/no/entur/antu/config/TimetableDataValidatorConfig.java b/src/main/java/no/entur/antu/config/TimetableDataValidatorConfig.java index 3889c083..01e6ac3b 100644 --- a/src/main/java/no/entur/antu/config/TimetableDataValidatorConfig.java +++ b/src/main/java/no/entur/antu/config/TimetableDataValidatorConfig.java @@ -41,9 +41,9 @@ import no.entur.antu.validation.validator.servicejourney.passingtime.NonIncreasingPassingTimeValidator; import no.entur.antu.validation.validator.servicejourney.servicealteration.InvalidServiceAlterationValidator; import no.entur.antu.validation.validator.servicejourney.servicealteration.MissingReplacementValidator; -import no.entur.antu.validation.validator.servicejourney.speed.UnexpectedSpeedValidator; import no.entur.antu.validation.validator.servicelink.distance.UnexpectedDistanceInServiceLinkValidator; import no.entur.antu.validation.validator.servicelink.stoppoints.MismatchedStopPointsValidator; +import no.entur.antu.validation.validator.servicejourney.speed.UnexpectedSpeedValidator; import no.entur.antu.validation.validator.xpath.EnturTimetableDataValidationTreeFactory; import org.entur.netex.validation.validator.DatasetValidator; import org.entur.netex.validation.validator.NetexValidatorsRunner; @@ -310,6 +310,7 @@ public NetexValidatorsRunner timetableDataValidatorsRunner( ActiveDatesCollector activeDatesCollector, ServiceJourneyDayTypesCollector serviceJourneyDayTypesCollector, DatedServiceJourneysCollector datedServiceJourneysCollector, + CommonDataRepositoryLoader commonDataRepositoryLoader, NetexDataRepository netexDataRepository, StopPlaceRepository stopPlaceRepository ) { @@ -367,7 +368,7 @@ public NetexValidatorsRunner timetableDataValidatorsRunner( .withJaxbValidators(jaxbValidators) .withDatasetValidators(netexTimetableDatasetValidators) .withNetexDataCollectors(commonDataCollectors) - .withCommonDataRepository(commonDataRepository) + .withCommonDataRepository(commonDataRepositoryLoader) .withNetexDataRepository(netexDataRepository) .withStopPlaceRepository(stopPlaceRepository) .build(); diff --git a/src/main/java/no/entur/antu/netexdata/DefaultNetexDataRepository.java b/src/main/java/no/entur/antu/netexdata/DefaultNetexDataRepository.java index 93d638e9..28619288 100644 --- a/src/main/java/no/entur/antu/netexdata/DefaultNetexDataRepository.java +++ b/src/main/java/no/entur/antu/netexdata/DefaultNetexDataRepository.java @@ -155,27 +155,6 @@ public List serviceJourneyInterchangeInfos( .toList(); } - @Override - public Map> serviceJourneyDayTypes( - String validationReportId - ) { - throw new UnsupportedOperationException(); - } - - @Override - public Map activeDates( - String validationReportId - ) { - throw new UnsupportedOperationException(); - } - - @Override - public Map> serviceJourneyOperatingDays( - String validationReportId - ) { - throw new UnsupportedOperationException(); - } - @Override public void cleanUp(String validationReportId) { lineInfoCache.remove(validationReportId); diff --git a/src/main/java/no/entur/antu/netexdata/RedisNetexDataRepository.java b/src/main/java/no/entur/antu/netexdata/RedisNetexDataRepository.java index 1ec4efc6..89fabdc0 100644 --- a/src/main/java/no/entur/antu/netexdata/RedisNetexDataRepository.java +++ b/src/main/java/no/entur/antu/netexdata/RedisNetexDataRepository.java @@ -12,11 +12,17 @@ public RedisNetexDataRepository( RedissonClient redissonClient, Map> lineInfoCache, Map>> serviceJourneyStopsCache, + Map> serviceJourneyDayTypesCache, + Map> activeDatesCache, + Map> serviceJourneyOperatingDaysCache, Map> serviceJourneyInterchangeInfoCache ) { super( lineInfoCache, serviceJourneyStopsCache, + serviceJourneyDayTypesCache, + activeDatesCache, + serviceJourneyOperatingDaysCache, serviceJourneyInterchangeInfoCache ); this.redissonClient = redissonClient;