Skip to content

Allow setting of OperatorRef in Siri-SX subscription request #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leonardehrenfried wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow setting of OperatorRef in Siri-SX subscription request #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
472c000
Allow setting of OperatorRef in Siri-SX subscription request
leonardehrenfried Apr 28, 2023
f85deac
Fix test
leonardehrenfried Apr 28, 2023
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
10 changes: 10 additions & 0 deletions src/main/java/no/rutebanken/anshar/routes/siri/helpers/SiriObjectFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,16 @@ private static SubscriptionRequest createSituationExchangeSubscriptionRequest(St
sxRequest.setVehicleRef((VehicleRef) next);
}
}
if (filterMap.containsKey(OperatorRefStructure.class)) {
Set<Object> operatorRefs = filterMap.get(OperatorRefStructure.class);
for (Object operatorRef : operatorRefs) {
if (operatorRef instanceof String) {
var refStructure = new OperatorRefStructure();
refStructure.setValue((String) operatorRef);
sxRequest.setOperatorRef(refStructure);
}
}
}
}

SituationExchangeSubscriptionStructure sxSubscriptionReq = new SituationExchangeSubscriptionStructure();
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/subscriptions-example.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ anshar:
requestorRef: anshar-example-${random.uuid}
durationOfSubscriptionHours: 1680
mappingAdapterId: entur
filterPresets:
filterMap:
uk.org.siri.siri21.OperatorRefStructure: "AN_OPERATOR"
idMappingPrefixes:
active: false

12 changes: 10 additions & 2 deletions src/test/java/no/rutebanken/anshar/siri/SiriObjectFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,13 @@

package no.rutebanken.anshar.siri;

import java.util.Map;
import java.util.Set;
import no.rutebanken.anshar.routes.siri.helpers.SiriObjectFactory;
import no.rutebanken.anshar.subscription.SiriDataType;
import no.rutebanken.anshar.subscription.SubscriptionSetup;
import org.junit.jupiter.api.Test;
import uk.org.siri.siri21.OperatorRefStructure;
import uk.org.siri.siri21.EstimatedTimetableRequestStructure;
import uk.org.siri.siri21.EstimatedTimetableSubscriptionStructure;
import uk.org.siri.siri21.Siri;
Expand Down Expand Up @@ -101,6 +104,11 @@ public void testCreateSXSubscription(){
SubscriptionSetup.SubscriptionMode.REQUEST_RESPONSE,
UUID.randomUUID().toString());

final String operatorName = "AN_OPERATOR";
subscriptionSetup.setFilterMap(
Map.of(OperatorRefStructure.class, Set.of(operatorName))
);

Siri sxSubscriptionRequest = SiriObjectFactory.createSubscriptionRequest(subscriptionSetup);
assertNotNull(sxSubscriptionRequest.getSubscriptionRequest());

Expand All @@ -125,8 +133,8 @@ public void testCreateSXSubscription(){
"Initial terminationtime has not been calculated correctly"
);



var ref = subscription.getSituationExchangeRequest().getOperatorRef().getValue();
assertEquals(ref, operatorName);
}

@Test
Expand Down