Adds ScheduledStopPointRef->FlexibleStopPointRef map to common data repo

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>org.entur</groupId>
     <artifactId>netex-validator-java</artifactId>
-    <version>9.2.1-SNAPSHOT</version>
+    <version>9.3.0-SNAPSHOT</version>
 
     <name>netex-validator-java</name>
     <description>Library for validating NeTEx datasets against the Nordic NeTEx Profile.</description>

src/main/java/org/entur/netex/validation/validator/jaxb/CommonDataRepository.java

@@ -29,4 +29,12 @@ FromToScheduledStopPointId fromToScheduledStopPointIdForServiceLink(
     ServiceLinkId serviceLinkId,
     String validationReportId
   );
+
+  /**
+   * Returns flexible stop place ref mapped by provided stopPointRef.
+   */
+  String getFlexibleStopPlaceRefByStopPointRef(
+    String validationReportId,
+    String stopPointRef
+  );
 }

src/main/java/org/entur/netex/validation/validator/jaxb/DefaultCommonDataRepository.java

@@ -26,12 +26,14 @@ public class DefaultCommonDataRepository implements CommonDataRepositoryLoader {
 
   private final Map<String, Map<String, String>> scheduledStopPointAndQuayIdCache;
   private final Map<String, Map<String, String>> serviceLinksAndFromToScheduledStopPointIdCache;
+  private final Map<String, Map<String, String>> scheduledStopPointToFlexibleStopPlaceCache;
 
   /**
    * The default constructor initializes synchronized data structures for storing the common data.
    */
   public DefaultCommonDataRepository() {
     this(
+      Collections.synchronizedMap(new HashMap<>()),
       Collections.synchronizedMap(new HashMap<>()),
       Collections.synchronizedMap(new HashMap<>())
     );
@@ -43,11 +45,30 @@ public DefaultCommonDataRepository() {
    */
   public DefaultCommonDataRepository(
     Map<String, Map<String, String>> scheduledStopPointAndQuayIdCache,
-    Map<String, Map<String, String>> serviceLinksAndFromToScheduledStopPointIdCache
+    Map<String, Map<String, String>> serviceLinksAndFromToScheduledStopPointIdCache,
+    Map<String, Map<String, String>> scheduledStopPointToFlexibleStopPlaceCache
   ) {
     this.scheduledStopPointAndQuayIdCache = scheduledStopPointAndQuayIdCache;
     this.serviceLinksAndFromToScheduledStopPointIdCache =
       serviceLinksAndFromToScheduledStopPointIdCache;
+    this.scheduledStopPointToFlexibleStopPlaceCache =
+      scheduledStopPointToFlexibleStopPlaceCache;
+  }
+
+  @Override
+  public String getFlexibleStopPlaceRefByStopPointRef(
+    String validationReportId,
+    String stopPointRef
+  ) {
+    Map<String, String> stopPlaceRefToFlexibleStopPlaceMap =
+      scheduledStopPointToFlexibleStopPlaceCache.get(validationReportId);
+    if (stopPlaceRefToFlexibleStopPlaceMap == null) {
+      throw new NetexValidationException(
+        "Flexible stop place cache not found for validation report with id: " +
+        validationReportId
+      );
+    }
+    return stopPlaceRefToFlexibleStopPlaceMap.get(stopPointRef);
   }
 
   @Override
@@ -109,6 +130,15 @@ public void collect(
       }
     );
 
+    scheduledStopPointToFlexibleStopPlaceCache.merge(
+      validationReportId,
+      netexEntitiesIndex.getFlexibleStopPlaceIdByStopPointRefIndex(),
+      (existingMap, newMap) -> {
+        existingMap.putAll(newMap);
+        return existingMap;
+      }
+    );
+
     Map<String, String> scheduledStopPointIdsPerServiceLinkId =
       getFromToScheduledStopPointIdPerServiceLinkId(netexEntitiesIndex)
         .entrySet()

src/main/java/org/entur/netex/validation/validator/jaxb/JAXBValidationContext.java

@@ -392,4 +392,28 @@ public TransportModeAndSubMode transportModeAndSubMode(
       flexibleLine.getTransportSubmode()
     );
   }
+
+  /**
+   * Returns the FlexibleStopPlaceRef connected to ScheduledStopPointRef in a FlexibleStopAssignment.
+   */
+  @Nullable
+  public String flexibleStopPlaceRefFromScheduledStopPointRef(
+    String scheduledStopPointRef
+  ) {
+    String flexibleStopPlaceRefFromCommon =
+      commonDataRepository.getFlexibleStopPlaceRefByStopPointRef(
+        validationReportId,
+        scheduledStopPointRef
+      );
+
+    String flexibleStopPlaceRefFromNetexEntities = netexEntitiesIndex
+      .getFlexibleStopPlaceIdByStopPointRefIndex()
+      .get(scheduledStopPointRef);
+
+    if (flexibleStopPlaceRefFromNetexEntities == null) {
+      return flexibleStopPlaceRefFromCommon;
+    }
+
+    return flexibleStopPlaceRefFromNetexEntities;
+  }
 }

src/test/java/org/entur/netex/validation/validator/jaxb/DefaultCommonDataRepositoryTest.java

@@ -23,6 +23,12 @@ class DefaultCommonDataRepositoryTest {
   public static final String TEST_SCHEDULED_STOP_POINT_ID_1 =
     "TST:ScheduledStopPoint:1";
 
+  public static final String TEST_SCHEDULED_STOP_POINT_REF_ID =
+    "TST:ScheduledStopPointRef:1";
+
+  public static final String TEST_FLEXIBLE_STOP_POINT_REF_ID =
+    "TST:FlexibleStopPlaceRef:1";
+
   public static final String TEST_QUAY_ID_1 = "TST:Quay:1";
 
   public static final String TEST_SCHEDULED_STOP_POINT_ID_2 =
@@ -32,6 +38,37 @@ class DefaultCommonDataRepositoryTest {
 
   public static final String TEST_SERVICE_LINK_ID = "TST:ServiceLink:1";
 
+  @Test
+  void testStopPlaceToFlexibleStopPlaceMapping() {
+    DefaultCommonDataRepository repository = new DefaultCommonDataRepository();
+    NetexEntitiesIndex netexEntitiesIndex = new NetexEntitiesIndexImpl();
+
+    netexEntitiesIndex
+      .getFlexibleStopPlaceIdByStopPointRefIndex()
+      .put(TEST_SCHEDULED_STOP_POINT_REF_ID, TEST_FLEXIBLE_STOP_POINT_REF_ID);
+    repository.collect(TEST_REPORT_ID, netexEntitiesIndex);
+    assertEquals(
+      TEST_FLEXIBLE_STOP_POINT_REF_ID,
+      repository.getFlexibleStopPlaceRefByStopPointRef(
+        TEST_REPORT_ID,
+        TEST_SCHEDULED_STOP_POINT_REF_ID
+      )
+    );
+  }
+
+  @Test
+  void testStopPlaceToFlexibleStopPlaceRefMappingThrowsWhenNoValidationReport() {
+    DefaultCommonDataRepository repository = new DefaultCommonDataRepository();
+    assertThrows(
+      NetexValidationException.class,
+      () ->
+        repository.getFlexibleStopPlaceRefByStopPointRef(
+          TEST_REPORT_ID,
+          TEST_SCHEDULED_STOP_POINT_REF_ID
+        )
+    );
+  }
+
   @Test
   void testSharedScheduledStopPoints() {
     DefaultCommonDataRepository repository = new DefaultCommonDataRepository();

src/test/java/org/entur/netex/validation/validator/jaxb/JAXBValidationContextTest.java

@@ -3,13 +3,17 @@
 import static org.entur.netex.validation.test.jaxb.support.JAXBUtils.createJaxbElement;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.*;
 
+import java.util.HashMap;
 import java.util.Map;
+import org.entur.netex.index.api.NetexEntitiesIndex;
 import org.entur.netex.index.impl.NetexEntitiesIndexImpl;
 import org.entur.netex.validation.validator.DataLocation;
 import org.entur.netex.validation.validator.id.IdVersion;
 import org.entur.netex.validation.validator.model.TransportModeAndSubMode;
 import org.entur.netex.validation.validator.model.TransportSubMode;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.rutebanken.netex.model.AllVehicleModesOfTransportEnumeration;
@@ -205,4 +209,84 @@ void transportModeAndSubModeDefinedOnServiceJourneyFromServiceJourney() {
       transportModeAndSubMode.subMode()
     );
   }
+
+  @Test
+  void flexibleStopPlaceRefFromScheduledStopPointRefInCommonDataRepositoryTest() {
+    String scheduledStopPointRef = "scheduledStopPointRef";
+    String validationReportId = "testValidationReportId";
+    String flexibleStopPointRef = "flexibleStopPointRef";
+    Map<String, String> scheduledStopPointRefMap = Map.ofEntries(
+      Map.entry(scheduledStopPointRef, flexibleStopPointRef)
+    );
+
+    Map<String, Map<String, String>> validationReportMap = Map.ofEntries(
+      Map.entry(validationReportId, scheduledStopPointRefMap)
+    );
+    CommonDataRepository commonDataRepository = new DefaultCommonDataRepository(
+      new HashMap<>(),
+      new HashMap<>(),
+      validationReportMap
+    );
+
+    CommonDataRepository commonDataRepositorySpy = spy(commonDataRepository);
+
+    JAXBValidationContext context = new JAXBValidationContext(
+      validationReportId,
+      netexEntitiesIndex,
+      commonDataRepositorySpy,
+      null,
+      null,
+      FILE_NAME,
+      Map.of()
+    );
+    String result = context.flexibleStopPlaceRefFromScheduledStopPointRef(
+      scheduledStopPointRef
+    );
+
+    Assertions.assertEquals(flexibleStopPointRef, result);
+    verify(commonDataRepositorySpy, times(1))
+      .getFlexibleStopPlaceRefByStopPointRef(
+        validationReportId,
+        scheduledStopPointRef
+      );
+  }
+
+  @Test
+  void flexibleStopPlaceRefFromScheduledStopPointRefInNetexEntitiesIndexTest() {
+    String scheduledStopPointRef = "scheduledStopPointRef";
+    String validationReportId = "testValidationReportId";
+    String flexibleStopPointRef2 = "flexibleStopPointRef2";
+
+    Map<String, String> scheduledStopPointRefMap = Map.ofEntries(
+      Map.entry(scheduledStopPointRef, "flexibleStopPointRef1")
+    );
+    Map<String, Map<String, String>> validationReportMap = Map.ofEntries(
+      Map.entry(validationReportId, scheduledStopPointRefMap)
+    );
+
+    CommonDataRepository commonDataRepository = new DefaultCommonDataRepository(
+      new HashMap<>(),
+      new HashMap<>(),
+      validationReportMap
+    );
+    NetexEntitiesIndex netexEntitiesIndex = new NetexEntitiesIndexImpl();
+    netexEntitiesIndex
+      .getFlexibleStopPlaceIdByStopPointRefIndex()
+      .put(scheduledStopPointRef, flexibleStopPointRef2);
+
+    JAXBValidationContext context = new JAXBValidationContext(
+      validationReportId,
+      netexEntitiesIndex,
+      commonDataRepository,
+      null,
+      null,
+      FILE_NAME,
+      Map.of()
+    );
+
+    String result = context.flexibleStopPlaceRefFromScheduledStopPointRef(
+      scheduledStopPointRef
+    );
+    Assertions.assertEquals(flexibleStopPointRef2, result);
+  }
 }