Merge pull request #6209 from entur/otp2_framework

Create OTP utils module for basic utility features

application/pom.xml

@@ -18,6 +18,11 @@
             <artifactId>gtfs-realtime-protobuf</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>otp-utils</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <!-- 3rd party dependencies -->
         <dependency>

application/src/ext-test/java/org/opentripplanner/ext/flex/FlexStopTimesForTest.java

@@ -3,11 +3,11 @@
 import static org.opentripplanner.model.StopTime.MISSING_VALUE;
 
 import org.opentripplanner._support.geometry.Polygons;
-import org.opentripplanner.framework.time.TimeUtils;
 import org.opentripplanner.model.StopTime;
 import org.opentripplanner.transit.model._data.TimetableRepositoryForTest;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.model.site.StopLocation;
+import org.opentripplanner.utils.time.TimeUtils;
 
 public class FlexStopTimesForTest {
 

application/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java

@@ -6,7 +6,7 @@
 import static org.opentripplanner.ext.flex.template.BoardAlight.ALIGHT_ONLY;
 import static org.opentripplanner.ext.flex.template.BoardAlight.BOARD_AND_ALIGHT;
 import static org.opentripplanner.ext.flex.template.BoardAlight.BOARD_ONLY;
-import static org.opentripplanner.framework.time.TimeUtils.time;
+import static org.opentripplanner.utils.time.TimeUtils.time;
 
 import gnu.trove.set.hash.TIntHashSet;
 import java.time.Duration;

application/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java

@@ -24,7 +24,6 @@
 import org.opentripplanner.framework.application.OTPFeature;
 import org.opentripplanner.framework.geometry.EncodedPolyline;
 import org.opentripplanner.framework.i18n.I18NString;
-import org.opentripplanner.framework.time.ServiceDateUtils;
 import org.opentripplanner.graph_builder.module.ValidateAndInterpolateStopTimesForEachTrip;
 import org.opentripplanner.model.GenericLocation;
 import org.opentripplanner.model.StopTime;
@@ -45,6 +44,7 @@
 import org.opentripplanner.transit.model.site.AreaStop;
 import org.opentripplanner.transit.service.DefaultTransitService;
 import org.opentripplanner.transit.service.TimetableRepository;
+import org.opentripplanner.utils.time.ServiceDateUtils;
 
 /**
  * This tests that the feed for the Cobb County Flex service is processed correctly. This service

application/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java

@@ -17,14 +17,14 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.opentripplanner.framework.time.DurationUtils;
-import org.opentripplanner.framework.time.TimeUtils;
-import org.opentripplanner.framework.tostring.ToStringBuilder;
 import org.opentripplanner.model.PickDrop;
 import org.opentripplanner.model.StopTime;
 import org.opentripplanner.transit.model._data.TimetableRepositoryForTest;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.model.site.StopLocation;
+import org.opentripplanner.utils.time.DurationUtils;
+import org.opentripplanner.utils.time.TimeUtils;
+import org.opentripplanner.utils.tostring.ToStringBuilder;
 
 class UnscheduledTripTest {
 

application/src/ext-test/java/org/opentripplanner/ext/realtimeresolver/RealtimeResolverTest.java

@@ -3,8 +3,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.opentripplanner.framework.time.TimeUtils.time;
 import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary;
+import static org.opentripplanner.utils.time.TimeUtils.time;
 
 import java.time.LocalDate;
 import java.util.List;

application/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesConfigDocTest.java

@@ -3,11 +3,11 @@
 import static org.opentripplanner.framework.io.FileUtils.assertFileEquals;
 import static org.opentripplanner.framework.io.FileUtils.readFile;
 import static org.opentripplanner.framework.io.FileUtils.writeFile;
-import static org.opentripplanner.framework.text.MarkdownFormatter.HEADER_4;
 import static org.opentripplanner.generate.doc.framework.DocsTestConstants.TEMPLATE_PATH;
 import static org.opentripplanner.generate.doc.framework.DocsTestConstants.USER_DOC_PATH;
 import static org.opentripplanner.generate.doc.framework.TemplateUtil.replaceSection;
 import static org.opentripplanner.standalone.config.framework.json.JsonSupport.jsonNodeFromPath;
+import static org.opentripplanner.utils.text.MarkdownFormatter.HEADER_4;
 
 import java.io.File;
 import org.junit.jupiter.api.Test;

application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java

@@ -1,8 +1,8 @@
 package org.opentripplanner.ext.vectortiles.layers.stops;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.opentripplanner.framework.time.TimeUtils.time;
 import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary;
+import static org.opentripplanner.utils.time.TimeUtils.time;
 
 import java.time.ZonedDateTime;
 import java.util.HashMap;

application/src/ext-test/java/org/opentripplanner/ext/vehiclerentalservicedirectory/generatedoc/VehicleRentalServiceDirectoryConfigDocTest.java

@@ -4,13 +4,13 @@
 import static org.opentripplanner.framework.io.FileUtils.assertFileEquals;
 import static org.opentripplanner.framework.io.FileUtils.readFile;
 import static org.opentripplanner.framework.io.FileUtils.writeFile;
-import static org.opentripplanner.framework.text.MarkdownFormatter.HEADER_4;
 import static org.opentripplanner.generate.doc.framework.DocsTestConstants.TEMPLATE_PATH;
 import static org.opentripplanner.generate.doc.framework.DocsTestConstants.USER_DOC_PATH;
 import static org.opentripplanner.generate.doc.framework.TemplateUtil.replaceJsonExample;
 import static org.opentripplanner.generate.doc.framework.TemplateUtil.replaceParametersDetails;
 import static org.opentripplanner.generate.doc.framework.TemplateUtil.replaceParametersTable;
 import static org.opentripplanner.standalone.config.framework.json.JsonSupport.jsonNodeFromResource;
+import static org.opentripplanner.utils.text.MarkdownFormatter.HEADER_4;
 
 import java.io.File;
 import org.junit.jupiter.api.Test;

application/src/ext/java/org/opentripplanner/ext/dataoverlay/api/DataOverlayParameters.java

@@ -6,7 +6,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
-import org.opentripplanner.framework.tostring.ToStringBuilder;
+import org.opentripplanner.utils.tostring.ToStringBuilder;
 
 /**
  * The purpose of this class is to hold all parameters and their value in a map. It also contains

application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/DataOverlayConfig.java

@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 import java.util.List;
-import org.opentripplanner.framework.tostring.ToStringBuilder;
+import org.opentripplanner.utils.tostring.ToStringBuilder;
 
 /**
  * POJO class describing expected data-overlay-config.json structure

application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/DataOverlayParameterBindings.java

@@ -4,7 +4,7 @@
 import java.util.List;
 import java.util.Optional;
 import org.opentripplanner.ext.dataoverlay.api.ParameterName;
-import org.opentripplanner.framework.tostring.ToStringBuilder;
+import org.opentripplanner.utils.tostring.ToStringBuilder;
 
 public class DataOverlayParameterBindings implements Serializable {
 

application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/IndexVariable.java

@@ -1,7 +1,7 @@
 package org.opentripplanner.ext.dataoverlay.configuration;
 
 import java.io.Serializable;
-import org.opentripplanner.framework.tostring.ToStringBuilder;
+import org.opentripplanner.utils.tostring.ToStringBuilder;
 
 /**
  * This class describes the variables for the incoming .nc data file

application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/ParameterBinding.java

@@ -3,7 +3,7 @@
 import java.io.Serializable;
 import org.opentripplanner.ext.dataoverlay.api.ParameterName;
 import org.opentripplanner.ext.dataoverlay.routing.Parameter;
-import org.opentripplanner.framework.tostring.ToStringBuilder;
+import org.opentripplanner.utils.tostring.ToStringBuilder;
 
 /**
  * This class describes the expected routing request parameter for the generic data

application/src/ext/java/org/opentripplanner/ext/dataoverlay/routing/Parameter.java

@@ -2,7 +2,7 @@
 
 import org.opentripplanner.ext.dataoverlay.api.ParameterName;
 import org.opentripplanner.ext.dataoverlay.configuration.ParameterBinding;
-import org.opentripplanner.framework.tostring.ToStringBuilder;
+import org.opentripplanner.utils.tostring.ToStringBuilder;
 
 public class Parameter {
 

application/src/ext/java/org/opentripplanner/ext/emissions/Co2EmissionsDataReader.java

@@ -11,10 +11,10 @@
 import java.util.Optional;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
-import org.opentripplanner.framework.lang.Sandbox;
-import org.opentripplanner.framework.lang.StringUtils;
 import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
+import org.opentripplanner.utils.lang.Sandbox;
+import org.opentripplanner.utils.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

application/src/ext/java/org/opentripplanner/ext/emissions/DecorateWithEmission.java

@@ -3,7 +3,6 @@
 import java.util.List;
 import java.util.Optional;
 import org.opentripplanner.ext.flex.FlexibleTransitLeg;
-import org.opentripplanner.framework.lang.Sandbox;
 import org.opentripplanner.framework.model.Grams;
 import org.opentripplanner.model.plan.Emissions;
 import org.opentripplanner.model.plan.Itinerary;
@@ -13,6 +12,7 @@
 import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDecorator;
 import org.opentripplanner.street.search.TraverseMode;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
+import org.opentripplanner.utils.lang.Sandbox;
 
 /**
  * Calculates the emissions for the itineraries and adds them.

application/src/ext/java/org/opentripplanner/ext/emissions/DefaultEmissionsService.java

@@ -2,10 +2,10 @@
 
 import jakarta.inject.Inject;
 import java.util.Optional;
-import org.opentripplanner.framework.lang.Sandbox;
 import org.opentripplanner.framework.model.Grams;
 import org.opentripplanner.model.plan.Emissions;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
+import org.opentripplanner.utils.lang.Sandbox;
 
 @Sandbox
 public class DefaultEmissionsService implements EmissionsService {

application/src/ext/java/org/opentripplanner/ext/emissions/EmissionsService.java

@@ -1,9 +1,9 @@
 package org.opentripplanner.ext.emissions;
 
 import java.util.Optional;
-import org.opentripplanner.framework.lang.Sandbox;
 import org.opentripplanner.model.plan.Emissions;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
+import org.opentripplanner.utils.lang.Sandbox;
 
 /**
  * A service for getting emissions information for routes.

application/src/ext/java/org/opentripplanner/ext/fares/FaresToItineraryMapper.java

@@ -1,9 +1,9 @@
 package org.opentripplanner.ext.fares;
 
-import org.opentripplanner.framework.collection.ListUtils;
 import org.opentripplanner.model.fare.FareProductUse;
 import org.opentripplanner.model.fare.ItineraryFares;
 import org.opentripplanner.model.plan.Itinerary;
+import org.opentripplanner.utils.collection.ListUtils;
 
 /**
  * Takes fares and applies them to the legs of an itinerary.

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

@@ -7,7 +7,6 @@
 import java.util.Set;
 import javax.annotation.Nullable;
 import org.locationtech.jts.geom.LineString;
-import org.opentripplanner.framework.collection.ListUtils;
 import org.opentripplanner.model.fare.FareProductUse;
 import org.opentripplanner.model.plan.Leg;
 import org.opentripplanner.model.plan.LegTime;
@@ -19,6 +18,7 @@
 import org.opentripplanner.transit.model.organization.Agency;
 import org.opentripplanner.transit.model.site.FareZone;
 import org.opentripplanner.transit.model.timetable.Trip;
+import org.opentripplanner.utils.collection.ListUtils;
 
 /**
  * This is a fake leg that combines two interlined legs for the purpose of fare calculation.

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

@@ -1,6 +1,6 @@
 package org.opentripplanner.ext.fares.model;
 
-import org.opentripplanner.framework.tostring.ValueObjectToStringBuilder;
+import org.opentripplanner.utils.tostring.ValueObjectToStringBuilder;
 
 public class Distance {
 

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

@@ -2,9 +2,9 @@
 package org.opentripplanner.ext.fares.model;
 
 import java.io.Serializable;
-import org.opentripplanner.framework.tostring.ToStringBuilder;
 import org.opentripplanner.transit.model.framework.AbstractTransitEntity;
 import org.opentripplanner.transit.model.network.Route;
+import org.opentripplanner.utils.tostring.ToStringBuilder;
 
 public final class FareRule implements Serializable {
 

application/src/ext/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapper.java

@@ -6,13 +6,13 @@
 import java.util.stream.Stream;
 import org.locationtech.jts.geom.Point;
 import org.opentripplanner.framework.geometry.GeometryUtils;
-import org.opentripplanner.framework.logging.ProgressTracker;
 import org.opentripplanner.graph_builder.model.GraphBuilderModule;
 import org.opentripplanner.routing.graph.Graph;
 import org.opentripplanner.routing.graph.index.StreetIndex;
 import org.opentripplanner.street.model.vertex.StreetVertex;
 import org.opentripplanner.transit.model.site.AreaStop;
 import org.opentripplanner.transit.service.TimetableRepository;
+import org.opentripplanner.utils.logging.ProgressTracker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

application/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java

@@ -4,10 +4,10 @@
 
 import java.util.Objects;
 import org.opentripplanner.ext.flex.trip.FlexTrip;
-import org.opentripplanner.framework.tostring.ToStringBuilder;
 import org.opentripplanner.street.search.state.State;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo;
+import org.opentripplanner.utils.tostring.ToStringBuilder;
 
 public final class FlexAccessEgress {
 

application/src/ext/java/org/opentripplanner/ext/flex/FlexPathDurations.java

@@ -1,6 +1,6 @@
 package org.opentripplanner.ext.flex;
 
-import org.opentripplanner.framework.time.DurationUtils;
+import org.opentripplanner.utils.time.DurationUtils;
 
 /**
  * This value-object contains the durations for a Flex access or egress path. The path may also

application/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java

@@ -20,7 +20,6 @@
 import org.opentripplanner.ext.flex.template.FlexServiceDate;
 import org.opentripplanner.ext.flex.trip.FlexTrip;
 import org.opentripplanner.framework.application.OTPRequestTimeoutException;
-import org.opentripplanner.framework.time.ServiceDateUtils;
 import org.opentripplanner.model.PathTransfer;
 import org.opentripplanner.model.plan.Itinerary;
 import org.opentripplanner.routing.algorithm.mapping.GraphPathToItineraryMapper;
@@ -31,6 +30,7 @@
 import org.opentripplanner.transit.model.site.StopLocation;
 import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo;
 import org.opentripplanner.transit.service.TransitService;
+import org.opentripplanner.utils.time.ServiceDateUtils;
 
 public class FlexRouter {
 

application/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java

@@ -7,13 +7,13 @@
 import org.opentripplanner.ext.flex.trip.FlexTrip;
 import org.opentripplanner.ext.flex.trip.ScheduledDeviatedTrip;
 import org.opentripplanner.ext.flex.trip.UnscheduledTrip;
-import org.opentripplanner.framework.logging.ProgressTracker;
 import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore;
 import org.opentripplanner.model.StopTime;
 import org.opentripplanner.model.TripStopTimes;
 import org.opentripplanner.model.impl.OtpTransitServiceBuilder;
 import org.opentripplanner.routing.api.request.framework.TimePenalty;
 import org.opentripplanner.transit.model.timetable.Trip;
+import org.opentripplanner.utils.logging.ProgressTracker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

application/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java

@@ -10,8 +10,6 @@
 import org.locationtech.jts.geom.LineString;
 import org.opentripplanner.ext.flex.edgetype.FlexTripEdge;
 import org.opentripplanner.framework.i18n.I18NString;
-import org.opentripplanner.framework.lang.DoubleUtils;
-import org.opentripplanner.framework.tostring.ToStringBuilder;
 import org.opentripplanner.model.PickDrop;
 import org.opentripplanner.model.fare.FareProductUse;
 import org.opentripplanner.model.plan.Leg;
@@ -28,6 +26,8 @@
 import org.opentripplanner.transit.model.organization.Operator;
 import org.opentripplanner.transit.model.timetable.Trip;
 import org.opentripplanner.transit.model.timetable.booking.BookingInfo;
+import org.opentripplanner.utils.lang.DoubleUtils;
+import org.opentripplanner.utils.tostring.ToStringBuilder;
 
 /**
  * One leg of a trip -- that is, a temporally continuous piece of the journey that takes place on a

application/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java

@@ -4,8 +4,8 @@
 import java.util.function.Supplier;
 import javax.annotation.concurrent.Immutable;
 import org.locationtech.jts.geom.LineString;
-import org.opentripplanner.framework.lang.IntUtils;
 import org.opentripplanner.routing.api.request.framework.TimePenalty;
+import org.opentripplanner.utils.lang.IntUtils;
 
 /**
  * This class contains the results from a FlexPathCalculator.

application/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java

@@ -13,7 +13,6 @@
 import org.opentripplanner.ext.flex.edgetype.FlexTripEdge;
 import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator;
 import org.opentripplanner.ext.flex.trip.FlexTrip;
-import org.opentripplanner.framework.tostring.ToStringBuilder;
 import org.opentripplanner.model.PathTransfer;
 import org.opentripplanner.routing.graphfinder.NearbyStop;
 import org.opentripplanner.street.model.edge.Edge;
@@ -22,6 +21,7 @@
 import org.opentripplanner.street.search.state.State;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.model.site.StopLocation;
+import org.opentripplanner.utils.tostring.ToStringBuilder;
 
 /**
  * A container for a few pieces of information that can be used to calculate flex accesses, egresses,

application/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java

@@ -7,9 +7,9 @@
 import java.util.Map;
 import java.util.Objects;
 import org.opentripplanner.ext.flex.trip.FlexTrip;
-import org.opentripplanner.framework.lang.IntUtils;
 import org.opentripplanner.routing.graphfinder.NearbyStop;
 import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo;
+import org.opentripplanner.utils.lang.IntUtils;
 
 /**
  * The combination of the closest stop, trip and trip active date.