From ea8ce4c24412df0d1e3678a96fe9e1d0ac3f5da8 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 29 Apr 2024 23:04:18 +0200 Subject: [PATCH] refactor: move booking classes into transit.model.timetable.booking --- .../java/org/opentripplanner/ext/flex/FlexAccessEgress.java | 2 +- .../org/opentripplanner/ext/flex/FlexibleTransitLeg.java | 2 +- .../java/org/opentripplanner/ext/flex/trip/FlexTrip.java | 2 +- .../ext/flex/trip/ScheduledDeviatedTrip.java | 2 +- .../org/opentripplanner/ext/flex/trip/UnscheduledTrip.java | 2 +- .../ext/restapi/mapping/BookingInfoMapper.java | 2 +- .../ext/restapi/mapping/BookingMethodMapper.java | 2 +- .../ext/restapi/mapping/BookingTimeMapper.java | 2 +- .../apis/gtfs/datafetchers/BookingInfoImpl.java | 4 ++-- .../apis/gtfs/datafetchers/BookingTimeImpl.java | 2 +- .../org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java | 2 +- .../apis/gtfs/generated/GraphQLDataFetchers.java | 4 ++-- .../opentripplanner/apis/gtfs/generated/graphql-codegen.yml | 4 ++-- .../opentripplanner/apis/transmodel/model/EnumTypes.java | 2 +- .../transmodel/model/timetable/BookingArrangementType.java | 4 ++-- .../org/opentripplanner/gtfs/mapping/BookingRuleMapper.java | 6 +++--- src/main/java/org/opentripplanner/model/StopTime.java | 2 +- src/main/java/org/opentripplanner/model/TripTimeOnDate.java | 2 +- src/main/java/org/opentripplanner/model/plan/Leg.java | 2 +- .../org/opentripplanner/model/plan/ScheduledTransitLeg.java | 2 +- .../opentripplanner/netex/mapping/BookingInfoMapper.java | 6 +++--- .../opentripplanner/netex/mapping/BookingMethodMapper.java | 2 +- .../org/opentripplanner/netex/mapping/StopTimesMapper.java | 2 +- .../raptoradapter/transit/BookingTimeAccessEgress.java | 2 +- .../raptoradapter/transit/FlexAccessEgressAdapter.java | 2 +- .../raptoradapter/transit/RoutingAccessEgress.java | 2 +- .../transit/model/timetable/RealTimeTripTimes.java | 2 +- .../transit/model/timetable/ScheduledTripTimes.java | 2 +- .../transit/model/timetable/ScheduledTripTimesBuilder.java | 2 +- .../model/timetable/StopTimeToScheduledTripTimesMapper.java | 2 +- .../opentripplanner/transit/model/timetable/TripTimes.java | 2 +- .../model/timetable}/booking/BookingInfo.java | 2 +- .../model/timetable}/booking/BookingInfoBuilder.java | 2 +- .../model/timetable}/booking/BookingMethod.java | 2 +- .../model/timetable}/booking/BookingTime.java | 2 +- .../model/timetable}/booking/RoutingBookingInfo.java | 2 +- .../netex/mapping/BookingInfoMapperTest.java | 2 +- .../transit/model/TransitModelArchitectureTest.java | 2 ++ .../model/timetable}/booking/BookingInfoTest.java | 2 +- .../model/timetable}/booking/BookingTimeTest.java | 2 +- .../model/timetable}/booking/RoutingBookingInfoTest.java | 6 +++--- 41 files changed, 52 insertions(+), 50 deletions(-) rename src/main/java/org/opentripplanner/{model => transit/model/timetable}/booking/BookingInfo.java (98%) rename src/main/java/org/opentripplanner/{model => transit/model/timetable}/booking/BookingInfoBuilder.java (96%) rename src/main/java/org/opentripplanner/{model => transit/model/timetable}/booking/BookingMethod.java (63%) rename src/main/java/org/opentripplanner/{model => transit/model/timetable}/booking/BookingTime.java (95%) rename src/main/java/org/opentripplanner/{model => transit/model/timetable}/booking/RoutingBookingInfo.java (98%) rename src/test/java/org/opentripplanner/{model => transit/model/timetable}/booking/BookingInfoTest.java (97%) rename src/test/java/org/opentripplanner/{model => transit/model/timetable}/booking/BookingTimeTest.java (96%) rename src/test/java/org/opentripplanner/{model => transit/model/timetable}/booking/RoutingBookingInfoTest.java (93%) diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java b/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java index 2a537e48340..7190749d38e 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java @@ -7,9 +7,9 @@ import javax.annotation.Nullable; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.framework.tostring.ToStringBuilder; -import org.opentripplanner.model.booking.RoutingBookingInfo; import org.opentripplanner.street.search.state.State; import org.opentripplanner.transit.model.site.RegularStop; +import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo; public final class FlexAccessEgress { diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java b/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java index f6a32e696a1..95c9e8fecd4 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java @@ -13,7 +13,6 @@ import org.opentripplanner.framework.lang.DoubleUtils; import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.PickDrop; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.model.plan.LegTime; @@ -28,6 +27,7 @@ import org.opentripplanner.transit.model.organization.Agency; import org.opentripplanner.transit.model.organization.Operator; import org.opentripplanner.transit.model.timetable.Trip; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; /** * One leg of a trip -- that is, a temporally continuous piece of the journey that takes place on a diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java index 5a3fda26ee8..ace9de22655 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java @@ -11,7 +11,6 @@ import org.opentripplanner.ext.flex.template.FlexEgressTemplate; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; @@ -19,6 +18,7 @@ import org.opentripplanner.transit.model.site.GroupStop; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.Trip; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; /** * This class represents the different variations of what is considered flexible transit, and its diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java index f49df35791c..0f4c513a59a 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java @@ -21,7 +21,6 @@ import org.opentripplanner.ext.flex.template.FlexEgressTemplate; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.transit.model.framework.FeedScopedId; @@ -29,6 +28,7 @@ import org.opentripplanner.transit.model.site.GroupStop; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; /** * A scheduled deviated trip is similar to a regular scheduled trip, except that it contains stop diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java index c168510bb30..26006c91e3a 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java @@ -20,13 +20,13 @@ import org.opentripplanner.framework.lang.IntRange; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.framework.TransitBuilder; import org.opentripplanner.transit.model.site.GroupStop; import org.opentripplanner.transit.model.site.StopLocation; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; /** * This type of FlexTrip is used when a taxi-type service is modeled, which operates in any number diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingInfoMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingInfoMapper.java index 168207b5c3a..008ae2ec202 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingInfoMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingInfoMapper.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.restapi.mapping; import org.opentripplanner.ext.restapi.model.ApiBookingInfo; -import org.opentripplanner.model.booking.BookingInfo; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; public class BookingInfoMapper { diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingMethodMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingMethodMapper.java index 6656053908e..0ab743e1cb2 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingMethodMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingMethodMapper.java @@ -3,7 +3,7 @@ import java.util.EnumSet; import java.util.Set; import java.util.stream.Collectors; -import org.opentripplanner.model.booking.BookingMethod; +import org.opentripplanner.transit.model.timetable.booking.BookingMethod; public class BookingMethodMapper { diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingTimeMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingTimeMapper.java index 978816be8c2..8b3034532fc 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingTimeMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingTimeMapper.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.restapi.mapping; import org.opentripplanner.ext.restapi.model.ApiBookingTime; -import org.opentripplanner.model.booking.BookingTime; +import org.opentripplanner.transit.model.timetable.booking.BookingTime; public class BookingTimeMapper { diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingInfoImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingInfoImpl.java index ab416110ee0..44ee0985542 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingInfoImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingInfoImpl.java @@ -3,9 +3,9 @@ import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; -import org.opentripplanner.model.booking.BookingInfo; -import org.opentripplanner.model.booking.BookingTime; import org.opentripplanner.transit.model.organization.ContactInfo; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; +import org.opentripplanner.transit.model.timetable.booking.BookingTime; public class BookingInfoImpl implements GraphQLDataFetchers.GraphQLBookingInfo { diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingTimeImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingTimeImpl.java index 937c2c9b9ee..9d6cd00642d 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingTimeImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingTimeImpl.java @@ -4,7 +4,7 @@ import graphql.schema.DataFetchingEnvironment; import java.time.format.DateTimeFormatter; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; -import org.opentripplanner.model.booking.BookingTime; +import org.opentripplanner.transit.model.timetable.booking.BookingTime; public class BookingTimeImpl implements GraphQLDataFetchers.GraphQLBookingTime { diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java index ba71a603a4f..9ec83a4bf67 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java @@ -15,7 +15,6 @@ import org.opentripplanner.ext.ridehailing.model.RideHailingLeg; import org.opentripplanner.framework.graphql.GraphQLUtils; import org.opentripplanner.model.PickDrop; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.model.plan.LegTime; @@ -30,6 +29,7 @@ import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.organization.Agency; import org.opentripplanner.transit.model.timetable.Trip; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; public class LegImpl implements GraphQLDataFetchers.GraphQLLeg { diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index 195706de84c..33f304c5c25 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -28,8 +28,6 @@ import org.opentripplanner.model.StopTimesInPattern; import org.opentripplanner.model.SystemNotice; import org.opentripplanner.model.TripTimeOnDate; -import org.opentripplanner.model.booking.BookingInfo; -import org.opentripplanner.model.booking.BookingTime; import org.opentripplanner.model.calendar.openinghours.OHCalendar; import org.opentripplanner.model.fare.FareMedium; import org.opentripplanner.model.fare.FareProduct; @@ -63,6 +61,8 @@ import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.organization.Agency; import org.opentripplanner.transit.model.timetable.Trip; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; +import org.opentripplanner.transit.model.timetable.booking.BookingTime; public class GraphQLDataFetchers { diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml index 6578657feb2..e89b7a58d3f 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml @@ -45,8 +45,8 @@ config: RentalVehicle: org.opentripplanner.service.vehiclerental.model.VehicleRentalVehicle#VehicleRentalVehicle VehicleRentalUris: org.opentripplanner.service.vehiclerental.model.VehicleRentalStationUris#VehicleRentalStationUris BikesAllowed: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLBikesAllowed#GraphQLBikesAllowed - BookingInfo: org.opentripplanner.model.booking.BookingInfo - BookingTime: org.opentripplanner.model.booking.BookingTime + BookingInfo: org.opentripplanner.transit.model.network.booking.BookingInfo + BookingTime: org.opentripplanner.transit.model.network.booking.BookingTime CarPark: org.opentripplanner.routing.vehicle_parking.VehicleParking#VehicleParking ContactInfo: org.opentripplanner.transit.model.organization.ContactInfo Cluster: Object diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java b/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java index 28312e85a34..6c173ba815f 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.function.Function; import org.opentripplanner.framework.doc.DocumentedEnum; -import org.opentripplanner.model.booking.BookingMethod; import org.opentripplanner.model.plan.AbsoluteDirection; import org.opentripplanner.model.plan.RelativeDirection; import org.opentripplanner.model.plan.VertexType; @@ -27,6 +26,7 @@ import org.opentripplanner.transit.model.timetable.OccupancyStatus; import org.opentripplanner.transit.model.timetable.RealTimeState; import org.opentripplanner.transit.model.timetable.TripAlteration; +import org.opentripplanner.transit.model.timetable.booking.BookingMethod; public class EnumTypes { diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/BookingArrangementType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/BookingArrangementType.java index 75098696143..2f2c603a731 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/BookingArrangementType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/BookingArrangementType.java @@ -8,9 +8,9 @@ import graphql.schema.GraphQLOutputType; import org.opentripplanner.apis.transmodel.model.EnumTypes; import org.opentripplanner.apis.transmodel.support.GqlUtil; -import org.opentripplanner.model.booking.BookingInfo; -import org.opentripplanner.model.booking.BookingTime; import org.opentripplanner.transit.model.organization.ContactInfo; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; +import org.opentripplanner.transit.model.timetable.booking.BookingTime; public class BookingArrangementType { diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/BookingRuleMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/BookingRuleMapper.java index 84d3c417722..74efdd52202 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/BookingRuleMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/BookingRuleMapper.java @@ -7,10 +7,10 @@ import java.util.Map; import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.BookingRule; -import org.opentripplanner.model.booking.BookingInfo; -import org.opentripplanner.model.booking.BookingMethod; -import org.opentripplanner.model.booking.BookingTime; import org.opentripplanner.transit.model.organization.ContactInfo; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; +import org.opentripplanner.transit.model.timetable.booking.BookingMethod; +import org.opentripplanner.transit.model.timetable.booking.BookingTime; /** Responsible for mapping GTFS BookingRule into the OTP model. */ class BookingRuleMapper { diff --git a/src/main/java/org/opentripplanner/model/StopTime.java b/src/main/java/org/opentripplanner/model/StopTime.java index a4576461399..a1f524743ad 100644 --- a/src/main/java/org/opentripplanner/model/StopTime.java +++ b/src/main/java/org/opentripplanner/model/StopTime.java @@ -4,10 +4,10 @@ import java.util.List; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.time.TimeUtils; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.StopTimeKey; import org.opentripplanner.transit.model.timetable.Trip; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; /** * This class is TEMPORALLY used during mapping of GTFS and Netex into the internal Model, it is not diff --git a/src/main/java/org/opentripplanner/model/TripTimeOnDate.java b/src/main/java/org/opentripplanner/model/TripTimeOnDate.java index 97f216becd5..1bfb0184138 100644 --- a/src/main/java/org/opentripplanner/model/TripTimeOnDate.java +++ b/src/main/java/org/opentripplanner/model/TripTimeOnDate.java @@ -6,7 +6,6 @@ import java.util.Comparator; import java.util.List; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.OccupancyStatus; @@ -14,6 +13,7 @@ import org.opentripplanner.transit.model.timetable.StopTimeKey; import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripTimes; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/opentripplanner/model/plan/Leg.java b/src/main/java/org/opentripplanner/model/plan/Leg.java index 4340b8b6f25..1ee72761d66 100644 --- a/src/main/java/org/opentripplanner/model/plan/Leg.java +++ b/src/main/java/org/opentripplanner/model/plan/Leg.java @@ -12,7 +12,6 @@ import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.lang.Sandbox; import org.opentripplanner.model.PickDrop; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.legreference.LegReference; import org.opentripplanner.model.transfer.ConstrainedTransfer; @@ -25,6 +24,7 @@ import org.opentripplanner.transit.model.site.FareZone; import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripOnServiceDate; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; /** * One leg of a trip -- that is, a temporally continuous piece of the journey that takes place on a diff --git a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java index 8325083dfc8..d94ec1895c2 100644 --- a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java +++ b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java @@ -21,7 +21,6 @@ import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.PickDrop; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.legreference.LegReference; import org.opentripplanner.model.plan.legreference.ScheduledTransitLegReference; @@ -38,6 +37,7 @@ import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripOnServiceDate; import org.opentripplanner.transit.model.timetable.TripTimes; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; /** * One leg of a trip -- that is, a temporally continuous piece of the journey that takes place on a diff --git a/src/main/java/org/opentripplanner/netex/mapping/BookingInfoMapper.java b/src/main/java/org/opentripplanner/netex/mapping/BookingInfoMapper.java index 3a0e10f57ca..d6c81c76e3d 100644 --- a/src/main/java/org/opentripplanner/netex/mapping/BookingInfoMapper.java +++ b/src/main/java/org/opentripplanner/netex/mapping/BookingInfoMapper.java @@ -9,10 +9,10 @@ import java.util.stream.Collectors; import javax.annotation.Nullable; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; -import org.opentripplanner.model.booking.BookingInfo; -import org.opentripplanner.model.booking.BookingMethod; -import org.opentripplanner.model.booking.BookingTime; import org.opentripplanner.transit.model.organization.ContactInfo; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; +import org.opentripplanner.transit.model.timetable.booking.BookingMethod; +import org.opentripplanner.transit.model.timetable.booking.BookingTime; import org.rutebanken.netex.model.BookingArrangementsStructure; import org.rutebanken.netex.model.BookingMethodEnumeration; import org.rutebanken.netex.model.ContactStructure; diff --git a/src/main/java/org/opentripplanner/netex/mapping/BookingMethodMapper.java b/src/main/java/org/opentripplanner/netex/mapping/BookingMethodMapper.java index f48d618d38a..4449913605b 100644 --- a/src/main/java/org/opentripplanner/netex/mapping/BookingMethodMapper.java +++ b/src/main/java/org/opentripplanner/netex/mapping/BookingMethodMapper.java @@ -1,6 +1,6 @@ package org.opentripplanner.netex.mapping; -import org.opentripplanner.model.booking.BookingMethod; +import org.opentripplanner.transit.model.timetable.booking.BookingMethod; import org.rutebanken.netex.model.BookingMethodEnumeration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapper.java b/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapper.java index b2350690cbf..676ab053da4 100644 --- a/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapper.java +++ b/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapper.java @@ -16,7 +16,6 @@ import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.StopTime; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalMap; import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalMapById; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; @@ -27,6 +26,7 @@ import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.Trip; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; import org.rutebanken.netex.model.DestinationDisplay; import org.rutebanken.netex.model.DestinationDisplay_VersionStructure; import org.rutebanken.netex.model.FlexibleLine; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java index 33d12f5b943..0739a5c4eca 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java @@ -4,8 +4,8 @@ import javax.annotation.Nullable; import org.opentripplanner.framework.model.TimeAndCost; -import org.opentripplanner.model.booking.RoutingBookingInfo; import org.opentripplanner.street.search.state.State; +import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo; public class BookingTimeAccessEgress implements RoutingAccessEgress { diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java index 09c983e7c1a..7ecea6ae997 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java @@ -4,8 +4,8 @@ import org.opentripplanner.ext.flex.FlexAccessEgress; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.model.StopTime; -import org.opentripplanner.model.booking.RoutingBookingInfo; import org.opentripplanner.raptor.api.model.RaptorConstants; +import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo; /** * This class is used to adapt the FlexAccessEgress into a time-dependent multi-leg DefaultAccessEgress. diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RoutingAccessEgress.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RoutingAccessEgress.java index 3f76af6f821..debf5ac17ed 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RoutingAccessEgress.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RoutingAccessEgress.java @@ -2,9 +2,9 @@ import java.util.Optional; import org.opentripplanner.framework.model.TimeAndCost; -import org.opentripplanner.model.booking.RoutingBookingInfo; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.street.search.state.State; +import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo; /** * Encapsulate information about an access or egress path. This interface extends diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java b/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java index e1a9c360f5d..8eea45c092a 100644 --- a/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java @@ -10,9 +10,9 @@ import java.util.function.IntUnaryOperator; import javax.annotation.Nullable; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.transit.model.basic.Accessibility; import org.opentripplanner.transit.model.framework.DataValidationException; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; /** * A TripTimes represents the arrival and departure times for a single trip in an Timetable. It is diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimes.java b/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimes.java index 263c63621fb..d367932d24d 100644 --- a/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimes.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimes.java @@ -16,11 +16,11 @@ import org.opentripplanner.framework.lang.IntUtils; import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.framework.time.TimeUtils; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.transit.model.basic.Accessibility; import org.opentripplanner.transit.model.framework.DataValidationException; import org.opentripplanner.transit.model.framework.Deduplicator; import org.opentripplanner.transit.model.framework.DeduplicatorService; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; /** * Regular/planed/scheduled read-only version of {@link TripTimes}. The set of static diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesBuilder.java b/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesBuilder.java index 304e32d2045..ce142fd7628 100644 --- a/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesBuilder.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesBuilder.java @@ -5,8 +5,8 @@ import javax.annotation.Nullable; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.time.TimeUtils; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.transit.model.framework.DeduplicatorService; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; public class ScheduledTripTimesBuilder { diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeToScheduledTripTimesMapper.java b/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeToScheduledTripTimesMapper.java index c064b9bc2ff..0779575aee5 100644 --- a/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeToScheduledTripTimesMapper.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeToScheduledTripTimesMapper.java @@ -6,8 +6,8 @@ import java.util.List; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.model.StopTime; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.transit.model.framework.DeduplicatorService; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; class StopTimeToScheduledTripTimesMapper { diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java b/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java index be726c53fd2..ff6b022fb59 100644 --- a/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java @@ -7,8 +7,8 @@ import java.util.OptionalInt; import javax.annotation.Nullable; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.transit.model.basic.Accessibility; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; /** * A TripTimes represents the arrival and departure times for a single trip in a timetable. It is diff --git a/src/main/java/org/opentripplanner/model/booking/BookingInfo.java b/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfo.java similarity index 98% rename from src/main/java/org/opentripplanner/model/booking/BookingInfo.java rename to src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfo.java index cbf43fd04ee..630acd6805a 100644 --- a/src/main/java/org/opentripplanner/model/booking/BookingInfo.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfo.java @@ -1,4 +1,4 @@ -package org.opentripplanner.model.booking; +package org.opentripplanner.transit.model.timetable.booking; import java.io.Serializable; import java.time.Duration; diff --git a/src/main/java/org/opentripplanner/model/booking/BookingInfoBuilder.java b/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoBuilder.java similarity index 96% rename from src/main/java/org/opentripplanner/model/booking/BookingInfoBuilder.java rename to src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoBuilder.java index 49cdc82b77f..fd91f9e781a 100644 --- a/src/main/java/org/opentripplanner/model/booking/BookingInfoBuilder.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoBuilder.java @@ -1,4 +1,4 @@ -package org.opentripplanner.model.booking; +package org.opentripplanner.transit.model.timetable.booking; import java.time.Duration; import java.util.EnumSet; diff --git a/src/main/java/org/opentripplanner/model/booking/BookingMethod.java b/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingMethod.java similarity index 63% rename from src/main/java/org/opentripplanner/model/booking/BookingMethod.java rename to src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingMethod.java index 67e0a507915..78cd2372698 100644 --- a/src/main/java/org/opentripplanner/model/booking/BookingMethod.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingMethod.java @@ -1,4 +1,4 @@ -package org.opentripplanner.model.booking; +package org.opentripplanner.transit.model.timetable.booking; public enum BookingMethod { CALL_DRIVER, diff --git a/src/main/java/org/opentripplanner/model/booking/BookingTime.java b/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingTime.java similarity index 95% rename from src/main/java/org/opentripplanner/model/booking/BookingTime.java rename to src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingTime.java index bed51fd22ed..90ffcd32305 100644 --- a/src/main/java/org/opentripplanner/model/booking/BookingTime.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingTime.java @@ -1,4 +1,4 @@ -package org.opentripplanner.model.booking; +package org.opentripplanner.transit.model.timetable.booking; import java.io.Serializable; import java.time.LocalTime; diff --git a/src/main/java/org/opentripplanner/model/booking/RoutingBookingInfo.java b/src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java similarity index 98% rename from src/main/java/org/opentripplanner/model/booking/RoutingBookingInfo.java rename to src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java index a72e6c72748..f20df16d1ef 100644 --- a/src/main/java/org/opentripplanner/model/booking/RoutingBookingInfo.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java @@ -1,4 +1,4 @@ -package org.opentripplanner.model.booking; +package org.opentripplanner.transit.model.timetable.booking; import java.util.Objects; import org.opentripplanner.framework.tostring.ToStringBuilder; diff --git a/src/test/java/org/opentripplanner/netex/mapping/BookingInfoMapperTest.java b/src/test/java/org/opentripplanner/netex/mapping/BookingInfoMapperTest.java index 646d169f611..e561a6155d3 100644 --- a/src/test/java/org/opentripplanner/netex/mapping/BookingInfoMapperTest.java +++ b/src/test/java/org/opentripplanner/netex/mapping/BookingInfoMapperTest.java @@ -7,7 +7,7 @@ import java.time.LocalTime; import org.junit.jupiter.api.Test; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; -import org.opentripplanner.model.booking.BookingInfo; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; import org.rutebanken.netex.model.BookingArrangementsStructure; import org.rutebanken.netex.model.ContactStructure; import org.rutebanken.netex.model.FlexibleLine; diff --git a/src/test/java/org/opentripplanner/transit/model/TransitModelArchitectureTest.java b/src/test/java/org/opentripplanner/transit/model/TransitModelArchitectureTest.java index 8976e29e293..11db763d97f 100644 --- a/src/test/java/org/opentripplanner/transit/model/TransitModelArchitectureTest.java +++ b/src/test/java/org/opentripplanner/transit/model/TransitModelArchitectureTest.java @@ -23,6 +23,7 @@ public class TransitModelArchitectureTest { private static final Package NETWORK = TRANSIT_MODEL.subPackage("network"); private static final Package SITE = TRANSIT_MODEL.subPackage("site"); private static final Package TIMETABLE = TRANSIT_MODEL.subPackage("timetable"); + private static final Package TIMETABLE_BOOKING = TIMETABLE.subPackage("booking"); private static final Package LEGACY_MODEL = OTP_ROOT.subPackage("model"); @Test @@ -84,6 +85,7 @@ void enforceTimetablePackageDependencies() { ORGANIZATION, NETWORK, SITE, + TIMETABLE_BOOKING, LEGACY_MODEL ) .verify(); diff --git a/src/test/java/org/opentripplanner/model/booking/BookingInfoTest.java b/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoTest.java similarity index 97% rename from src/test/java/org/opentripplanner/model/booking/BookingInfoTest.java rename to src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoTest.java index a5b45e7a84c..eac6c7eb41c 100644 --- a/src/test/java/org/opentripplanner/model/booking/BookingInfoTest.java +++ b/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.model.booking; +package org.opentripplanner.transit.model.timetable.booking; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/src/test/java/org/opentripplanner/model/booking/BookingTimeTest.java b/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingTimeTest.java similarity index 96% rename from src/test/java/org/opentripplanner/model/booking/BookingTimeTest.java rename to src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingTimeTest.java index bde2eb34a99..5036defdb88 100644 --- a/src/test/java/org/opentripplanner/model/booking/BookingTimeTest.java +++ b/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingTimeTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.model.booking; +package org.opentripplanner.transit.model.timetable.booking; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/src/test/java/org/opentripplanner/model/booking/RoutingBookingInfoTest.java b/src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java similarity index 93% rename from src/test/java/org/opentripplanner/model/booking/RoutingBookingInfoTest.java rename to src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java index 2bdcd53f757..1a69f2f0a0f 100644 --- a/src/test/java/org/opentripplanner/model/booking/RoutingBookingInfoTest.java +++ b/src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java @@ -1,8 +1,8 @@ -package org.opentripplanner.model.booking; +package org.opentripplanner.transit.model.timetable.booking; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.model.booking.RoutingBookingInfoTest.Expected.LATEST_BOOKING_TIME; -import static org.opentripplanner.model.booking.RoutingBookingInfoTest.Expected.MIN_BOOKING_NOTICE; +import static org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfoTest.Expected.LATEST_BOOKING_TIME; +import static org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfoTest.Expected.MIN_BOOKING_NOTICE; import java.time.LocalTime; import java.util.List;