Merge pull request #72 from entur/versioned-tariff-zones-and-fare-zones

Fix versioned entities in site frame

Author: testower

src/main/java/org/entur/netex/index/api/NetexEntitiesIndex.java

@@ -246,25 +246,25 @@ public interface NetexEntitiesIndex {
      * Get an entity index of TariffZone
      * @return
      */
-    NetexEntityIndex<TariffZone> getTariffZoneIndex();
+    VersionedNetexEntityIndex<TariffZone> getTariffZoneIndex();
 
     /**
      * Get an entity index of TopographicPlace
      * @return
      */
-    NetexEntityIndex<TopographicPlace> getTopographicPlaceIndex();
+    VersionedNetexEntityIndex<TopographicPlace> getTopographicPlaceIndex();
 
     /**
      * Get an entity index of Parking
      * @return
      */
-    NetexEntityIndex<Parking> getParkingIndex();
+    VersionedNetexEntityIndex<Parking> getParkingIndex();
 
     /**
      * Get an entity index of ScheduledStopPoint
      * @return
      */
-    NetexEntityIndex<ScheduledStopPoint> getScheduledStopPointIndex();
+    VersionedNetexEntityIndex<ScheduledStopPoint> getScheduledStopPointIndex();
 
     /**
      * Get an entity index of RoutePoint
@@ -282,9 +282,9 @@ public interface NetexEntitiesIndex {
      * Get an entity index of FareZone
      * @return
      */
-    NetexEntityIndex<FareZone> getFareZoneIndex();
+    VersionedNetexEntityIndex<FareZone> getFareZoneIndex();
 
-    NetexEntityIndex<GroupOfTariffZones> getGroupOfTariffZonesIndex();
+    VersionedNetexEntityIndex<GroupOfTariffZones> getGroupOfTariffZonesIndex();
 
     Collection<CompositeFrame> getCompositeFrames();
     Collection<ResourceFrame> getResourceFrames();

src/main/java/org/entur/netex/index/impl/NetexEntitiesIndexImpl.java

@@ -87,13 +87,13 @@ public class NetexEntitiesIndexImpl implements NetexEntitiesIndex {
     public final Multimap<String, ServiceJourneyInterchange> serviceJourneyInterchangeByServiceJourneyRef;
     public final NetexEntityIndex<ServiceLink> serviceLinkById;
     public final VersionedNetexEntityIndex<StopPlace> stopPlaceById;
-    public final NetexEntityIndex<TariffZone> tariffZonesById;
-    public final NetexEntityIndex<TopographicPlace> topographicPlaceById;
-    public final NetexEntityIndex<Parking> parkingById;
-    public final NetexEntityIndex<ScheduledStopPoint> scheduledStopPointById;
+    public final VersionedNetexEntityIndex<TariffZone> tariffZonesById;
+    public final VersionedNetexEntityIndex<TopographicPlace> topographicPlaceById;
+    public final VersionedNetexEntityIndex<Parking> parkingById;
+    public final VersionedNetexEntityIndex<ScheduledStopPoint> scheduledStopPointById;
     public final NetexEntityIndex<RoutePoint> routePointById;
-    public final NetexEntityIndex<FareZone> fareZoneById;
-    public final NetexEntityIndex<GroupOfTariffZones> groupOfTariffZonesById;
+    public final VersionedNetexEntityIndex<FareZone> fareZoneById;
+    public final VersionedNetexEntityIndex<GroupOfTariffZones> groupOfTariffZonesById;
     public final Multimap<String, Parking> parkingsByParentSiteRef;
 
     // Relations between entities - The Netex XML sometimes rely on the the
@@ -146,13 +146,13 @@ public NetexEntitiesIndexImpl() {
         this.serviceJourneyInterchangeByServiceJourneyRef = Multimaps.synchronizedListMultimap(ArrayListMultimap.create());
         this.serviceLinkById = new NetexEntityMapByIdImpl<>();
         this.stopPlaceById = new VersionedNetexEntityIndexImpl<>();
-        this.tariffZonesById = new NetexEntityMapByIdImpl<>();
-        this.topographicPlaceById = new NetexEntityMapByIdImpl<>();
-        this.parkingById = new NetexEntityMapByIdImpl<>();
-        this.scheduledStopPointById = new NetexEntityMapByIdImpl<>();
+        this.tariffZonesById = new VersionedNetexEntityIndexImpl<>();
+        this.topographicPlaceById = new VersionedNetexEntityIndexImpl<>();
+        this.parkingById = new VersionedNetexEntityIndexImpl<>();
+        this.scheduledStopPointById = new VersionedNetexEntityIndexImpl<>();
         this.routePointById = new NetexEntityMapByIdImpl<>();
-        this.fareZoneById = new NetexEntityMapByIdImpl<>();
-        this.groupOfTariffZonesById = new NetexEntityMapByIdImpl<>();
+        this.fareZoneById = new VersionedNetexEntityIndexImpl<>();
+        this.groupOfTariffZonesById = new VersionedNetexEntityIndexImpl<>();
         this.compositeFrames = new HashSet<>();
         this.siteFrames = new HashSet<>();
         this.resourceFrames = new HashSet<>();
@@ -323,22 +323,22 @@ public VersionedNetexEntityIndex<StopPlace> getStopPlaceIndex() {
     }
 
     @Override
-    public NetexEntityIndex<TariffZone> getTariffZoneIndex() {
+    public VersionedNetexEntityIndex<TariffZone> getTariffZoneIndex() {
         return tariffZonesById;
     }
 
     @Override
-    public NetexEntityIndex<TopographicPlace> getTopographicPlaceIndex() {
+    public VersionedNetexEntityIndex<TopographicPlace> getTopographicPlaceIndex() {
         return topographicPlaceById;
     }
 
     @Override
-    public NetexEntityIndex<Parking> getParkingIndex() {
+    public VersionedNetexEntityIndex<Parking> getParkingIndex() {
         return parkingById;
     }
 
     @Override
-    public NetexEntityIndex<ScheduledStopPoint> getScheduledStopPointIndex() {
+    public VersionedNetexEntityIndex<ScheduledStopPoint> getScheduledStopPointIndex() {
         return scheduledStopPointById;
     }
 
@@ -348,12 +348,12 @@ public NetexEntityIndex<RoutePoint> getRoutePointIndex() {
     }
 
     @Override
-    public NetexEntityIndex<FareZone> getFareZoneIndex() {
+    public VersionedNetexEntityIndex<FareZone> getFareZoneIndex() {
         return fareZoneById;
     }
 
     @Override
-    public NetexEntityIndex<GroupOfTariffZones> getGroupOfTariffZonesIndex() {
+    public VersionedNetexEntityIndex<GroupOfTariffZones> getGroupOfTariffZonesIndex() {
         return groupOfTariffZonesById;
     }
 

src/test/java/org/entur/netex/TestGroupOfTariffZones.java

@@ -26,7 +26,7 @@ static void init() {
 
     @Test
     void testGetAllGroupsOfTariffZones() {
-        Collection<GroupOfTariffZones> groups = index.getGroupOfTariffZonesIndex().getAll();
+        Collection<GroupOfTariffZones> groups = index.getGroupOfTariffZonesIndex().getLatestVersions();
         Assertions.assertFalse(groups.isEmpty());
     }
 }

src/test/java/org/entur/netex/TestStopPlacesExport.java

@@ -56,40 +56,40 @@ void testGetGroupOfStopPlaces() {
 
     @Test
     void testGetTariffZone() {
-        TariffZone tariffZone = index.getTariffZoneIndex().get("MOR:TariffZone:108");
+        TariffZone tariffZone = index.getTariffZoneIndex().getLatestVersion("MOR:TariffZone:108");
         Assertions.assertEquals("Standal", tariffZone.getName().getValue());
     }
 
     @Test
     void testGetTopographicPlace() {
-        TopographicPlace topographicPlace = index.getTopographicPlaceIndex().get("KVE:TopographicPlace:50");
+        TopographicPlace topographicPlace = index.getTopographicPlaceIndex().getLatestVersion("KVE:TopographicPlace:50");
         Assertions.assertEquals("Trøndelag", topographicPlace.getDescriptor().getName().getValue());
         Assertions.assertEquals("no", topographicPlace.getCountryRef().getRef().value());
     }
 
     @Test
     void testGetParking() {
-        Parking parking = index.getParkingIndex().get("NSR:Parking:1");
+        Parking parking = index.getParkingIndex().getLatestVersion("NSR:Parking:1");
         Assertions.assertEquals("Drammen", parking.getName().getValue());
     }
 
     @Test
     void testGetScheduledStopPoint() {
-        ScheduledStopPoint scheduledStopPoint = index.getScheduledStopPointIndex().get("NSR:ScheduledStopPoint:S5");
+        ScheduledStopPoint scheduledStopPoint = index.getScheduledStopPointIndex().getLatestVersion("NSR:ScheduledStopPoint:S5");
         Assertions.assertEquals("Gudå", scheduledStopPoint.getName().getValue());
     }
 
     @Test
     void testGetPassengerStopAssignment() {
-        ScheduledStopPoint scheduledStopPoint = index.getScheduledStopPointIndex().get("NSR:ScheduledStopPoint:S5");
+        ScheduledStopPoint scheduledStopPoint = index.getScheduledStopPointIndex().getLatestVersion("NSR:ScheduledStopPoint:S5");
         Collection<PassengerStopAssignment> passengerStopAssignments = index.getPassengerStopAssignmentsByStopPointRefIndex().get(scheduledStopPoint.getId());
 
         Assertions.assertEquals(1, passengerStopAssignments.size());
     }
 
     @Test
     void testGetFareZone() {
-        FareZone fareZone = index.getFareZoneIndex().get("AKT:FareZone:27");
+        FareZone fareZone = index.getFareZoneIndex().getLatestVersion("AKT:FareZone:27");
         Assertions.assertEquals("Kviteseid", fareZone.getName().getValue());
     }