From b2a74a991c680e8a39791113048961a0aee7c1a3 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 16 Aug 2018 16:11:44 +0200 Subject: [PATCH] Review: - Rename GTFSPatternHopFactory to PatternHopFactory - Rename method mapDao(...) to mapGtfsDaoToOTPTransitService(...) - Rename OtpTransitDaoMapper to GTFSToOtpTransitServiceMapper - Rename OtpTransitBuilder to OtpTransitServiceBuilder - Rename GTFSPatternHopFactory to PatternHopFactory - Add JavaDoc to all mapper classes and OtpTransitServiceBuilder - Cleanup JavaDoc in OtpTransitServiceImpl - Delete InterliningTrip (not used in PatternHopFactory) --- .../graph_builder/module/GtfsModule.java | 8 ++-- .../org/opentripplanner/gtfs/GtfsLibrary.java | 4 +- .../org/opentripplanner/gtfs/MockGtfs.java | 6 +-- .../gtfs/mapping/AgencyAndIdMapper.java | 3 ++ .../gtfs/mapping/AgencyMapper.java | 2 + .../gtfs/mapping/FareAttributeMapper.java | 2 + .../gtfs/mapping/FareRuleMapper.java | 2 + .../gtfs/mapping/FeedInfoMapper.java | 2 + .../gtfs/mapping/FrequencyMapper.java | 2 + ...ava => GTFSToOtpTransitServiceMapper.java} | 19 +++++--- .../gtfs/mapping/PathwayMapper.java | 2 + .../gtfs/mapping/RouteMapper.java | 2 + .../mapping/ServiceCalendarDateMapper.java | 2 + .../gtfs/mapping/ServiceCalendarMapper.java | 2 + .../gtfs/mapping/ServiceDateMapper.java | 2 + .../gtfs/mapping/ShapePointMapper.java | 2 + .../gtfs/mapping/StopMapper.java | 2 + .../gtfs/mapping/StopTimeMapper.java | 2 + .../gtfs/mapping/TransferMapper.java | 4 +- .../gtfs/mapping/TripMapper.java | 1 + ...ultipleCalendarsForServiceIdException.java | 4 +- ...der.java => OtpTransitServiceBuilder.java} | 21 +++++---- .../model/impl/OtpTransitServiceImpl.java | 14 +++--- .../edgetype/factory/GtfsStopContext.java | 2 +- ...HopFactory.java => PatternHopFactory.java} | 43 +++---------------- .../stoptime/TimetableSnapshotSource.java | 2 +- .../opentripplanner/ConstantsForTests.java | 6 +-- .../impl/OtpTransitServiceBuilderTest.java | 10 ++--- .../model/impl/OtpTransitServiceImplTest.java | 4 +- .../routing/alertpatch/AlertPatchTest.java | 4 +- .../routing/algorithm/TestAStar.java | 4 +- .../routing/algorithm/TestFares.java | 8 ++-- .../routing/algorithm/TestGraphPath.java | 4 +- .../routing/core/TestOnBoardRouting.java | 4 +- .../routing/core/TestTransfers.java | 4 +- .../edgetype/TimetableSnapshotTest.java | 4 +- .../routing/edgetype/TimetableTest.java | 4 +- ...ryTest.java => PatternHopFactoryTest.java} | 4 +- .../edgetype/loader/TestHopFactory.java | 4 +- .../loader/TestPatternHopFactory.java | 4 +- .../stoptime/TimetableSnapshotSourceTest.java | 4 +- 41 files changed, 121 insertions(+), 108 deletions(-) rename src/main/java/org/opentripplanner/gtfs/mapping/{OtpTransitDaoMapper.java => GTFSToOtpTransitServiceMapper.java} (79%) rename src/main/java/org/opentripplanner/model/impl/{OtpTransitBuilder.java => OtpTransitServiceBuilder.java} (87%) rename src/main/java/org/opentripplanner/routing/edgetype/factory/{GTFSPatternHopFactory.java => PatternHopFactory.java} (98%) rename src/test/java/org/opentripplanner/routing/edgetype/factory/{GTFSPatternHopFactoryTest.java => PatternHopFactoryTest.java} (92%) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/GtfsModule.java b/src/main/java/org/opentripplanner/graph_builder/module/GtfsModule.java index f1089149245..cc2947e7f2a 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/GtfsModule.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/GtfsModule.java @@ -34,7 +34,7 @@ import org.opentripplanner.gtfs.GtfsContext; import org.opentripplanner.gtfs.GtfsLibrary; import org.opentripplanner.model.OtpTransitService; -import org.opentripplanner.routing.edgetype.factory.GTFSPatternHopFactory; +import org.opentripplanner.routing.edgetype.factory.PatternHopFactory; import org.opentripplanner.routing.edgetype.factory.GtfsStopContext; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.services.FareServiceFactory; @@ -44,7 +44,7 @@ import com.google.common.collect.Sets; import static org.opentripplanner.calendar.impl.CalendarServiceDataFactoryImpl.createCalendarSrvDataWithoutDatesForLocalizedSrvId; -import static org.opentripplanner.gtfs.mapping.OtpTransitDaoMapper.mapDao; +import static org.opentripplanner.gtfs.mapping.GTFSToOtpTransitServiceMapper.mapGtfsDaoToOTPTransitService; public class GtfsModule implements GraphBuilderModule { @@ -105,12 +105,12 @@ public void buildGraph(Graph graph, HashMap, Object> extra) { gtfsBundle.useCached = useCached; } - OtpTransitService transitService = mapDao(loadBundle(gtfsBundle)); + OtpTransitService transitService = mapGtfsDaoToOTPTransitService(loadBundle(gtfsBundle)); GtfsContext context = GtfsLibrary .createContext(gtfsBundle.getFeedId(), transitService, calendarService); - GTFSPatternHopFactory hf = new GTFSPatternHopFactory(context); + PatternHopFactory hf = new PatternHopFactory(context); hf.setStopContext(stopContext); hf.setFareServiceFactory(fareServiceFactory); diff --git a/src/main/java/org/opentripplanner/gtfs/GtfsLibrary.java b/src/main/java/org/opentripplanner/gtfs/GtfsLibrary.java index 096d1cefa9b..2177f3ebc7d 100644 --- a/src/main/java/org/opentripplanner/gtfs/GtfsLibrary.java +++ b/src/main/java/org/opentripplanner/gtfs/GtfsLibrary.java @@ -1,7 +1,7 @@ package org.opentripplanner.gtfs; import org.opentripplanner.graph_builder.module.GtfsFeedId; -import org.opentripplanner.gtfs.mapping.OtpTransitDaoMapper; +import org.opentripplanner.gtfs.mapping.GTFSToOtpTransitServiceMapper; import org.opentripplanner.model.FeedId; import org.opentripplanner.model.CalendarService; import org.opentripplanner.model.OtpTransitService; @@ -31,7 +31,7 @@ public static GtfsContext readGtfs(File path) throws IOException { GtfsImport gtfsImport = new GtfsImport(path); GtfsFeedId feedId = gtfsImport.getFeedId(); - OtpTransitService transitService = OtpTransitDaoMapper.mapDao(gtfsImport.getDao()); + OtpTransitService transitService = GTFSToOtpTransitServiceMapper.mapGtfsDaoToOTPTransitService(gtfsImport.getDao()); CalendarService calendarService = createCalendarService(transitService); return new GtfsContextImpl(feedId, transitService, calendarService); diff --git a/src/main/java/org/opentripplanner/gtfs/MockGtfs.java b/src/main/java/org/opentripplanner/gtfs/MockGtfs.java index aff5e497041..9262e024d83 100644 --- a/src/main/java/org/opentripplanner/gtfs/MockGtfs.java +++ b/src/main/java/org/opentripplanner/gtfs/MockGtfs.java @@ -2,7 +2,7 @@ import org.opentripplanner.model.FeedId; import org.opentripplanner.gtfs.mapping.AgencyAndIdMapper; -import org.opentripplanner.gtfs.mapping.OtpTransitDaoMapper; +import org.opentripplanner.gtfs.mapping.GTFSToOtpTransitServiceMapper; import org.opentripplanner.model.OtpTransitService; import java.io.File; @@ -41,11 +41,11 @@ public void putLines(String fileName, String... rows) { } public OtpTransitService read() throws IOException { - return OtpTransitDaoMapper.mapDao(gtfsDelegate.read()); + return GTFSToOtpTransitServiceMapper.mapGtfsDaoToOTPTransitService(gtfsDelegate.read()); } public OtpTransitService read(org.onebusaway.gtfs.serialization.GtfsReader reader) throws IOException { - return OtpTransitDaoMapper.mapDao(gtfsDelegate.read(reader)); + return GTFSToOtpTransitServiceMapper.mapGtfsDaoToOTPTransitService(gtfsDelegate.read(reader)); } public void putMinimal() { diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/AgencyAndIdMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/AgencyAndIdMapper.java index d6ad4d1fbd9..9cffc09307c 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/AgencyAndIdMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/AgencyAndIdMapper.java @@ -2,7 +2,10 @@ import org.opentripplanner.model.FeedId; +/** Responsible for mapping GTFS AgencyAndId into the OTP model. */ public class AgencyAndIdMapper { + + /** Map from GTFS to OTP model, {@code null} safe. */ public static FeedId mapAgencyAndId(org.onebusaway.gtfs.model.AgencyAndId id) { return id == null ? null : new FeedId(id.getAgencyId(), id.getId()); } diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/AgencyMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/AgencyMapper.java index 03e1c033c6d..5465c121659 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/AgencyMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/AgencyMapper.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.Map; +/** Responsible for mapping GTFS Agency into the OTP model. */ class AgencyMapper { private final Map mappedAgencies = new HashMap<>(); @@ -15,6 +16,7 @@ Collection map(Collection agencies) { return MapUtils.mapToList(agencies, this::map); } + /** Map from GTFS to OTP model, {@code null} safe. */ Agency map(org.onebusaway.gtfs.model.Agency orginal) { return orginal == null ? null : mappedAgencies.computeIfAbsent(orginal, this::doMap); } diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/FareAttributeMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/FareAttributeMapper.java index 9aae2c0c681..2f335b206d4 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/FareAttributeMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/FareAttributeMapper.java @@ -9,6 +9,7 @@ import static org.opentripplanner.gtfs.mapping.AgencyAndIdMapper.mapAgencyAndId; +/** Responsible for mapping GTFS FareAttribute into the OTP model. */ class FareAttributeMapper { private Map mappedStops = new HashMap<>(); @@ -16,6 +17,7 @@ Collection map(Collection map(Collection allFareR return MapUtils.mapToList(allFareRules, this::map); } + /** Map from GTFS to OTP model, {@code null} safe. */ FareRule map(org.onebusaway.gtfs.model.FareRule orginal) { return orginal == null ? null : mappedFareRules.computeIfAbsent(orginal, this::doMap); } diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/FeedInfoMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/FeedInfoMapper.java index 41442960c5e..c050ea6fae5 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/FeedInfoMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/FeedInfoMapper.java @@ -9,6 +9,7 @@ import static org.opentripplanner.gtfs.mapping.ServiceDateMapper.mapServiceDate; +/** Responsible for mapping GTFS FeedInfo into the OTP model. */ class FeedInfoMapper { private Map mappedFeedInfos = new HashMap<>(); @@ -16,6 +17,7 @@ Collection map(Collection feedInfo return feedInfos == null ? null : MapUtils.mapToList(feedInfos, this::map); } + /** Map from GTFS to OTP model, {@code null} safe. */ FeedInfo map(org.onebusaway.gtfs.model.FeedInfo orginal) { return orginal == null ? null : mappedFeedInfos.computeIfAbsent(orginal, this::doMap); } diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/FrequencyMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/FrequencyMapper.java index 0daf4f29ad9..94632cf2b62 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/FrequencyMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/FrequencyMapper.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.Map; +/** Responsible for mapping GTFS Frequency into the OTP model. */ class FrequencyMapper { private final TripMapper tripMapper; @@ -20,6 +21,7 @@ Collection map(Collection allFre return MapUtils.mapToList(allFrequencys, this::map); } + /** Map from GTFS to OTP model, {@code null} safe. */ Frequency map(org.onebusaway.gtfs.model.Frequency orginal) { return orginal == null ? null : mappedFrequencys.computeIfAbsent(orginal, this::doMap); } diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/OtpTransitDaoMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java similarity index 79% rename from src/main/java/org/opentripplanner/gtfs/mapping/OtpTransitDaoMapper.java rename to src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java index cb1b2ecc2db..2805052595e 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/OtpTransitDaoMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java @@ -1,9 +1,15 @@ package org.opentripplanner.gtfs.mapping; -import org.opentripplanner.model.impl.OtpTransitBuilder; +import org.opentripplanner.model.impl.OtpTransitServiceBuilder; import org.opentripplanner.model.OtpTransitService; -public class OtpTransitDaoMapper { + +/** + * This class is responsible for mapping between GTFS DAO objects and into OTP Transit model. + * General mapping code or reusable bussiness logic should be moved into the Builder; hence + * reusable for other import modules. + */ +public class GTFSToOtpTransitServiceMapper { private final AgencyMapper agencyMapper = new AgencyMapper(); private final StopMapper stopMapper = new StopMapper(); @@ -36,12 +42,15 @@ public class OtpTransitDaoMapper { routeMapper, fareAttributeMapper ); - public static OtpTransitService mapDao(org.onebusaway.gtfs.services.GtfsRelationalDao data) { - return new OtpTransitDaoMapper().map(data); + /** + * Map from GTFS data to the internal OTP model + */ + public static OtpTransitService mapGtfsDaoToOTPTransitService(org.onebusaway.gtfs.services.GtfsRelationalDao data) { + return new GTFSToOtpTransitServiceMapper().map(data); } private OtpTransitService map(org.onebusaway.gtfs.services.GtfsRelationalDao data) { - OtpTransitBuilder builder = new OtpTransitBuilder(); + OtpTransitServiceBuilder builder = new OtpTransitServiceBuilder(); builder.getAgencies().addAll(agencyMapper.map(data.getAllAgencies())); builder.getCalendarDates().addAll(serviceCalendarDateMapper.map(data.getAllCalendarDates())); diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/PathwayMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/PathwayMapper.java index b7a67c52870..f992f781e4f 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/PathwayMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/PathwayMapper.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.Map; +/** Responsible for mapping GTFS Pathway into the OTP model. */ class PathwayMapper { private final StopMapper stopMapper; @@ -21,6 +22,7 @@ Collection map(Collection allPathway return MapUtils.mapToList(allPathways, this::map); } + /** Map from GTFS to OTP model, {@code null} safe. */ Pathway map(org.onebusaway.gtfs.model.Pathway orginal) { return orginal == null ? null : mappedPathways.computeIfAbsent(orginal, this::doMap); } diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/RouteMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/RouteMapper.java index ffb2fade8d4..a9108fd2818 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/RouteMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/RouteMapper.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.Map; +/** Responsible for mapping GTFS Route into the OTP model. */ class RouteMapper { private final AgencyMapper agencyMapper; @@ -20,6 +21,7 @@ Collection map(Collection agencies) { return MapUtils.mapToList(agencies, this::map); } + /** Map from GTFS to OTP model, {@code null} safe. */ Route map(org.onebusaway.gtfs.model.Route orginal) { return orginal == null ? null : mappedRoutes.computeIfAbsent(orginal, this::doMap); } diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/ServiceCalendarDateMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/ServiceCalendarDateMapper.java index a4e4feab83b..e8901be8d45 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/ServiceCalendarDateMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/ServiceCalendarDateMapper.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.Map; +/** Responsible for mapping GTFS ServiceCalendarDate into the OTP model. */ class ServiceCalendarDateMapper { private Map mappedServiceDates = new HashMap<>(); @@ -15,6 +16,7 @@ Collection map( return MapUtils.mapToList(allServiceDates, this::map); } + /** Map from GTFS to OTP model, {@code null} safe. */ ServiceCalendarDate map(org.onebusaway.gtfs.model.ServiceCalendarDate orginal) { return orginal == null ? null : mappedServiceDates.computeIfAbsent(orginal, this::doMap); } diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/ServiceCalendarMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/ServiceCalendarMapper.java index dfee8babab2..01be52300ce 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/ServiceCalendarMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/ServiceCalendarMapper.java @@ -9,6 +9,7 @@ import static org.opentripplanner.gtfs.mapping.AgencyAndIdMapper.mapAgencyAndId; +/** Responsible for mapping GTFS ServiceCalendar into the OTP model. */ class ServiceCalendarMapper { private Map mappedCalendars = new HashMap<>(); @@ -17,6 +18,7 @@ Collection map( return MapUtils.mapToList(allServiceCalendars, this::map); } + /** Map from GTFS to OTP model, {@code null} safe. */ ServiceCalendar map(org.onebusaway.gtfs.model.ServiceCalendar orginal) { return orginal == null ? null : mappedCalendars.computeIfAbsent(orginal, this::doMap); } diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/ServiceDateMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/ServiceDateMapper.java index a8adab0a31b..d1c72bd2221 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/ServiceDateMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/ServiceDateMapper.java @@ -2,7 +2,9 @@ import org.opentripplanner.model.calendar.ServiceDate; +/** Responsible for mapping GTFS ServiceDate into the OTP model. */ class ServiceDateMapper { + /** Map from GTFS to OTP model, {@code null} safe. */ static ServiceDate mapServiceDate(org.onebusaway.gtfs.model.calendar.ServiceDate orginal) { return orginal == null ? null : diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/ShapePointMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/ShapePointMapper.java index 114ce35f03e..afb433cac88 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/ShapePointMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/ShapePointMapper.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.Map; +/** Responsible for mapping GTFS ShapePoint into the OTP model. */ class ShapePointMapper { private Map mappedShapePoints = new HashMap<>(); @@ -14,6 +15,7 @@ Collection map(Collection allS return MapUtils.mapToList(allShapePoints, this::map); } + /** Map from GTFS to OTP model, {@code null} safe. */ ShapePoint map(org.onebusaway.gtfs.model.ShapePoint orginal) { return orginal == null ? null : mappedShapePoints.computeIfAbsent(orginal, this::doMap); } diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/StopMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/StopMapper.java index dc854600d22..4b7cc9db8a7 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/StopMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/StopMapper.java @@ -9,6 +9,7 @@ import static org.opentripplanner.gtfs.mapping.AgencyAndIdMapper.mapAgencyAndId; +/** Responsible for mapping GTFS Stop into the OTP model. */ class StopMapper { private Map mappedStops = new HashMap<>(); @@ -16,6 +17,7 @@ Collection map(Collection allStops) { return MapUtils.mapToList(allStops, this::map); } + /** Map from GTFS to OTP model, {@code null} safe. */ Stop map(org.onebusaway.gtfs.model.Stop orginal) { return orginal == null ? null : mappedStops.computeIfAbsent(orginal, this::doMap); } diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java index 8c36544ea9f..82412c33519 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.Map; +/** Responsible for mapping GTFS StopTime into the OTP model. */ class StopTimeMapper { private final StopMapper stopMapper; @@ -23,6 +24,7 @@ Collection map(Collection times) { return MapUtils.mapToList(times, this::map); } + /** Map from GTFS to OTP model, {@code null} safe. */ StopTime map(org.onebusaway.gtfs.model.StopTime orginal) { return orginal == null ? null : mappedStopTimes.computeIfAbsent(orginal, this::doMap); } diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/TransferMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/TransferMapper.java index 7fa80bd3d90..e7750fae97b 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/TransferMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/TransferMapper.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.Map; +/** Responsible for mapping GTFS Transfer into the OTP model. */ class TransferMapper { private final RouteMapper routeMapper; @@ -16,7 +17,7 @@ class TransferMapper { private Map mappedTransfers = new HashMap<>(); - public TransferMapper(RouteMapper routeMapper, StopMapper stopMapper, TripMapper tripMapper) { + TransferMapper(RouteMapper routeMapper, StopMapper stopMapper, TripMapper tripMapper) { this.routeMapper = routeMapper; this.stopMapper = stopMapper; this.tripMapper = tripMapper; @@ -26,6 +27,7 @@ Collection map(Collection allTrans return MapUtils.mapToList(allTransfers, this::map); } + /** Map from GTFS to OTP model, {@code null} safe. */ Transfer map(org.onebusaway.gtfs.model.Transfer orginal) { return orginal == null ? null : mappedTransfers.computeIfAbsent(orginal, this::doMap); } diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java index 6c828ce0d92..848ebbdd58d 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.Map; +/** Responsible for mapping GTFS TripMapper into the OTP model. */ class TripMapper { private final RouteMapper routeMapper; diff --git a/src/main/java/org/opentripplanner/model/impl/MultipleCalendarsForServiceIdException.java b/src/main/java/org/opentripplanner/model/impl/MultipleCalendarsForServiceIdException.java index 73de59f6b04..6d136cac11d 100644 --- a/src/main/java/org/opentripplanner/model/impl/MultipleCalendarsForServiceIdException.java +++ b/src/main/java/org/opentripplanner/model/impl/MultipleCalendarsForServiceIdException.java @@ -3,11 +3,11 @@ import org.opentripplanner.model.FeedId; -public class MultipleCalendarsForServiceIdException extends RuntimeException { +class MultipleCalendarsForServiceIdException extends RuntimeException { private static final long serialVersionUID = 1L; - public MultipleCalendarsForServiceIdException(FeedId serviceId) { + MultipleCalendarsForServiceIdException(FeedId serviceId) { super("multiple calendars found for serviceId=" + serviceId); } } diff --git a/src/main/java/org/opentripplanner/model/impl/OtpTransitBuilder.java b/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java similarity index 87% rename from src/main/java/org/opentripplanner/model/impl/OtpTransitBuilder.java rename to src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java index 8aa04e4bcab..6748a4af19a 100644 --- a/src/main/java/org/opentripplanner/model/impl/OtpTransitBuilder.java +++ b/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java @@ -20,7 +20,12 @@ import java.util.ArrayList; import java.util.List; -public class OtpTransitBuilder { +/** + * This class is responsible for building a {@link OtpTransitService}. The instance returned by the + * {@link #build()} method is read only, and this class provide a mutable collections to construct + * a {@link OtpTransitService} instance. + */ +public class OtpTransitServiceBuilder { private final List agencies = new ArrayList<>(); private final List calendarDates = new ArrayList<>(); @@ -49,14 +54,14 @@ public class OtpTransitBuilder { private final List trips = new ArrayList<>(); - public OtpTransitBuilder() { + public OtpTransitServiceBuilder() { } - public OtpTransitBuilder(OtpTransitService transitService) { + public OtpTransitServiceBuilder(OtpTransitService transitService) { add(transitService); } - public OtpTransitBuilder add(OtpTransitService other) { + public OtpTransitServiceBuilder add(OtpTransitService other) { agencies.addAll(other.getAllAgencies()); calendarDates.addAll(other.getAllCalendarDates()); calendars.addAll(other.getAllCalendars()); @@ -132,18 +137,18 @@ public List getTrips() { public OtpTransitService build() { - createNoneExistingIds(); + createNoneExistentIds(); return new OtpTransitServiceImpl(agencies, calendarDates, calendars, fareAttributes, fareRules, feedInfos, frequencies, pathways, routes, shapePoints, stops, stopTimes, transfers, trips); } - private void createNoneExistingIds() { - generateNoneExistingIds(feedInfos); + private void createNoneExistentIds() { + generateNoneExistentIds(feedInfos); } - static > void generateNoneExistingIds(List entities) { + static > void generateNoneExistentIds(List entities) { int maxId = 0; for (T it : entities) { maxId = zeroOrNull(it.getId()) ? maxId : Math.max(maxId, it.getId()); diff --git a/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceImpl.java b/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceImpl.java index 6ab1aacc713..26a9a67c93c 100644 --- a/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceImpl.java +++ b/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceImpl.java @@ -32,15 +32,15 @@ import static java.util.stream.Collectors.toMap; /** - * A in-memory implementation of OtpTransitDao. It's super fast for most - * methods, but only if you have enough memory to load your entire OtpTransitDao + * A in-memory implementation of {@link OtpTransitService}. It's super fast for most + * methods, but only if you have enough memory to load your entire {@link OtpTransitService} * into memory. *

- * The Dao is read only, to enforece consistency after generating indexes and ids. + * This class is read only, to enforce consistency after generating indexes and ids. * You will get an exception if you try to add entities to one of the collections. * If you need to modify a {@link OtpTransitService}, you can create a new - * {@link OtpTransitBuilder} based on your old data, do your modification and - * create a new unmodifiable dao. + * {@link OtpTransitServiceBuilder} based on your old data, do your modification and + * create a new unmodifiable instance. * * @author bdferris */ @@ -88,8 +88,8 @@ class OtpTransitServiceImpl implements OtpTransitService { private Map> calendarsByServiceId = null; /** - * Create a read only version of the OtpTransitDao. - * @see OtpTransitBuilder Use builder to create an new OtpTransitDao. + * Create a read only version of the {@link OtpTransitService}. + * @see OtpTransitServiceBuilder Use builder to mutate the instance. */ OtpTransitServiceImpl(List agencies, List calendarDates, List calendars, List fareAttributes, diff --git a/src/main/java/org/opentripplanner/routing/edgetype/factory/GtfsStopContext.java b/src/main/java/org/opentripplanner/routing/edgetype/factory/GtfsStopContext.java index 0cdff9f1a1c..43122f9a4a4 100644 --- a/src/main/java/org/opentripplanner/routing/edgetype/factory/GtfsStopContext.java +++ b/src/main/java/org/opentripplanner/routing/edgetype/factory/GtfsStopContext.java @@ -15,7 +15,7 @@ import org.opentripplanner.routing.vertextype.TransitStopDepart; /** - * Retains graph-wide information between GTFSPatternHopFactory runs on different feeds. + * Retains graph-wide information between PatternHopFactory runs on different feeds. * FIXME is there any legitimate reason to even do that? Wouldn't it be better to keep each GTFS completely isolated? */ public class GtfsStopContext { diff --git a/src/main/java/org/opentripplanner/routing/edgetype/factory/GTFSPatternHopFactory.java b/src/main/java/org/opentripplanner/routing/edgetype/factory/PatternHopFactory.java similarity index 98% rename from src/main/java/org/opentripplanner/routing/edgetype/factory/GTFSPatternHopFactory.java rename to src/main/java/org/opentripplanner/routing/edgetype/factory/PatternHopFactory.java index b8723197c40..bfba00b3a2b 100644 --- a/src/main/java/org/opentripplanner/routing/edgetype/factory/GTFSPatternHopFactory.java +++ b/src/main/java/org/opentripplanner/routing/edgetype/factory/PatternHopFactory.java @@ -94,40 +94,7 @@ // Filtering out (removing) stoptimes from a trip forces us to either have two copies of that list, // or do all the steps within one loop over trips. It would be clearer if there were multiple loops over the trips. -/** A wrapper class for Trips that allows them to be sorted. */ -class InterliningTrip implements Comparable { - public Trip trip; - public StopTime firstStopTime; - public StopTime lastStopTime; - TripPattern tripPattern; - - InterliningTrip(Trip trip, List stopTimes, TripPattern tripPattern) { - this.trip = trip; - this.firstStopTime = stopTimes.get(0); - this.lastStopTime = stopTimes.get(stopTimes.size() - 1); - this.tripPattern = tripPattern; - } - - public int getPatternIndex() { - return tripPattern.getTripIndex(trip); - } - - @Override - public int compareTo(InterliningTrip o) { - return firstStopTime.getArrivalTime() - o.firstStopTime.getArrivalTime(); - } - - @Override - public boolean equals(Object o) { - if (o instanceof InterliningTrip) { - return compareTo((InterliningTrip) o) == 0; - } - return false; - } - -} - -/** +/** * This compound key object is used when grouping interlining trips together by (serviceId, blockId). */ class BlockIdAndServiceId { @@ -267,9 +234,9 @@ public int compare(IndexedLineSegment a, IndexedLineSegment b) { /** * Generates a set of edges from GTFS. */ -public class GTFSPatternHopFactory { +public class PatternHopFactory { - private static final Logger LOG = LoggerFactory.getLogger(GTFSPatternHopFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(PatternHopFactory.class); private static final int SECONDS_IN_HOUR = 60 * 60; // rename to seconds in hour @@ -303,13 +270,13 @@ public class GTFSPatternHopFactory { public int maxInterlineDistance = 200; - public GTFSPatternHopFactory(GtfsContext context) { + public PatternHopFactory(GtfsContext context) { this.feedId = context.getFeedId(); this.transitService = context.getOtpTransitService(); this.calendarService = context.getCalendarService(); } - public GTFSPatternHopFactory() { + public PatternHopFactory() { this.feedId = null; this.transitService = null; this.calendarService = null; diff --git a/src/main/java/org/opentripplanner/updater/stoptime/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/stoptime/TimetableSnapshotSource.java index ea3837dc7cb..ba0e05d8555 100644 --- a/src/main/java/org/opentripplanner/updater/stoptime/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/stoptime/TimetableSnapshotSource.java @@ -679,7 +679,7 @@ private boolean addTripToGraphAndBuffer(final String feedId, final Graph graph, } } - // TODO: filter/interpolate stop times like in GTFSPatternHopFactory? + // TODO: filter/interpolate stop times like in PatternHopFactory? // Create StopPattern final StopPattern stopPattern = new StopPattern(stopTimes); diff --git a/src/test/java/org/opentripplanner/ConstantsForTests.java b/src/test/java/org/opentripplanner/ConstantsForTests.java index 8ce54f4109d..e0227270a98 100644 --- a/src/test/java/org/opentripplanner/ConstantsForTests.java +++ b/src/test/java/org/opentripplanner/ConstantsForTests.java @@ -8,7 +8,7 @@ import org.opentripplanner.graph_builder.module.StreetLinkerModule; import org.opentripplanner.gtfs.GtfsContext; import org.opentripplanner.gtfs.GtfsLibrary; -import org.opentripplanner.routing.edgetype.factory.GTFSPatternHopFactory; +import org.opentripplanner.routing.edgetype.factory.PatternHopFactory; import org.opentripplanner.routing.edgetype.factory.TransferGraphLinker; import org.opentripplanner.routing.graph.Graph; @@ -61,7 +61,7 @@ private void setupPortland() { try { portlandContext = GtfsLibrary.readGtfs(new File(ConstantsForTests.PORTLAND_GTFS)); portlandGraph = new Graph(); - GTFSPatternHopFactory factory = new GTFSPatternHopFactory(portlandContext); + PatternHopFactory factory = new PatternHopFactory(portlandContext); factory.run(portlandGraph); TransferGraphLinker linker = new TransferGraphLinker(portlandGraph); linker.run(); @@ -89,7 +89,7 @@ public static Graph buildGraph(String path) { return null; } Graph graph = new Graph(); - GTFSPatternHopFactory factory = new GTFSPatternHopFactory(context); + PatternHopFactory factory = new PatternHopFactory(context); factory.run(graph); graph.putService( CalendarServiceData.class, diff --git a/src/test/java/org/opentripplanner/model/impl/OtpTransitServiceBuilderTest.java b/src/test/java/org/opentripplanner/model/impl/OtpTransitServiceBuilderTest.java index ebedb94e058..952f5cdb0c4 100644 --- a/src/test/java/org/opentripplanner/model/impl/OtpTransitServiceBuilderTest.java +++ b/src/test/java/org/opentripplanner/model/impl/OtpTransitServiceBuilderTest.java @@ -11,7 +11,7 @@ import static java.lang.Integer.valueOf; import static java.util.Collections.singletonList; import static org.junit.Assert.*; -import static org.opentripplanner.model.impl.OtpTransitBuilder.generateNoneExistingIds; +import static org.opentripplanner.model.impl.OtpTransitServiceBuilder.generateNoneExistentIds; /** * @author Thomas Gran (Capra) - tgr@capraconsulting.no (30.10.2017) @@ -24,16 +24,16 @@ public class OtpTransitServiceBuilderTest { private static final Integer ID_6 = valueOf(6); @Test - public void testGenerateNoneExistingIds() throws Exception { + public void testGenerateNoneExistentIds() throws Exception { List> list; // An empty list should not cause any trouble (Exception) - generateNoneExistingIds(Collections.emptyList()); + generateNoneExistentIds(Collections.emptyList()); // Generate id for one value list = singletonList(newEntity()); - generateNoneExistingIds(list); + generateNoneExistentIds(list); assertEquals(ID_1, list.get(0).getId()); // Given two entities with no id and max Íd = 4 @@ -43,7 +43,7 @@ public void testGenerateNoneExistingIds() throws Exception { newEntity() ); // When - generateNoneExistingIds(list); + generateNoneExistentIds(list); // Then expect // First new id to be: maxId + 1 = 4+1 = 5 assertEquals(ID_5, id(list, 0)); diff --git a/src/test/java/org/opentripplanner/model/impl/OtpTransitServiceImplTest.java b/src/test/java/org/opentripplanner/model/impl/OtpTransitServiceImplTest.java index 9ee96845ebe..ef9f362efa8 100644 --- a/src/test/java/org/opentripplanner/model/impl/OtpTransitServiceImplTest.java +++ b/src/test/java/org/opentripplanner/model/impl/OtpTransitServiceImplTest.java @@ -20,7 +20,7 @@ import org.opentripplanner.model.Trip; import org.opentripplanner.model.calendar.ServiceDate; import org.opentripplanner.ConstantsForTests; -import org.opentripplanner.gtfs.mapping.OtpTransitDaoMapper; +import org.opentripplanner.gtfs.mapping.GTFSToOtpTransitServiceMapper; import java.io.File; import java.io.IOException; @@ -56,7 +56,7 @@ public static void setup() throws IOException { reader.setDefaultAgencyId(FEED_ID); reader.run(); - OtpTransitBuilder builder = new OtpTransitBuilder(OtpTransitDaoMapper.mapDao(dao)); + OtpTransitServiceBuilder builder = new OtpTransitServiceBuilder(GTFSToOtpTransitServiceMapper.mapGtfsDaoToOTPTransitService(dao)); agency = first(builder.getAgencies()); // Supplement test data with at least one entity in all collections diff --git a/src/test/java/org/opentripplanner/routing/alertpatch/AlertPatchTest.java b/src/test/java/org/opentripplanner/routing/alertpatch/AlertPatchTest.java index e8a885cf4ba..9a18eadf282 100644 --- a/src/test/java/org/opentripplanner/routing/alertpatch/AlertPatchTest.java +++ b/src/test/java/org/opentripplanner/routing/alertpatch/AlertPatchTest.java @@ -15,7 +15,7 @@ import org.opentripplanner.routing.algorithm.AStar; import org.opentripplanner.routing.core.RoutingRequest; import org.opentripplanner.routing.core.State; -import org.opentripplanner.routing.edgetype.factory.GTFSPatternHopFactory; +import org.opentripplanner.routing.edgetype.factory.PatternHopFactory; import org.opentripplanner.routing.graph.Edge; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.graph.Vertex; @@ -40,7 +40,7 @@ public void setUp() throws Exception { GtfsContext context = GtfsLibrary.readGtfs(new File(ConstantsForTests.FAKE_GTFS)); options = new RoutingRequest(); graph = new Graph(); - GTFSPatternHopFactory factory = new GTFSPatternHopFactory(context); + PatternHopFactory factory = new PatternHopFactory(context); factory.run(graph); graph.putService( CalendarServiceData.class, diff --git a/src/test/java/org/opentripplanner/routing/algorithm/TestAStar.java b/src/test/java/org/opentripplanner/routing/algorithm/TestAStar.java index a0ccc5ac73c..7137d372975 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/TestAStar.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/TestAStar.java @@ -9,7 +9,7 @@ import org.opentripplanner.gtfs.GtfsContext; import org.opentripplanner.gtfs.GtfsLibrary; import org.opentripplanner.routing.core.RoutingRequest; -import org.opentripplanner.routing.edgetype.factory.GTFSPatternHopFactory; +import org.opentripplanner.routing.edgetype.factory.PatternHopFactory; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.graph.Vertex; import org.opentripplanner.routing.spt.GraphPath; @@ -27,7 +27,7 @@ public void testBasic() throws Exception { GtfsContext context = GtfsLibrary.readGtfs(new File(ConstantsForTests.CALTRAIN_GTFS)); Graph gg = new Graph(); - GTFSPatternHopFactory factory = new GTFSPatternHopFactory(context); + PatternHopFactory factory = new PatternHopFactory(context); factory.run(gg); gg.putService( CalendarServiceData.class, diff --git a/src/test/java/org/opentripplanner/routing/algorithm/TestFares.java b/src/test/java/org/opentripplanner/routing/algorithm/TestFares.java index a9877e5aa1b..744ba6502cd 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/TestFares.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/TestFares.java @@ -12,7 +12,7 @@ import org.opentripplanner.routing.core.Money; import org.opentripplanner.routing.core.RoutingRequest; import org.opentripplanner.routing.core.WrappedCurrency; -import org.opentripplanner.routing.edgetype.factory.GTFSPatternHopFactory; +import org.opentripplanner.routing.edgetype.factory.PatternHopFactory; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.impl.SeattleFareServiceFactory; import org.opentripplanner.routing.services.FareService; @@ -33,7 +33,7 @@ public void testBasic() throws Exception { Graph gg = new Graph(); GtfsContext context = GtfsLibrary.readGtfs(new File(ConstantsForTests.CALTRAIN_GTFS)); - GTFSPatternHopFactory factory = new GTFSPatternHopFactory(context); + PatternHopFactory factory = new PatternHopFactory(context); factory.run(gg); gg.putService( CalendarServiceData.class, @@ -111,7 +111,7 @@ public void testKCM() throws Exception { Graph gg = new Graph(); GtfsContext context = GtfsLibrary.readGtfs(new File(ConstantsForTests.KCM_GTFS)); - GTFSPatternHopFactory factory = new GTFSPatternHopFactory(context); + PatternHopFactory factory = new PatternHopFactory(context); factory.setFareServiceFactory(new SeattleFareServiceFactory()); factory.run(gg); @@ -152,7 +152,7 @@ public void testKCM() throws Exception { public void testFareComponent() throws Exception { Graph gg = new Graph(); GtfsContext context = GtfsLibrary.readGtfs(new File(ConstantsForTests.FARE_COMPONENT_GTFS)); - GTFSPatternHopFactory factory = new GTFSPatternHopFactory(context); + PatternHopFactory factory = new PatternHopFactory(context); factory.run(gg); gg.putService( CalendarServiceData.class, diff --git a/src/test/java/org/opentripplanner/routing/algorithm/TestGraphPath.java b/src/test/java/org/opentripplanner/routing/algorithm/TestGraphPath.java index 2d9d81f7b53..712df8ad976 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/TestGraphPath.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/TestGraphPath.java @@ -12,7 +12,7 @@ import org.opentripplanner.gtfs.GtfsLibrary; import org.opentripplanner.routing.core.RoutingRequest; import org.opentripplanner.routing.core.State; -import org.opentripplanner.routing.edgetype.factory.GTFSPatternHopFactory; +import org.opentripplanner.routing.edgetype.factory.PatternHopFactory; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.graph.Vertex; import org.opentripplanner.routing.spt.GraphPath; @@ -31,7 +31,7 @@ public class TestGraphPath extends TestCase { public void setUp() throws Exception { GtfsContext context = GtfsLibrary.readGtfs(new File(ConstantsForTests.FAKE_GTFS)); graph = new Graph(); - GTFSPatternHopFactory hl = new GTFSPatternHopFactory(context); + PatternHopFactory hl = new PatternHopFactory(context); hl.run(graph); graph.putService( CalendarServiceData.class, diff --git a/src/test/java/org/opentripplanner/routing/core/TestOnBoardRouting.java b/src/test/java/org/opentripplanner/routing/core/TestOnBoardRouting.java index 7db950ed31b..db38396cf84 100644 --- a/src/test/java/org/opentripplanner/routing/core/TestOnBoardRouting.java +++ b/src/test/java/org/opentripplanner/routing/core/TestOnBoardRouting.java @@ -14,7 +14,7 @@ import org.opentripplanner.routing.algorithm.AStar; import org.opentripplanner.routing.edgetype.OnBoardDepartPatternHop; import org.opentripplanner.routing.edgetype.PatternHop; -import org.opentripplanner.routing.edgetype.factory.GTFSPatternHopFactory; +import org.opentripplanner.routing.edgetype.factory.PatternHopFactory; import org.opentripplanner.routing.graph.Edge; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.graph.Vertex; @@ -44,7 +44,7 @@ public class TestOnBoardRouting extends TestCase { public void setUp() throws Exception { GtfsContext context = GtfsLibrary.readGtfs(new File(ConstantsForTests.FAKE_GTFS)); graph = new Graph(); - GTFSPatternHopFactory factory = new GTFSPatternHopFactory(context); + PatternHopFactory factory = new PatternHopFactory(context); factory.run(graph); graph.putService( CalendarServiceData.class, diff --git a/src/test/java/org/opentripplanner/routing/core/TestTransfers.java b/src/test/java/org/opentripplanner/routing/core/TestTransfers.java index 282fe5d21f2..6c29a68da3e 100644 --- a/src/test/java/org/opentripplanner/routing/core/TestTransfers.java +++ b/src/test/java/org/opentripplanner/routing/core/TestTransfers.java @@ -31,7 +31,7 @@ import org.opentripplanner.routing.edgetype.TimetableSnapshot; import org.opentripplanner.routing.edgetype.TransitBoardAlight; import org.opentripplanner.routing.edgetype.TripPattern; -import org.opentripplanner.routing.edgetype.factory.GTFSPatternHopFactory; +import org.opentripplanner.routing.edgetype.factory.PatternHopFactory; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.graph.Vertex; import org.opentripplanner.routing.impl.DefaultStreetVertexIndexFactory; @@ -74,7 +74,7 @@ public Context() throws IOException { // Create graph GtfsContext context = GtfsLibrary.readGtfs(new File(ConstantsForTests.FAKE_GTFS)); graph = spy(new Graph()); - GTFSPatternHopFactory factory = new GTFSPatternHopFactory(context); + PatternHopFactory factory = new PatternHopFactory(context); factory.run(graph); graph.index(new DefaultStreetVertexIndexFactory()); graph.putService( diff --git a/src/test/java/org/opentripplanner/routing/edgetype/TimetableSnapshotTest.java b/src/test/java/org/opentripplanner/routing/edgetype/TimetableSnapshotTest.java index 36aa251d899..c308c2fcaba 100644 --- a/src/test/java/org/opentripplanner/routing/edgetype/TimetableSnapshotTest.java +++ b/src/test/java/org/opentripplanner/routing/edgetype/TimetableSnapshotTest.java @@ -25,7 +25,7 @@ import org.opentripplanner.ConstantsForTests; import org.opentripplanner.gtfs.GtfsContext; import org.opentripplanner.gtfs.GtfsLibrary; -import org.opentripplanner.routing.edgetype.factory.GTFSPatternHopFactory; +import org.opentripplanner.routing.edgetype.factory.PatternHopFactory; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.trippattern.TripTimes; import org.opentripplanner.routing.vertextype.TransitStopDepart; @@ -45,7 +45,7 @@ public static void setUp() throws Exception { context = GtfsLibrary.readGtfs(new File(ConstantsForTests.FAKE_GTFS)); graph = new Graph(); - GTFSPatternHopFactory factory = new GTFSPatternHopFactory(context); + PatternHopFactory factory = new PatternHopFactory(context); factory.run(graph); graph.putService( CalendarServiceData.class, createCalendarServiceData(context.getOtpTransitService()) diff --git a/src/test/java/org/opentripplanner/routing/edgetype/TimetableTest.java b/src/test/java/org/opentripplanner/routing/edgetype/TimetableTest.java index b0d68c55bb8..ec0702b2382 100644 --- a/src/test/java/org/opentripplanner/routing/edgetype/TimetableTest.java +++ b/src/test/java/org/opentripplanner/routing/edgetype/TimetableTest.java @@ -23,7 +23,7 @@ import org.opentripplanner.gtfs.GtfsLibrary; import org.opentripplanner.routing.algorithm.AStar; import org.opentripplanner.routing.core.RoutingRequest; -import org.opentripplanner.routing.edgetype.factory.GTFSPatternHopFactory; +import org.opentripplanner.routing.edgetype.factory.PatternHopFactory; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.graph.Vertex; import org.opentripplanner.routing.spt.GraphPath; @@ -54,7 +54,7 @@ public static void setUp() throws Exception { context = GtfsLibrary.readGtfs(new File(ConstantsForTests.FAKE_GTFS)); graph = new Graph(); - GTFSPatternHopFactory factory = new GTFSPatternHopFactory(context); + PatternHopFactory factory = new PatternHopFactory(context); factory.run(graph); graph.putService( CalendarServiceData.class, diff --git a/src/test/java/org/opentripplanner/routing/edgetype/factory/GTFSPatternHopFactoryTest.java b/src/test/java/org/opentripplanner/routing/edgetype/factory/PatternHopFactoryTest.java similarity index 92% rename from src/test/java/org/opentripplanner/routing/edgetype/factory/GTFSPatternHopFactoryTest.java rename to src/test/java/org/opentripplanner/routing/edgetype/factory/PatternHopFactoryTest.java index c9d283f73da..377f1feb0aa 100644 --- a/src/test/java/org/opentripplanner/routing/edgetype/factory/GTFSPatternHopFactoryTest.java +++ b/src/test/java/org/opentripplanner/routing/edgetype/factory/PatternHopFactoryTest.java @@ -12,7 +12,7 @@ import org.opentripplanner.routing.graph.Edge; import org.opentripplanner.routing.graph.Graph; -public class GTFSPatternHopFactoryTest { +public class PatternHopFactoryTest { @Test public void testBikesAllowed() throws IOException { @@ -27,7 +27,7 @@ public void testBikesAllowed() throws IOException { "t0,09:00:00,17:00:00,300"); GtfsFeedId feedId = new GtfsFeedId.Builder().id("FEED").build(); - GTFSPatternHopFactory factory = new GTFSPatternHopFactory( + PatternHopFactory factory = new PatternHopFactory( GtfsLibrary.createContext(feedId, gtfs.read()) ); Graph graph = new Graph(); diff --git a/src/test/java/org/opentripplanner/routing/edgetype/loader/TestHopFactory.java b/src/test/java/org/opentripplanner/routing/edgetype/loader/TestHopFactory.java index 0dcb1ebae20..43484151e66 100644 --- a/src/test/java/org/opentripplanner/routing/edgetype/loader/TestHopFactory.java +++ b/src/test/java/org/opentripplanner/routing/edgetype/loader/TestHopFactory.java @@ -16,7 +16,7 @@ import org.opentripplanner.routing.graph.Edge; import org.opentripplanner.routing.edgetype.TransitBoardAlight; import org.opentripplanner.routing.edgetype.PatternHop; -import org.opentripplanner.routing.edgetype.factory.GTFSPatternHopFactory; +import org.opentripplanner.routing.edgetype.factory.PatternHopFactory; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.graph.Vertex; import org.opentripplanner.routing.spt.GraphPath; @@ -37,7 +37,7 @@ public class TestHopFactory extends TestCase { public void setUp() throws Exception { GtfsContext context = GtfsLibrary.readGtfs(new File(ConstantsForTests.FAKE_GTFS)); graph = new Graph(); - GTFSPatternHopFactory factory = new GTFSPatternHopFactory(context); + PatternHopFactory factory = new PatternHopFactory(context); factory.run(graph); graph.putService( CalendarServiceData.class, diff --git a/src/test/java/org/opentripplanner/routing/edgetype/loader/TestPatternHopFactory.java b/src/test/java/org/opentripplanner/routing/edgetype/loader/TestPatternHopFactory.java index ae4e8569e01..c57bed6a543 100644 --- a/src/test/java/org/opentripplanner/routing/edgetype/loader/TestPatternHopFactory.java +++ b/src/test/java/org/opentripplanner/routing/edgetype/loader/TestPatternHopFactory.java @@ -33,7 +33,7 @@ import org.opentripplanner.routing.core.TraverseModeSet; import org.opentripplanner.routing.edgetype.*; import org.opentripplanner.routing.edgetype.StreetEdge; -import org.opentripplanner.routing.edgetype.factory.GTFSPatternHopFactory; +import org.opentripplanner.routing.edgetype.factory.PatternHopFactory; import org.opentripplanner.routing.graph.Edge; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.graph.Vertex; @@ -62,7 +62,7 @@ public void setUp() throws Exception { graph = new Graph(); feedId = context.getFeedId().getId(); - GTFSPatternHopFactory factory = new GTFSPatternHopFactory(context); + PatternHopFactory factory = new PatternHopFactory(context); factory.run(graph); graph.putService( CalendarServiceData.class, diff --git a/src/test/java/org/opentripplanner/updater/stoptime/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/stoptime/TimetableSnapshotSourceTest.java index e6eb08c199c..8dd44442bad 100644 --- a/src/test/java/org/opentripplanner/updater/stoptime/TimetableSnapshotSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/stoptime/TimetableSnapshotSourceTest.java @@ -36,7 +36,7 @@ import org.opentripplanner.routing.edgetype.TimetableSnapshot; import org.opentripplanner.routing.edgetype.TransitBoardAlight; import org.opentripplanner.routing.edgetype.TripPattern; -import org.opentripplanner.routing.edgetype.factory.GTFSPatternHopFactory; +import org.opentripplanner.routing.edgetype.factory.PatternHopFactory; import org.opentripplanner.routing.graph.Edge; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.impl.DefaultStreetVertexIndexFactory; @@ -94,7 +94,7 @@ public static void setUpClass() throws Exception { pathway.getId().setAgencyId(feedId); } - GTFSPatternHopFactory factory = new GTFSPatternHopFactory(context); + PatternHopFactory factory = new PatternHopFactory(context); factory.run(graph); graph.index(new DefaultStreetVertexIndexFactory());