Fixing rebase issues.

entur · Nov 24, 2024 · 7ad5246 · 7ad5246
1 parent abd3922
commit 7ad5246
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 23 deletions.
diff --git 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
@@ -155,27 +155,6 @@ public List<ServiceJourneyInterchangeInfo> serviceJourneyInterchangeInfos(
       .toList();
   }
 
-  @Override
-  public Map<ServiceJourneyId, List<DayTypeId>> serviceJourneyDayTypes(
-    String validationReportId
-  ) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public Map<ActiveDatesId, ActiveDates> activeDates(
-    String validationReportId
-  ) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public Map<ServiceJourneyId, List<OperatingDayId>> 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
@@ -12,11 +12,17 @@ public RedisNetexDataRepository(
     RedissonClient redissonClient,
     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
   ) {
     super(
       lineInfoCache,
       serviceJourneyStopsCache,
+      serviceJourneyDayTypesCache,
+      activeDatesCache,
+      serviceJourneyOperatingDaysCache,
       serviceJourneyInterchangeInfoCache
     );
     this.redissonClient = redissonClient;