Use more FeedScopedIds

Author: leonardehrenfried

application/src/ext-test/java/org/opentripplanner/ext/fares/impl/GtfsFaresV2ServiceTest.java

@@ -99,8 +99,8 @@ class GtfsFaresV2ServiceTest implements PlanTestConstants {
   Place OUTER_ZONE_STOP = Place.forStop(
     testModel.stop("outer city stop").withCoordinate(2, 2).build()
   );
-  String INNER_ZONE = "inner-zone";
-  String OUTER_ZONE = "outer-zone";
+  FeedScopedId INNER_ZONE = id("inner-zone");
+  FeedScopedId OUTER_ZONE = id("outer-zone");
 
   GtfsFaresV2Service service = new GtfsFaresV2Service(
     List.of(

application/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceFactory.java

@@ -38,7 +38,7 @@ public class DefaultFareServiceFactory implements FareServiceFactory {
   private final List<FareTransferRule> fareTransferRules = new ArrayList<>();
 
   // mapping the stop ids to area ids. one stop can be in several areas.
-  private final Multimap<FeedScopedId, String> stopAreas = ArrayListMultimap.create();
+  private final Multimap<FeedScopedId, FeedScopedId> stopAreas = ArrayListMultimap.create();
 
   @Override
   public FareService makeFareService() {

application/src/ext/java/org/opentripplanner/ext/fares/impl/GtfsFaresV2Service.java

@@ -32,15 +32,15 @@ public final class GtfsFaresV2Service implements Serializable {
   private static final Logger LOG = LoggerFactory.getLogger(GtfsFaresV2Service.class);
   private final List<FareLegRule> legRules;
   private final List<FareTransferRule> transferRules;
-  private final Multimap<FeedScopedId, String> stopAreas;
+  private final Multimap<FeedScopedId, FeedScopedId> stopAreas;
   private final Set<FeedScopedId> networksWithRules;
-  private final Set<String> fromAreasWithRules;
-  private final Set<String> toAreasWithRules;
+  private final Set<FeedScopedId> fromAreasWithRules;
+  private final Set<FeedScopedId> toAreasWithRules;
 
   public GtfsFaresV2Service(
     List<FareLegRule> legRules,
     List<FareTransferRule> fareTransferRules,
-    Multimap<FeedScopedId, String> stopAreas
+    Multimap<FeedScopedId, FeedScopedId> stopAreas
   ) {
     this.legRules = legRules;
     this.transferRules = fareTransferRules;
@@ -72,9 +72,9 @@ public ProductResult getProducts(Itinerary itinerary) {
     return new ProductResult(coveringItinerary, allLegProducts);
   }
 
-  private static Set<String> findAreasWithRules(
+  private static Set<FeedScopedId> findAreasWithRules(
     List<FareLegRule> legRules,
-    Function<FareLegRule, String> getArea
+    Function<FareLegRule, FeedScopedId> getArea
   ) {
     return legRules.stream().map(getArea).filter(Objects::nonNull).collect(Collectors.toSet());
   }
@@ -207,7 +207,11 @@ private Optional<FareLegRule> getFareLegRuleByGroupId(FeedScopedId groupId) {
     return legRules.stream().filter(lr -> groupId.equals(lr.legGroupId())).findAny();
   }
 
-  private boolean matchesArea(StopLocation stop, String areaId, Set<String> areasWithRules) {
+  private boolean matchesArea(
+    StopLocation stop,
+    FeedScopedId areaId,
+    Set<FeedScopedId> areasWithRules
+  ) {
     var stopAreas = this.stopAreas.get(stop.getId());
     return (
       (isNull(areaId) && stopAreas.stream().noneMatch(areasWithRules::contains)) ||

application/src/ext/java/org/opentripplanner/ext/fares/model/FareLegRule.java

@@ -12,8 +12,8 @@ public record FareLegRule(
   FeedScopedId id,
   @Nullable FeedScopedId legGroupId,
   @Nullable FeedScopedId networkId,
-  @Nullable String fromAreaId,
-  @Nullable String toAreaId,
+  @Nullable FeedScopedId fromAreaId,
+  @Nullable FeedScopedId toAreaId,
   @Nullable FareDistance fareDistance,
   Collection<FareProduct> fareProducts
 ) {

application/src/ext/java/org/opentripplanner/ext/fares/model/FareLegRuleBuilder.java

@@ -13,9 +13,9 @@ public class FareLegRuleBuilder {
   private final Collection<FareProduct> fareProducts;
   private FeedScopedId legGroupId;
   private FeedScopedId networkId;
-  private String fromAreaId;
+  private FeedScopedId fromAreaId;
+  private FeedScopedId toAreaId;
   private FareDistance fareDistance = null;
-  private String toAreaId;
 
   public FareLegRuleBuilder(FeedScopedId id, Collection<FareProduct> products) {
     this.id = id;
@@ -32,7 +32,7 @@ public FareLegRuleBuilder withNetworkId(FeedScopedId networkId) {
     return this;
   }
 
-  public FareLegRuleBuilder withFromAreaId(String fromAreaId) {
+  public FareLegRuleBuilder withFromAreaId(FeedScopedId fromAreaId) {
     this.fromAreaId = fromAreaId;
     return this;
   }
@@ -42,7 +42,7 @@ public FareLegRuleBuilder withFareDistance(FareDistance fareDistance) {
     return this;
   }
 
-  public FareLegRuleBuilder withToAreaId(String toAreaId) {
+  public FareLegRuleBuilder withToAreaId(FeedScopedId toAreaId) {
     this.toAreaId = toAreaId;
     return this;
   }

application/src/main/java/org/opentripplanner/gtfs/mapping/FareLegRuleMapper.java

@@ -43,7 +43,7 @@ public Collection<FareLegRule> map(
           var ruleId = new FeedScopedId(fareProductId.getFeedId(), r.getId());
           return FareLegRule.of(ruleId, productsForRule)
             .withLegGroupId(idFactory.toId(r.getLegGroupId()))
-            .withNetworkId(FeedScopedId.ofNullable(fareProductId.getFeedId(), r.getNetworkId()))
+            .withNetworkId(idFactory.id(r.getNetworkId()))
             .withFromAreaId(areaId(r.getFromArea()))
             .withToAreaId(areaId(r.getToArea()))
             .withFareDistance(fareDistance)
@@ -62,11 +62,11 @@ public Collection<FareLegRule> map(
       .toList();
   }
 
-  private static String areaId(@Nullable org.onebusaway.gtfs.model.Area area) {
+  private FeedScopedId areaId(@Nullable org.onebusaway.gtfs.model.Area area) {
     if (area == null) {
       return null;
     } else {
-      return area.getAreaId();
+      return idFactory.id(area.getAreaId());
     }
   }