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)

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<Class<?>, 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);

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);

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() {

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());
     }

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<org.onebusaway.gtfs.model.Agency, Agency> mappedAgencies = new HashMap<>();
@@ -15,6 +16,7 @@ Collection<Agency> map(Collection<org.onebusaway.gtfs.model.Agency> 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);
     }

src/main/java/org/opentripplanner/gtfs/mapping/FareAttributeMapper.java

@@ -9,13 +9,15 @@
 
 import static org.opentripplanner.gtfs.mapping.AgencyAndIdMapper.mapAgencyAndId;
 
+/** Responsible for mapping GTFS FareAttribute into the OTP model. */
 class FareAttributeMapper {
     private Map<org.onebusaway.gtfs.model.FareAttribute, FareAttribute> mappedStops = new HashMap<>();
 
     Collection<FareAttribute> map(Collection<org.onebusaway.gtfs.model.FareAttribute> allStops) {
         return MapUtils.mapToList(allStops, this::map);
     }
 
+    /** Map from GTFS to OTP model, {@code null} safe.  */
     FareAttribute map(org.onebusaway.gtfs.model.FareAttribute orginal) {
         return orginal == null ? null : mappedStops.computeIfAbsent(orginal, this::doMap);
     }

src/main/java/org/opentripplanner/gtfs/mapping/FareRuleMapper.java

@@ -7,6 +7,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+/** Responsible for mapping GTFS FareRule into the OTP model. */
 class FareRuleMapper {
 
     private final RouteMapper routeMapper;
@@ -24,6 +25,7 @@ Collection<FareRule> map(Collection<org.onebusaway.gtfs.model.FareRule> 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);
     }

src/main/java/org/opentripplanner/gtfs/mapping/FeedInfoMapper.java

@@ -9,13 +9,15 @@
 
 import static org.opentripplanner.gtfs.mapping.ServiceDateMapper.mapServiceDate;
 
+/** Responsible for mapping GTFS FeedInfo into the OTP model. */
 class FeedInfoMapper {
     private Map<org.onebusaway.gtfs.model.FeedInfo, FeedInfo> mappedFeedInfos = new HashMap<>();
 
     Collection<FeedInfo> map(Collection<org.onebusaway.gtfs.model.FeedInfo> feedInfos) {
         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);
     }

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<Frequency> map(Collection<org.onebusaway.gtfs.model.Frequency> 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);
     }

src/main/java/org/opentripplanner/gtfs/mapping/OtpTransitDaoMapper.java → 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()));

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<Pathway> map(Collection<org.onebusaway.gtfs.model.Pathway> 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);
     }

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<Route> map(Collection<org.onebusaway.gtfs.model.Route> 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);
     }

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<org.onebusaway.gtfs.model.ServiceCalendarDate, ServiceCalendarDate> mappedServiceDates = new HashMap<>();
 
@@ -15,6 +16,7 @@ Collection<ServiceCalendarDate> 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);
     }

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<org.onebusaway.gtfs.model.ServiceCalendar, ServiceCalendar> mappedCalendars = new HashMap<>();
 
@@ -17,6 +18,7 @@ Collection<ServiceCalendar> 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);
     }

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 :

src/main/java/org/opentripplanner/gtfs/mapping/ShapePointMapper.java

@@ -7,13 +7,15 @@
 import java.util.HashMap;
 import java.util.Map;
 
+/** Responsible for mapping GTFS ShapePoint into the OTP model. */
 class ShapePointMapper {
     private Map<org.onebusaway.gtfs.model.ShapePoint, ShapePoint> mappedShapePoints = new HashMap<>();
 
     Collection<ShapePoint> map(Collection<org.onebusaway.gtfs.model.ShapePoint> allShapePoints) {
         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);
     }

src/main/java/org/opentripplanner/gtfs/mapping/StopMapper.java

@@ -9,13 +9,15 @@
 
 import static org.opentripplanner.gtfs.mapping.AgencyAndIdMapper.mapAgencyAndId;
 
+/** Responsible for mapping GTFS Stop into the OTP model. */
 class StopMapper {
     private Map<org.onebusaway.gtfs.model.Stop, Stop> mappedStops = new HashMap<>();
 
     Collection<Stop> map(Collection<org.onebusaway.gtfs.model.Stop> 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);
     }

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<StopTime> map(Collection<org.onebusaway.gtfs.model.StopTime> 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);
     }

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<org.onebusaway.gtfs.model.Transfer, Transfer> 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<Transfer> map(Collection<org.onebusaway.gtfs.model.Transfer> 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);
     }

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;

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);
     }
 }