Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,12 @@ private void parseParkings(
for (JAXBElement<? extends Site_VersionStructure> jaxbParking : parkingList) {
if (jaxbParking.getValue() instanceof Parking parking) {
parkings.add(parking);
parkingsByStopPlaceId.put(parking.getParentSiteRef().getRef(), parking);
if (parking.getParentSiteRef() != null) {
parkingsByStopPlaceId.put(
parking.getParentSiteRef().getRef(),
parking
);
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package org.entur.netex.loader.parser;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;

import org.entur.netex.index.impl.NetexEntitiesIndexImpl;
import org.entur.netex2.model.*;
import org.junit.jupiter.api.Test;

class SiteFrameParserTest {

private static final ObjectFactory FACTORY = new ObjectFactory();

@Test
void parkingWithoutParentSiteRefIsIndexed() {
Parking withoutParent = new Parking()
.withId("NSR:Parking:1")
.withVersion("1");
Parking withParent = new Parking()
.withId("NSR:Parking:2")
.withVersion("1")
.withParentSiteRef(new SiteRefStructure().withRef("NSR:StopPlace:1"));

SiteFrameParser parser = new SiteFrameParser();
parser.parse(
new SiteFrame()
.withId("NSR:SiteFrame:1")
.withParkings(
new ParkingsInFrame_RelStructure()
.withParking(
FACTORY.createParking(withoutParent),
FACTORY.createParking(withParent)
)
)
);
NetexEntitiesIndexImpl index = new NetexEntitiesIndexImpl();
parser.setResultOnIndex(index);

assertNotNull(index.getParkingIndex().getLatestVersion("NSR:Parking:1"));
assertNotNull(index.getParkingIndex().getLatestVersion("NSR:Parking:2"));
assertEquals(1, index.getParkingsByParentSiteRefIndex().size());
assertEquals(
withParent,
index
.getParkingsByParentSiteRefIndex()
.get("NSR:StopPlace:1")
.iterator()
.next()
);
}
}