Move model classes Agency, Stop, Trip, Route ... to 'org.opentripplan…

…ner.model'.

(Refactor OTP to have new OTP classes to replace the OBA GTFS classes opentripplanner#2494)

src/main/java/org/onebusaway2/gtfs/impl/MultipleCalendarsForServiceIdException.java

@@ -15,7 +15,7 @@
  */
 package org.onebusaway2.gtfs.impl;
 
-import org.onebusaway2.gtfs.model.AgencyAndId;
+import org.opentripplanner.model.AgencyAndId;
 
 public class MultipleCalendarsForServiceIdException extends RuntimeException {
 

src/main/java/org/onebusaway2/gtfs/impl/OtpTransitDaoBuilder.java

@@ -14,21 +14,21 @@
 */
 package org.onebusaway2.gtfs.impl;
 
-import org.onebusaway2.gtfs.model.Agency;
-import org.onebusaway2.gtfs.model.FareAttribute;
-import org.onebusaway2.gtfs.model.FareRule;
-import org.onebusaway2.gtfs.model.FeedInfo;
-import org.onebusaway2.gtfs.model.Frequency;
-import org.onebusaway2.gtfs.model.IdentityBean;
-import org.onebusaway2.gtfs.model.Pathway;
-import org.onebusaway2.gtfs.model.Route;
-import org.onebusaway2.gtfs.model.ServiceCalendar;
-import org.onebusaway2.gtfs.model.ServiceCalendarDate;
-import org.onebusaway2.gtfs.model.ShapePoint;
-import org.onebusaway2.gtfs.model.Stop;
-import org.onebusaway2.gtfs.model.StopTime;
-import org.onebusaway2.gtfs.model.Transfer;
-import org.onebusaway2.gtfs.model.Trip;
+import org.opentripplanner.model.Agency;
+import org.opentripplanner.model.FareAttribute;
+import org.opentripplanner.model.FareRule;
+import org.opentripplanner.model.FeedInfo;
+import org.opentripplanner.model.Frequency;
+import org.opentripplanner.model.IdentityBean;
+import org.opentripplanner.model.Pathway;
+import org.opentripplanner.model.Route;
+import org.opentripplanner.model.ServiceCalendar;
+import org.opentripplanner.model.ServiceCalendarDate;
+import org.opentripplanner.model.ShapePoint;
+import org.opentripplanner.model.Stop;
+import org.opentripplanner.model.StopTime;
+import org.opentripplanner.model.Transfer;
+import org.opentripplanner.model.Trip;
 import org.opentripplanner.model.OtpTransitDao;
 
 import java.util.ArrayList;

src/main/java/org/onebusaway2/gtfs/impl/OtpTransitDaoImpl.java

@@ -17,21 +17,21 @@
  */
 package org.onebusaway2.gtfs.impl;
 
-import org.onebusaway2.gtfs.model.Agency;
-import org.onebusaway2.gtfs.model.AgencyAndId;
-import org.onebusaway2.gtfs.model.FareAttribute;
-import org.onebusaway2.gtfs.model.FareRule;
-import org.onebusaway2.gtfs.model.FeedInfo;
-import org.onebusaway2.gtfs.model.Frequency;
-import org.onebusaway2.gtfs.model.Pathway;
-import org.onebusaway2.gtfs.model.Route;
-import org.onebusaway2.gtfs.model.ServiceCalendar;
-import org.onebusaway2.gtfs.model.ServiceCalendarDate;
-import org.onebusaway2.gtfs.model.ShapePoint;
-import org.onebusaway2.gtfs.model.Stop;
-import org.onebusaway2.gtfs.model.StopTime;
-import org.onebusaway2.gtfs.model.Transfer;
-import org.onebusaway2.gtfs.model.Trip;
+import org.opentripplanner.model.Agency;
+import org.opentripplanner.model.AgencyAndId;
+import org.opentripplanner.model.FareAttribute;
+import org.opentripplanner.model.FareRule;
+import org.opentripplanner.model.FeedInfo;
+import org.opentripplanner.model.Frequency;
+import org.opentripplanner.model.Pathway;
+import org.opentripplanner.model.Route;
+import org.opentripplanner.model.ServiceCalendar;
+import org.opentripplanner.model.ServiceCalendarDate;
+import org.opentripplanner.model.ShapePoint;
+import org.opentripplanner.model.Stop;
+import org.opentripplanner.model.StopTime;
+import org.opentripplanner.model.Transfer;
+import org.opentripplanner.model.Trip;
 import org.opentripplanner.model.OtpTransitDao;
 
 import java.util.ArrayList;

src/main/java/org/onebusaway2/gtfs/services/MockGtfs.java

@@ -1,6 +1,6 @@
 package org.onebusaway2.gtfs.services;
 
-import org.onebusaway2.gtfs.model.AgencyAndId;
+import org.opentripplanner.model.AgencyAndId;
 import org.opentripplanner.gtfs.mapping.AgencyAndIdMapper;
 import org.opentripplanner.gtfs.mapping.OtpTransitDaoMapper;
 import org.opentripplanner.model.OtpTransitDao;

src/main/java/org/opentripplanner/analyst/scenario/AdjustDwellTime.java

@@ -1,6 +1,6 @@
 package org.opentripplanner.analyst.scenario;
 
-import org.onebusaway2.gtfs.model.Trip;
+import org.opentripplanner.model.Trip;
 import org.opentripplanner.routing.edgetype.TripPattern;
 import org.opentripplanner.routing.trippattern.FrequencyEntry;
 import org.opentripplanner.routing.trippattern.TripTimes;

src/main/java/org/opentripplanner/analyst/scenario/AdjustHeadway.java

@@ -1,6 +1,6 @@
 package org.opentripplanner.analyst.scenario;
 
-import org.onebusaway2.gtfs.model.Trip;
+import org.opentripplanner.model.Trip;
 import org.opentripplanner.routing.edgetype.TripPattern;
 import org.opentripplanner.routing.trippattern.FrequencyEntry;
 import org.opentripplanner.routing.trippattern.TripTimes;

src/main/java/org/opentripplanner/analyst/scenario/ConvertToFrequency.java

@@ -8,7 +8,7 @@
 import gnu.trove.map.hash.TObjectIntHashMap;
 import gnu.trove.set.TIntSet;
 import gnu.trove.set.hash.TIntHashSet;
-import org.onebusaway2.gtfs.model.Stop;
+import org.opentripplanner.model.Stop;
 import org.opentripplanner.profile.RaptorWorkerTimetable;
 import org.opentripplanner.routing.edgetype.TripPattern;
 import org.opentripplanner.routing.graph.Graph;

src/main/java/org/opentripplanner/analyst/scenario/RemoveTrip.java

@@ -1,6 +1,6 @@
 package org.opentripplanner.analyst.scenario;
 
-import org.onebusaway2.gtfs.model.Trip;
+import org.opentripplanner.model.Trip;
 import org.opentripplanner.routing.edgetype.TripPattern;
 import org.opentripplanner.routing.trippattern.FrequencyEntry;
 import org.opentripplanner.routing.trippattern.TripTimes;

src/main/java/org/opentripplanner/analyst/scenario/SkipStop.java

@@ -5,8 +5,8 @@
 import gnu.trove.list.array.TIntArrayList;
 import gnu.trove.set.TIntSet;
 import gnu.trove.set.hash.TIntHashSet;
-import org.onebusaway2.gtfs.model.Stop;
-import org.onebusaway2.gtfs.model.StopTime;
+import org.opentripplanner.model.Stop;
+import org.opentripplanner.model.StopTime;
 import org.opentripplanner.model.StopPattern;
 import org.opentripplanner.routing.edgetype.TripPattern;
 import org.opentripplanner.routing.trippattern.Deduplicator;

src/main/java/org/opentripplanner/analyst/scenario/TimetableFilter.java

@@ -1,8 +1,8 @@
 package org.opentripplanner.analyst.scenario;
 
 import com.google.common.primitives.Ints;
-import org.onebusaway2.gtfs.model.Route;
-import org.onebusaway2.gtfs.model.Trip;
+import org.opentripplanner.model.Route;
+import org.opentripplanner.model.Trip;
 import org.opentripplanner.routing.edgetype.TripPattern;
 
 import java.util.Collection;

src/main/java/org/opentripplanner/analyst/scenario/TripFilter.java

@@ -1,6 +1,6 @@
 package org.opentripplanner.analyst.scenario;
 
-import org.onebusaway2.gtfs.model.Trip;
+import org.opentripplanner.model.Trip;
 import org.opentripplanner.routing.edgetype.TripPattern;
 import org.opentripplanner.routing.trippattern.FrequencyEntry;
 import org.opentripplanner.routing.trippattern.TripTimes;

src/main/java/org/opentripplanner/api/OTPHttpHandler.java

@@ -5,7 +5,7 @@
 import org.glassfish.grizzly.http.server.HttpHandler;
 import org.glassfish.grizzly.http.server.Request;
 import org.glassfish.grizzly.http.server.Response;
-import org.onebusaway2.gtfs.model.Route;
+import org.opentripplanner.model.Route;
 import org.opentripplanner.api.model.AgencyAndIdSerializer;
 import org.opentripplanner.routing.edgetype.TransitBoardAlight;
 import org.opentripplanner.routing.graph.Graph;

src/main/java/org/opentripplanner/api/adapters/AgencyAdapter.java

@@ -15,7 +15,7 @@ the License, or (props, at your option) any later version.
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 
-import org.onebusaway2.gtfs.model.Agency;
+import org.opentripplanner.model.Agency;
 
 public class AgencyAdapter extends XmlAdapter<AgencyType, Agency> {
 

src/main/java/org/opentripplanner/api/adapters/AgencyAndIdAdapter.java

@@ -15,7 +15,7 @@ the License, or (props, at your option) any later version.
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 
-import org.onebusaway2.gtfs.model.AgencyAndId;
+import org.opentripplanner.model.AgencyAndId;
 
 public class AgencyAndIdAdapter extends XmlAdapter<AgencyAndIdType, AgencyAndId> {
 

src/main/java/org/opentripplanner/api/adapters/AgencyAndIdArrayListAdapter.java

@@ -17,7 +17,7 @@ the License, or (props, at your option) any later version.
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 
-import org.onebusaway2.gtfs.model.AgencyAndId;
+import org.opentripplanner.model.AgencyAndId;
 
 public class AgencyAndIdArrayListAdapter extends XmlAdapter<ArrayList<AgencyAndIdType>, ArrayList<AgencyAndId>> {
 

src/main/java/org/opentripplanner/api/adapters/AgencyType.java

@@ -16,7 +16,7 @@ the License, or (props, at your option) any later version.
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.onebusaway2.gtfs.model.Agency;
+import org.opentripplanner.model.Agency;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 

src/main/java/org/opentripplanner/api/adapters/RouteAdapter.java

@@ -15,7 +15,7 @@ the License, or (props, at your option) any later version.
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 
-import org.onebusaway2.gtfs.model.Route;
+import org.opentripplanner.model.Route;
 
 public class RouteAdapter extends XmlAdapter<RouteType, Route> {
 

src/main/java/org/opentripplanner/api/adapters/RouteType.java

@@ -17,8 +17,8 @@ the License, or (props, at your option) any later version.
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-import org.onebusaway2.gtfs.model.AgencyAndId;
-import org.onebusaway2.gtfs.model.Route;
+import org.opentripplanner.model.AgencyAndId;
+import org.opentripplanner.model.Route;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 

src/main/java/org/opentripplanner/api/adapters/ServiceCalendarDateType.java

@@ -17,8 +17,8 @@ the License, or (props, at your option) any later version.
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-import org.onebusaway2.gtfs.model.AgencyAndId;
-import org.onebusaway2.gtfs.model.ServiceCalendarDate;
+import org.opentripplanner.model.AgencyAndId;
+import org.opentripplanner.model.ServiceCalendarDate;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 

src/main/java/org/opentripplanner/api/adapters/ServiceCalendarType.java

@@ -17,8 +17,8 @@ the License, or (props, at your option) any later version.
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-import org.onebusaway2.gtfs.model.AgencyAndId;
-import org.onebusaway2.gtfs.model.ServiceCalendar;
+import org.opentripplanner.model.AgencyAndId;
+import org.opentripplanner.model.ServiceCalendar;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 

src/main/java/org/opentripplanner/api/adapters/StopAdapter.java

@@ -15,7 +15,7 @@ the License, or (props, at your option) any later version.
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 
-import org.onebusaway2.gtfs.model.Stop;
+import org.opentripplanner.model.Stop;
 
 public class StopAdapter extends XmlAdapter<StopType, Stop> {
 

src/main/java/org/opentripplanner/api/adapters/StopAgencyAndIdAdapter.java

@@ -15,8 +15,8 @@ the License, or (props, at your option) any later version.
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 
-import org.onebusaway2.gtfs.model.AgencyAndId;
-import org.onebusaway2.gtfs.model.Stop;
+import org.opentripplanner.model.AgencyAndId;
+import org.opentripplanner.model.Stop;
 
 public class StopAgencyAndIdAdapter extends XmlAdapter<AgencyAndIdType, Stop> {
 

src/main/java/org/opentripplanner/api/adapters/StopAgencyAndIdArrayListAdapter.java

@@ -17,7 +17,7 @@ the License, or (props, at your option) any later version.
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 
-import org.onebusaway2.gtfs.model.Stop;
+import org.opentripplanner.model.Stop;
 
 public class StopAgencyAndIdArrayListAdapter extends
         XmlAdapter<ArrayList<AgencyAndIdType>, ArrayList<Stop>> {

src/main/java/org/opentripplanner/api/adapters/StopType.java

@@ -21,17 +21,18 @@ the License, or (props, at your option) any later version.
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-import org.onebusaway2.gtfs.model.AgencyAndId;
+import org.opentripplanner.model.AgencyAndId;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.opentripplanner.model.Stop;
 
 @XmlRootElement(name = "Stop")
 public class StopType {
 
     public StopType() {
     }
 
-    public StopType(org.onebusaway2.gtfs.model.Stop stop) {
+    public StopType(Stop stop) {
         this.id = stop.getId();
         this.stopLat = stop.getLat();
         this.stopLon = stop.getLon();
@@ -47,7 +48,7 @@ public StopType(org.onebusaway2.gtfs.model.Stop stop) {
         this.direction = stop.getDirection();
     }
 
-    public StopType(org.onebusaway2.gtfs.model.Stop stop, Boolean extended) {
+    public StopType(Stop stop, Boolean extended) {
         this.id = stop.getId();
         this.stopLat = stop.getLat();
         this.stopLon = stop.getLon();

src/main/java/org/opentripplanner/api/adapters/TripAdapter.java

@@ -15,7 +15,7 @@ the License, or (props, at your option) any later version.
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 
-import org.onebusaway2.gtfs.model.Trip;
+import org.opentripplanner.model.Trip;
 
 public class TripAdapter extends XmlAdapter<TripType, Trip> {
 

src/main/java/org/opentripplanner/api/adapters/TripType.java

@@ -17,9 +17,9 @@ the License, or (props, at your option) any later version.
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-import org.onebusaway2.gtfs.model.AgencyAndId;
-import org.onebusaway2.gtfs.model.Route;
-import org.onebusaway2.gtfs.model.Trip;
+import org.opentripplanner.model.AgencyAndId;
+import org.opentripplanner.model.Route;
+import org.opentripplanner.model.Trip;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 

src/main/java/org/opentripplanner/api/adapters/TripsModelInfo.java

@@ -18,7 +18,7 @@ the License, or (props, at your option) any later version.
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.onebusaway2.gtfs.model.AgencyAndId;
+import org.opentripplanner.model.AgencyAndId;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 

src/main/java/org/opentripplanner/api/common/RoutingResource.java

@@ -23,7 +23,7 @@ the License, or (at your option) any later version.
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
 
-import org.onebusaway2.gtfs.model.AgencyAndId;
+import org.opentripplanner.model.AgencyAndId;
 import org.opentripplanner.api.parameter.QualifiedModeSet;
 import org.opentripplanner.routing.core.OptimizeType;
 import org.opentripplanner.routing.core.RoutingRequest;

src/main/java/org/opentripplanner/api/model/AgencyAndIdDeserializer.java

@@ -4,7 +4,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
-import org.onebusaway2.gtfs.model.AgencyAndId;
+import org.opentripplanner.model.AgencyAndId;
 
 import java.io.IOException;
 

src/main/java/org/opentripplanner/api/model/AgencyAndIdKeyDeserializer.java

@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.KeyDeserializer;
-import org.onebusaway2.gtfs.model.AgencyAndId;
+import org.opentripplanner.model.AgencyAndId;
 
 import java.io.IOException;
 

src/main/java/org/opentripplanner/api/model/AgencyAndIdSerializer.java

@@ -6,7 +6,7 @@
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.module.SimpleModule;
-import org.onebusaway2.gtfs.model.AgencyAndId;
+import org.opentripplanner.model.AgencyAndId;
 
 import java.io.IOException;
 

src/main/java/org/opentripplanner/api/model/Itinerary.java

@@ -21,7 +21,7 @@ the License, or (at your option) any later version.
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 
-import org.onebusaway2.gtfs.model.calendar.CalendarServiceData;
+import org.opentripplanner.model.calendar.CalendarServiceData;
 import org.opentripplanner.routing.core.Fare;
 
 /**

src/main/java/org/opentripplanner/api/model/Leg.java

@@ -23,7 +23,7 @@ the License, or (at your option) any later version.
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 
-import org.onebusaway2.gtfs.model.AgencyAndId;
+import org.opentripplanner.model.AgencyAndId;
 import org.opentripplanner.api.model.alertpatch.LocalizedAlert;
 import org.opentripplanner.routing.alertpatch.Alert;
 import org.opentripplanner.routing.core.TraverseMode;

src/main/java/org/opentripplanner/api/model/Place.java

@@ -17,7 +17,7 @@ the License, or (at your option) any later version.
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement; 
 
-import org.onebusaway2.gtfs.model.AgencyAndId;
+import org.opentripplanner.model.AgencyAndId;
 import org.opentripplanner.util.Constants; 
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;