From cfc2b412eb8f0091d10994c0d17e8658d4f90537 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Tue, 22 Oct 2024 23:20:08 +0200 Subject: [PATCH 1/6] Create OTP framework module for "extended" programming language features. --- application/pom.xml | 5 +++ .../framework/collection/ToveUtils.java | 17 ++++++++ .../graph_builder/module/osm/DisjointSet.java | 4 +- .../graph_builder/module/osm/OsmDatabase.java | 6 +-- framework/pom.xml | 41 +++++++++++++++++++ .../framework/collection/CollectionUtils.java | 0 .../framework/collection/CollectionsView.java | 0 .../collection/CompositeComparator.java | 0 .../framework/collection/ListSection.java | 0 .../framework/collection/ListUtils.java | 0 .../framework/collection/MapUtils.java | 12 ------ .../framework/collection/SetUtils.java | 0 .../framework/lang/ArrayUtils.java | 0 .../framework/lang/BitSetUtils.java | 0 .../opentripplanner/framework/lang/Box.java | 0 .../framework/lang/DoubleUtils.java | 0 .../framework/lang/IntBox.java | 0 .../framework/lang/IntRange.java | 0 .../framework/lang/IntUtils.java | 0 .../lang/MemEfficientArrayBuilder.java | 0 .../framework/lang/ObjectUtils.java | 0 .../framework/lang/OtpNumberFormat.java | 0 .../framework/lang/Sandbox.java | 0 .../framework/lang/StringUtils.java | 0 .../framework/logging/ProgressTracker.java | 0 .../logging/ProgressTrackerInputStream.java | 0 .../logging/ProgressTrackerOutputStream.java | 0 .../framework/logging/Throttle.java | 0 .../text/CharacterEscapeFormatter.java | 0 .../text/FileSizeToTextConverter.java | 0 .../framework/text/HexString.java | 0 .../framework/text/MarkdownFormatter.java | 0 .../opentripplanner/framework/text/Table.java | 0 .../framework/text/TableBuilder.java | 0 .../framework/text/TableRowFormatter.java | 0 .../framework/time/CountdownTimer.java | 0 .../framework/time/DateUtils.java | 0 .../framework/time/DurationUtils.java | 0 .../framework/time/LocalDateUtils.java | 0 .../framework/time/OffsetDateTimeParser.java | 0 .../framework/time/RelativeTime.java | 0 .../framework/time/ServiceDateUtils.java | 0 .../framework/time/TimeUtils.java | 0 .../tostring/MultiLineToStringBuilder.java | 0 .../framework/tostring/ToStringBuilder.java | 0 .../tostring/ValueObjectToStringBuilder.java | 0 .../collection/CollectionUtilsTest.java | 2 +- .../collection/CollectionsViewTest.java | 0 .../collection/CompositeComparatorTest.java | 0 .../framework/collection/ListSectionTest.java | 0 .../framework/collection/ListUtilsTest.java | 0 .../framework/collection/MapUtilsTest.java | 0 .../framework/collection/SetUtilsTest.java | 0 .../framework/lang/ArrayUtilsTest.java | 0 .../framework/lang/BitSetUtilsTest.java | 0 .../framework/lang/BoxTest.java | 0 .../framework/lang/DoubleUtilsTest.java | 0 .../framework/lang/IntBoxTest.java | 0 .../framework/lang/IntRangeTest.java | 0 .../framework/lang/IntUtilsTest.java | 0 .../lang/MemEfficientArrayBuilderTest.java | 0 .../framework/lang/ObjectUtilsTest.java | 0 .../framework/lang/OtpNumberFormatTest.java | 0 .../framework/lang/StringUtilsTest.java | 0 .../logging/ProgressTrackerTest.java | 0 .../framework/logging/ThrottleTest.java | 0 .../text/CharacterEscapeFormatterTest.java | 0 .../text/FileSizeToTextConverterTest.java | 0 .../framework/text/HexStringTest.java | 0 .../framework/text/MarkdownFormatterTest.java | 0 .../framework/text/TableTest.java | 0 .../framework/time/CountdownTimerTest.java | 0 .../framework/time/DateUtilsTest.java | 1 - .../framework/time/DurationUtilsTest.java | 0 .../framework/time/LocalDateUtilsTest.java | 0 .../time/OffsetDateTimeParserTest.java | 0 .../framework/time/ServiceDateUtilsTest.java | 1 - .../framework/time/TimeUtilsTest.java | 1 - .../framework/time/ZoneIds.java | 11 +++++ .../MultiLineToStringBuilderTest.java | 0 .../tostring/ToStringBuilderTest.java | 2 +- .../ValueObjectToStringBuilderTest.java | 0 pom.xml | 1 + 83 files changed, 82 insertions(+), 22 deletions(-) create mode 100644 application/src/main/java/org/opentripplanner/framework/collection/ToveUtils.java create mode 100644 framework/pom.xml rename {application => framework}/src/main/java/org/opentripplanner/framework/collection/CollectionUtils.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/collection/CollectionsView.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/collection/CompositeComparator.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/collection/ListSection.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/collection/ListUtils.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/collection/MapUtils.java (77%) rename {application => framework}/src/main/java/org/opentripplanner/framework/collection/SetUtils.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/lang/ArrayUtils.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/lang/BitSetUtils.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/lang/Box.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/lang/DoubleUtils.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/lang/IntBox.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/lang/IntRange.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/lang/IntUtils.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilder.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/lang/ObjectUtils.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/lang/OtpNumberFormat.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/lang/Sandbox.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/lang/StringUtils.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/logging/ProgressTracker.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/logging/ProgressTrackerInputStream.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/logging/ProgressTrackerOutputStream.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/logging/Throttle.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/text/CharacterEscapeFormatter.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/text/FileSizeToTextConverter.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/text/HexString.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/text/MarkdownFormatter.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/text/Table.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/text/TableBuilder.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/text/TableRowFormatter.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/time/CountdownTimer.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/time/DateUtils.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/time/DurationUtils.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/time/LocalDateUtils.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/time/OffsetDateTimeParser.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/time/RelativeTime.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/time/ServiceDateUtils.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/time/TimeUtils.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/tostring/MultiLineToStringBuilder.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/tostring/ToStringBuilder.java (100%) rename {application => framework}/src/main/java/org/opentripplanner/framework/tostring/ValueObjectToStringBuilder.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/collection/CollectionUtilsTest.java (98%) rename {application => framework}/src/test/java/org/opentripplanner/framework/collection/CollectionsViewTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/collection/CompositeComparatorTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/collection/ListSectionTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/collection/ListUtilsTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/collection/MapUtilsTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/collection/SetUtilsTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/lang/ArrayUtilsTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/lang/BitSetUtilsTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/lang/BoxTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/lang/DoubleUtilsTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/lang/IntBoxTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/lang/IntRangeTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/lang/IntUtilsTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilderTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/lang/ObjectUtilsTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/lang/OtpNumberFormatTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/logging/ProgressTrackerTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/logging/ThrottleTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/text/CharacterEscapeFormatterTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/text/FileSizeToTextConverterTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/text/HexStringTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/text/MarkdownFormatterTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/text/TableTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/time/CountdownTimerTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/time/DateUtilsTest.java (98%) rename {application => framework}/src/test/java/org/opentripplanner/framework/time/DurationUtilsTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/time/LocalDateUtilsTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/time/OffsetDateTimeParserTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/time/ServiceDateUtilsTest.java (99%) rename {application => framework}/src/test/java/org/opentripplanner/framework/time/TimeUtilsTest.java (99%) create mode 100644 framework/src/test/java/org/opentripplanner/framework/time/ZoneIds.java rename {application => framework}/src/test/java/org/opentripplanner/framework/tostring/MultiLineToStringBuilderTest.java (100%) rename {application => framework}/src/test/java/org/opentripplanner/framework/tostring/ToStringBuilderTest.java (99%) rename {application => framework}/src/test/java/org/opentripplanner/framework/tostring/ValueObjectToStringBuilderTest.java (100%) diff --git a/application/pom.xml b/application/pom.xml index b13806e6a0a..60765797344 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -18,6 +18,11 @@ gtfs-realtime-protobuf ${project.version} + + ${project.groupId} + otp-framework + ${project.version} + diff --git a/application/src/main/java/org/opentripplanner/framework/collection/ToveUtils.java b/application/src/main/java/org/opentripplanner/framework/collection/ToveUtils.java new file mode 100644 index 00000000000..5958845e2b5 --- /dev/null +++ b/application/src/main/java/org/opentripplanner/framework/collection/ToveUtils.java @@ -0,0 +1,17 @@ +package org.opentripplanner.framework.collection; + +import gnu.trove.map.TLongObjectMap; +import java.util.HashSet; +import java.util.Set; + +public class ToveUtils { + + public static void addToMapSet(TLongObjectMap> mapSet, long key, U value) { + Set set = mapSet.get(key); + if (set == null) { + set = new HashSet<>(); + mapSet.put(key, set); + } + set.add(value); + } +} diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/DisjointSet.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/DisjointSet.java index 15bfc3605b5..369e5c20a14 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/DisjointSet.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/DisjointSet.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import org.opentripplanner.framework.collection.MapUtils; +import org.opentripplanner.framework.collection.ToveUtils; /** Basic union-find data structure with path compression */ class DisjointSet { @@ -62,7 +62,7 @@ public boolean exists(T element) { public List> sets() { TLongObjectMap> out = new TLongObjectHashMap<>(); setMapping.forEachEntry((k, v) -> { - MapUtils.addToMapSet(out, compact(v), k); + ToveUtils.addToMapSet(out, compact(v), k); return true; }); return new ArrayList<>(out.valueCollection()); diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmDatabase.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmDatabase.java index 88b1fe9f7da..0fa3c4cbd3b 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmDatabase.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmDatabase.java @@ -24,7 +24,7 @@ import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.LineString; import org.locationtech.jts.geom.Point; -import org.opentripplanner.framework.collection.MapUtils; +import org.opentripplanner.framework.collection.ToveUtils; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.geometry.HashGridSpatialIndex; import org.opentripplanner.framework.lang.StringUtils; @@ -267,7 +267,7 @@ public void addWay(OsmWay way) { way .getNodeRefs() .forEach(node -> { - MapUtils.addToMapSet(areasForNode, node, way); + ToveUtils.addToMapSet(areasForNode, node, way); return true; }); } @@ -738,7 +738,7 @@ private void processMultipolygonRelations() { while (wayNodeIterator.hasNext()) { long nodeId = wayNodeIterator.next(); if (nodesById.containsKey(nodeId)) { - MapUtils.addToMapSet(areasForNode, nodeId, way); + ToveUtils.addToMapSet(areasForNode, nodeId, way); } else { // this area is missing some nodes, perhaps because it is on // the edge of the region, so we will simply not route on it. diff --git a/framework/pom.xml b/framework/pom.xml new file mode 100644 index 00000000000..bc210986a7e --- /dev/null +++ b/framework/pom.xml @@ -0,0 +1,41 @@ + + + 4.0.0 + + org.opentripplanner + otp-root + 2.7.0-SNAPSHOT + + + otp-framework + OpenTripPlanner - Framework + + + + + com.google.code.findbugs + jsr305 + + + + + org.slf4j + slf4j-api + + + + + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-params + test + + + diff --git a/application/src/main/java/org/opentripplanner/framework/collection/CollectionUtils.java b/framework/src/main/java/org/opentripplanner/framework/collection/CollectionUtils.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/collection/CollectionUtils.java rename to framework/src/main/java/org/opentripplanner/framework/collection/CollectionUtils.java diff --git a/application/src/main/java/org/opentripplanner/framework/collection/CollectionsView.java b/framework/src/main/java/org/opentripplanner/framework/collection/CollectionsView.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/collection/CollectionsView.java rename to framework/src/main/java/org/opentripplanner/framework/collection/CollectionsView.java diff --git a/application/src/main/java/org/opentripplanner/framework/collection/CompositeComparator.java b/framework/src/main/java/org/opentripplanner/framework/collection/CompositeComparator.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/collection/CompositeComparator.java rename to framework/src/main/java/org/opentripplanner/framework/collection/CompositeComparator.java diff --git a/application/src/main/java/org/opentripplanner/framework/collection/ListSection.java b/framework/src/main/java/org/opentripplanner/framework/collection/ListSection.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/collection/ListSection.java rename to framework/src/main/java/org/opentripplanner/framework/collection/ListSection.java diff --git a/application/src/main/java/org/opentripplanner/framework/collection/ListUtils.java b/framework/src/main/java/org/opentripplanner/framework/collection/ListUtils.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/collection/ListUtils.java rename to framework/src/main/java/org/opentripplanner/framework/collection/ListUtils.java diff --git a/application/src/main/java/org/opentripplanner/framework/collection/MapUtils.java b/framework/src/main/java/org/opentripplanner/framework/collection/MapUtils.java similarity index 77% rename from application/src/main/java/org/opentripplanner/framework/collection/MapUtils.java rename to framework/src/main/java/org/opentripplanner/framework/collection/MapUtils.java index c68527b6d0e..afd1e87aec2 100644 --- a/application/src/main/java/org/opentripplanner/framework/collection/MapUtils.java +++ b/framework/src/main/java/org/opentripplanner/framework/collection/MapUtils.java @@ -1,27 +1,15 @@ package org.opentripplanner.framework.collection; -import gnu.trove.map.TLongObjectMap; import java.util.Arrays; import java.util.Collection; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; public class MapUtils { - public static void addToMapSet(TLongObjectMap> mapSet, long key, U value) { - Set set = mapSet.get(key); - if (set == null) { - set = new HashSet<>(); - mapSet.put(key, set); - } - set.add(value); - } - /** * Map a collection of objects of type S to a list of type T using the provided * mapping function. diff --git a/application/src/main/java/org/opentripplanner/framework/collection/SetUtils.java b/framework/src/main/java/org/opentripplanner/framework/collection/SetUtils.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/collection/SetUtils.java rename to framework/src/main/java/org/opentripplanner/framework/collection/SetUtils.java diff --git a/application/src/main/java/org/opentripplanner/framework/lang/ArrayUtils.java b/framework/src/main/java/org/opentripplanner/framework/lang/ArrayUtils.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/lang/ArrayUtils.java rename to framework/src/main/java/org/opentripplanner/framework/lang/ArrayUtils.java diff --git a/application/src/main/java/org/opentripplanner/framework/lang/BitSetUtils.java b/framework/src/main/java/org/opentripplanner/framework/lang/BitSetUtils.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/lang/BitSetUtils.java rename to framework/src/main/java/org/opentripplanner/framework/lang/BitSetUtils.java diff --git a/application/src/main/java/org/opentripplanner/framework/lang/Box.java b/framework/src/main/java/org/opentripplanner/framework/lang/Box.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/lang/Box.java rename to framework/src/main/java/org/opentripplanner/framework/lang/Box.java diff --git a/application/src/main/java/org/opentripplanner/framework/lang/DoubleUtils.java b/framework/src/main/java/org/opentripplanner/framework/lang/DoubleUtils.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/lang/DoubleUtils.java rename to framework/src/main/java/org/opentripplanner/framework/lang/DoubleUtils.java diff --git a/application/src/main/java/org/opentripplanner/framework/lang/IntBox.java b/framework/src/main/java/org/opentripplanner/framework/lang/IntBox.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/lang/IntBox.java rename to framework/src/main/java/org/opentripplanner/framework/lang/IntBox.java diff --git a/application/src/main/java/org/opentripplanner/framework/lang/IntRange.java b/framework/src/main/java/org/opentripplanner/framework/lang/IntRange.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/lang/IntRange.java rename to framework/src/main/java/org/opentripplanner/framework/lang/IntRange.java diff --git a/application/src/main/java/org/opentripplanner/framework/lang/IntUtils.java b/framework/src/main/java/org/opentripplanner/framework/lang/IntUtils.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/lang/IntUtils.java rename to framework/src/main/java/org/opentripplanner/framework/lang/IntUtils.java diff --git a/application/src/main/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilder.java b/framework/src/main/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilder.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilder.java rename to framework/src/main/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilder.java diff --git a/application/src/main/java/org/opentripplanner/framework/lang/ObjectUtils.java b/framework/src/main/java/org/opentripplanner/framework/lang/ObjectUtils.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/lang/ObjectUtils.java rename to framework/src/main/java/org/opentripplanner/framework/lang/ObjectUtils.java diff --git a/application/src/main/java/org/opentripplanner/framework/lang/OtpNumberFormat.java b/framework/src/main/java/org/opentripplanner/framework/lang/OtpNumberFormat.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/lang/OtpNumberFormat.java rename to framework/src/main/java/org/opentripplanner/framework/lang/OtpNumberFormat.java diff --git a/application/src/main/java/org/opentripplanner/framework/lang/Sandbox.java b/framework/src/main/java/org/opentripplanner/framework/lang/Sandbox.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/lang/Sandbox.java rename to framework/src/main/java/org/opentripplanner/framework/lang/Sandbox.java diff --git a/application/src/main/java/org/opentripplanner/framework/lang/StringUtils.java b/framework/src/main/java/org/opentripplanner/framework/lang/StringUtils.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/lang/StringUtils.java rename to framework/src/main/java/org/opentripplanner/framework/lang/StringUtils.java diff --git a/application/src/main/java/org/opentripplanner/framework/logging/ProgressTracker.java b/framework/src/main/java/org/opentripplanner/framework/logging/ProgressTracker.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/logging/ProgressTracker.java rename to framework/src/main/java/org/opentripplanner/framework/logging/ProgressTracker.java diff --git a/application/src/main/java/org/opentripplanner/framework/logging/ProgressTrackerInputStream.java b/framework/src/main/java/org/opentripplanner/framework/logging/ProgressTrackerInputStream.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/logging/ProgressTrackerInputStream.java rename to framework/src/main/java/org/opentripplanner/framework/logging/ProgressTrackerInputStream.java diff --git a/application/src/main/java/org/opentripplanner/framework/logging/ProgressTrackerOutputStream.java b/framework/src/main/java/org/opentripplanner/framework/logging/ProgressTrackerOutputStream.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/logging/ProgressTrackerOutputStream.java rename to framework/src/main/java/org/opentripplanner/framework/logging/ProgressTrackerOutputStream.java diff --git a/application/src/main/java/org/opentripplanner/framework/logging/Throttle.java b/framework/src/main/java/org/opentripplanner/framework/logging/Throttle.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/logging/Throttle.java rename to framework/src/main/java/org/opentripplanner/framework/logging/Throttle.java diff --git a/application/src/main/java/org/opentripplanner/framework/text/CharacterEscapeFormatter.java b/framework/src/main/java/org/opentripplanner/framework/text/CharacterEscapeFormatter.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/text/CharacterEscapeFormatter.java rename to framework/src/main/java/org/opentripplanner/framework/text/CharacterEscapeFormatter.java diff --git a/application/src/main/java/org/opentripplanner/framework/text/FileSizeToTextConverter.java b/framework/src/main/java/org/opentripplanner/framework/text/FileSizeToTextConverter.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/text/FileSizeToTextConverter.java rename to framework/src/main/java/org/opentripplanner/framework/text/FileSizeToTextConverter.java diff --git a/application/src/main/java/org/opentripplanner/framework/text/HexString.java b/framework/src/main/java/org/opentripplanner/framework/text/HexString.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/text/HexString.java rename to framework/src/main/java/org/opentripplanner/framework/text/HexString.java diff --git a/application/src/main/java/org/opentripplanner/framework/text/MarkdownFormatter.java b/framework/src/main/java/org/opentripplanner/framework/text/MarkdownFormatter.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/text/MarkdownFormatter.java rename to framework/src/main/java/org/opentripplanner/framework/text/MarkdownFormatter.java diff --git a/application/src/main/java/org/opentripplanner/framework/text/Table.java b/framework/src/main/java/org/opentripplanner/framework/text/Table.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/text/Table.java rename to framework/src/main/java/org/opentripplanner/framework/text/Table.java diff --git a/application/src/main/java/org/opentripplanner/framework/text/TableBuilder.java b/framework/src/main/java/org/opentripplanner/framework/text/TableBuilder.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/text/TableBuilder.java rename to framework/src/main/java/org/opentripplanner/framework/text/TableBuilder.java diff --git a/application/src/main/java/org/opentripplanner/framework/text/TableRowFormatter.java b/framework/src/main/java/org/opentripplanner/framework/text/TableRowFormatter.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/text/TableRowFormatter.java rename to framework/src/main/java/org/opentripplanner/framework/text/TableRowFormatter.java diff --git a/application/src/main/java/org/opentripplanner/framework/time/CountdownTimer.java b/framework/src/main/java/org/opentripplanner/framework/time/CountdownTimer.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/time/CountdownTimer.java rename to framework/src/main/java/org/opentripplanner/framework/time/CountdownTimer.java diff --git a/application/src/main/java/org/opentripplanner/framework/time/DateUtils.java b/framework/src/main/java/org/opentripplanner/framework/time/DateUtils.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/time/DateUtils.java rename to framework/src/main/java/org/opentripplanner/framework/time/DateUtils.java diff --git a/application/src/main/java/org/opentripplanner/framework/time/DurationUtils.java b/framework/src/main/java/org/opentripplanner/framework/time/DurationUtils.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/time/DurationUtils.java rename to framework/src/main/java/org/opentripplanner/framework/time/DurationUtils.java diff --git a/application/src/main/java/org/opentripplanner/framework/time/LocalDateUtils.java b/framework/src/main/java/org/opentripplanner/framework/time/LocalDateUtils.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/time/LocalDateUtils.java rename to framework/src/main/java/org/opentripplanner/framework/time/LocalDateUtils.java diff --git a/application/src/main/java/org/opentripplanner/framework/time/OffsetDateTimeParser.java b/framework/src/main/java/org/opentripplanner/framework/time/OffsetDateTimeParser.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/time/OffsetDateTimeParser.java rename to framework/src/main/java/org/opentripplanner/framework/time/OffsetDateTimeParser.java diff --git a/application/src/main/java/org/opentripplanner/framework/time/RelativeTime.java b/framework/src/main/java/org/opentripplanner/framework/time/RelativeTime.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/time/RelativeTime.java rename to framework/src/main/java/org/opentripplanner/framework/time/RelativeTime.java diff --git a/application/src/main/java/org/opentripplanner/framework/time/ServiceDateUtils.java b/framework/src/main/java/org/opentripplanner/framework/time/ServiceDateUtils.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/time/ServiceDateUtils.java rename to framework/src/main/java/org/opentripplanner/framework/time/ServiceDateUtils.java diff --git a/application/src/main/java/org/opentripplanner/framework/time/TimeUtils.java b/framework/src/main/java/org/opentripplanner/framework/time/TimeUtils.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/time/TimeUtils.java rename to framework/src/main/java/org/opentripplanner/framework/time/TimeUtils.java diff --git a/application/src/main/java/org/opentripplanner/framework/tostring/MultiLineToStringBuilder.java b/framework/src/main/java/org/opentripplanner/framework/tostring/MultiLineToStringBuilder.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/tostring/MultiLineToStringBuilder.java rename to framework/src/main/java/org/opentripplanner/framework/tostring/MultiLineToStringBuilder.java diff --git a/application/src/main/java/org/opentripplanner/framework/tostring/ToStringBuilder.java b/framework/src/main/java/org/opentripplanner/framework/tostring/ToStringBuilder.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/tostring/ToStringBuilder.java rename to framework/src/main/java/org/opentripplanner/framework/tostring/ToStringBuilder.java diff --git a/application/src/main/java/org/opentripplanner/framework/tostring/ValueObjectToStringBuilder.java b/framework/src/main/java/org/opentripplanner/framework/tostring/ValueObjectToStringBuilder.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/tostring/ValueObjectToStringBuilder.java rename to framework/src/main/java/org/opentripplanner/framework/tostring/ValueObjectToStringBuilder.java diff --git a/application/src/test/java/org/opentripplanner/framework/collection/CollectionUtilsTest.java b/framework/src/test/java/org/opentripplanner/framework/collection/CollectionUtilsTest.java similarity index 98% rename from application/src/test/java/org/opentripplanner/framework/collection/CollectionUtilsTest.java rename to framework/src/test/java/org/opentripplanner/framework/collection/CollectionUtilsTest.java index 6686ac8e0d9..9cfe118f984 100644 --- a/application/src/test/java/org/opentripplanner/framework/collection/CollectionUtilsTest.java +++ b/framework/src/test/java/org/opentripplanner/framework/collection/CollectionUtilsTest.java @@ -4,8 +4,8 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.google.type.Month; import java.time.Duration; +import java.time.Month; import java.util.ArrayList; import java.util.Collection; import java.util.EnumSet; diff --git a/application/src/test/java/org/opentripplanner/framework/collection/CollectionsViewTest.java b/framework/src/test/java/org/opentripplanner/framework/collection/CollectionsViewTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/collection/CollectionsViewTest.java rename to framework/src/test/java/org/opentripplanner/framework/collection/CollectionsViewTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/collection/CompositeComparatorTest.java b/framework/src/test/java/org/opentripplanner/framework/collection/CompositeComparatorTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/collection/CompositeComparatorTest.java rename to framework/src/test/java/org/opentripplanner/framework/collection/CompositeComparatorTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/collection/ListSectionTest.java b/framework/src/test/java/org/opentripplanner/framework/collection/ListSectionTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/collection/ListSectionTest.java rename to framework/src/test/java/org/opentripplanner/framework/collection/ListSectionTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/collection/ListUtilsTest.java b/framework/src/test/java/org/opentripplanner/framework/collection/ListUtilsTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/collection/ListUtilsTest.java rename to framework/src/test/java/org/opentripplanner/framework/collection/ListUtilsTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/collection/MapUtilsTest.java b/framework/src/test/java/org/opentripplanner/framework/collection/MapUtilsTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/collection/MapUtilsTest.java rename to framework/src/test/java/org/opentripplanner/framework/collection/MapUtilsTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/collection/SetUtilsTest.java b/framework/src/test/java/org/opentripplanner/framework/collection/SetUtilsTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/collection/SetUtilsTest.java rename to framework/src/test/java/org/opentripplanner/framework/collection/SetUtilsTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/lang/ArrayUtilsTest.java b/framework/src/test/java/org/opentripplanner/framework/lang/ArrayUtilsTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/lang/ArrayUtilsTest.java rename to framework/src/test/java/org/opentripplanner/framework/lang/ArrayUtilsTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/lang/BitSetUtilsTest.java b/framework/src/test/java/org/opentripplanner/framework/lang/BitSetUtilsTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/lang/BitSetUtilsTest.java rename to framework/src/test/java/org/opentripplanner/framework/lang/BitSetUtilsTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/lang/BoxTest.java b/framework/src/test/java/org/opentripplanner/framework/lang/BoxTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/lang/BoxTest.java rename to framework/src/test/java/org/opentripplanner/framework/lang/BoxTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/lang/DoubleUtilsTest.java b/framework/src/test/java/org/opentripplanner/framework/lang/DoubleUtilsTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/lang/DoubleUtilsTest.java rename to framework/src/test/java/org/opentripplanner/framework/lang/DoubleUtilsTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/lang/IntBoxTest.java b/framework/src/test/java/org/opentripplanner/framework/lang/IntBoxTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/lang/IntBoxTest.java rename to framework/src/test/java/org/opentripplanner/framework/lang/IntBoxTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/lang/IntRangeTest.java b/framework/src/test/java/org/opentripplanner/framework/lang/IntRangeTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/lang/IntRangeTest.java rename to framework/src/test/java/org/opentripplanner/framework/lang/IntRangeTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/lang/IntUtilsTest.java b/framework/src/test/java/org/opentripplanner/framework/lang/IntUtilsTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/lang/IntUtilsTest.java rename to framework/src/test/java/org/opentripplanner/framework/lang/IntUtilsTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilderTest.java b/framework/src/test/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilderTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilderTest.java rename to framework/src/test/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilderTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/lang/ObjectUtilsTest.java b/framework/src/test/java/org/opentripplanner/framework/lang/ObjectUtilsTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/lang/ObjectUtilsTest.java rename to framework/src/test/java/org/opentripplanner/framework/lang/ObjectUtilsTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/lang/OtpNumberFormatTest.java b/framework/src/test/java/org/opentripplanner/framework/lang/OtpNumberFormatTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/lang/OtpNumberFormatTest.java rename to framework/src/test/java/org/opentripplanner/framework/lang/OtpNumberFormatTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java b/framework/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java rename to framework/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/logging/ProgressTrackerTest.java b/framework/src/test/java/org/opentripplanner/framework/logging/ProgressTrackerTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/logging/ProgressTrackerTest.java rename to framework/src/test/java/org/opentripplanner/framework/logging/ProgressTrackerTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/logging/ThrottleTest.java b/framework/src/test/java/org/opentripplanner/framework/logging/ThrottleTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/logging/ThrottleTest.java rename to framework/src/test/java/org/opentripplanner/framework/logging/ThrottleTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/text/CharacterEscapeFormatterTest.java b/framework/src/test/java/org/opentripplanner/framework/text/CharacterEscapeFormatterTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/text/CharacterEscapeFormatterTest.java rename to framework/src/test/java/org/opentripplanner/framework/text/CharacterEscapeFormatterTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/text/FileSizeToTextConverterTest.java b/framework/src/test/java/org/opentripplanner/framework/text/FileSizeToTextConverterTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/text/FileSizeToTextConverterTest.java rename to framework/src/test/java/org/opentripplanner/framework/text/FileSizeToTextConverterTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/text/HexStringTest.java b/framework/src/test/java/org/opentripplanner/framework/text/HexStringTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/text/HexStringTest.java rename to framework/src/test/java/org/opentripplanner/framework/text/HexStringTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/text/MarkdownFormatterTest.java b/framework/src/test/java/org/opentripplanner/framework/text/MarkdownFormatterTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/text/MarkdownFormatterTest.java rename to framework/src/test/java/org/opentripplanner/framework/text/MarkdownFormatterTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/text/TableTest.java b/framework/src/test/java/org/opentripplanner/framework/text/TableTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/text/TableTest.java rename to framework/src/test/java/org/opentripplanner/framework/text/TableTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/time/CountdownTimerTest.java b/framework/src/test/java/org/opentripplanner/framework/time/CountdownTimerTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/time/CountdownTimerTest.java rename to framework/src/test/java/org/opentripplanner/framework/time/CountdownTimerTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/time/DateUtilsTest.java b/framework/src/test/java/org/opentripplanner/framework/time/DateUtilsTest.java similarity index 98% rename from application/src/test/java/org/opentripplanner/framework/time/DateUtilsTest.java rename to framework/src/test/java/org/opentripplanner/framework/time/DateUtilsTest.java index d89eea5d73b..6b2e493b735 100644 --- a/application/src/test/java/org/opentripplanner/framework/time/DateUtilsTest.java +++ b/framework/src/test/java/org/opentripplanner/framework/time/DateUtilsTest.java @@ -7,7 +7,6 @@ import java.time.ZoneId; import java.time.ZonedDateTime; import org.junit.jupiter.api.Test; -import org.opentripplanner._support.time.ZoneIds; public class DateUtilsTest { diff --git a/application/src/test/java/org/opentripplanner/framework/time/DurationUtilsTest.java b/framework/src/test/java/org/opentripplanner/framework/time/DurationUtilsTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/time/DurationUtilsTest.java rename to framework/src/test/java/org/opentripplanner/framework/time/DurationUtilsTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/time/LocalDateUtilsTest.java b/framework/src/test/java/org/opentripplanner/framework/time/LocalDateUtilsTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/time/LocalDateUtilsTest.java rename to framework/src/test/java/org/opentripplanner/framework/time/LocalDateUtilsTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/time/OffsetDateTimeParserTest.java b/framework/src/test/java/org/opentripplanner/framework/time/OffsetDateTimeParserTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/time/OffsetDateTimeParserTest.java rename to framework/src/test/java/org/opentripplanner/framework/time/OffsetDateTimeParserTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/time/ServiceDateUtilsTest.java b/framework/src/test/java/org/opentripplanner/framework/time/ServiceDateUtilsTest.java similarity index 99% rename from application/src/test/java/org/opentripplanner/framework/time/ServiceDateUtilsTest.java rename to framework/src/test/java/org/opentripplanner/framework/time/ServiceDateUtilsTest.java index 4c22b414537..92a67df9110 100644 --- a/application/src/test/java/org/opentripplanner/framework/time/ServiceDateUtilsTest.java +++ b/framework/src/test/java/org/opentripplanner/framework/time/ServiceDateUtilsTest.java @@ -17,7 +17,6 @@ import java.time.ZoneId; import java.time.ZonedDateTime; import org.junit.jupiter.api.Test; -import org.opentripplanner._support.time.ZoneIds; public class ServiceDateUtilsTest { diff --git a/application/src/test/java/org/opentripplanner/framework/time/TimeUtilsTest.java b/framework/src/test/java/org/opentripplanner/framework/time/TimeUtilsTest.java similarity index 99% rename from application/src/test/java/org/opentripplanner/framework/time/TimeUtilsTest.java rename to framework/src/test/java/org/opentripplanner/framework/time/TimeUtilsTest.java index c2eb828cc21..936102f3496 100644 --- a/application/src/test/java/org/opentripplanner/framework/time/TimeUtilsTest.java +++ b/framework/src/test/java/org/opentripplanner/framework/time/TimeUtilsTest.java @@ -11,7 +11,6 @@ import java.time.ZonedDateTime; import java.util.Arrays; import org.junit.jupiter.api.Test; -import org.opentripplanner._support.time.ZoneIds; public class TimeUtilsTest { diff --git a/framework/src/test/java/org/opentripplanner/framework/time/ZoneIds.java b/framework/src/test/java/org/opentripplanner/framework/time/ZoneIds.java new file mode 100644 index 00000000000..e42dc718790 --- /dev/null +++ b/framework/src/test/java/org/opentripplanner/framework/time/ZoneIds.java @@ -0,0 +1,11 @@ +package org.opentripplanner.framework.time; + +import java.time.ZoneId; + +public class ZoneIds { + + public static final ZoneId UTC = ZoneId.of("UTC"); + public static final ZoneId CET = ZoneId.of("CET"); + public static final ZoneId OSLO = ZoneId.of("Europe/Oslo"); + public static final ZoneId PARIS = ZoneId.of("Europe/Paris"); +} diff --git a/application/src/test/java/org/opentripplanner/framework/tostring/MultiLineToStringBuilderTest.java b/framework/src/test/java/org/opentripplanner/framework/tostring/MultiLineToStringBuilderTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/tostring/MultiLineToStringBuilderTest.java rename to framework/src/test/java/org/opentripplanner/framework/tostring/MultiLineToStringBuilderTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/tostring/ToStringBuilderTest.java b/framework/src/test/java/org/opentripplanner/framework/tostring/ToStringBuilderTest.java similarity index 99% rename from application/src/test/java/org/opentripplanner/framework/tostring/ToStringBuilderTest.java rename to framework/src/test/java/org/opentripplanner/framework/tostring/ToStringBuilderTest.java index 90254c321a1..59d1eea4d0b 100644 --- a/application/src/test/java/org/opentripplanner/framework/tostring/ToStringBuilderTest.java +++ b/framework/src/test/java/org/opentripplanner/framework/tostring/ToStringBuilderTest.java @@ -13,8 +13,8 @@ import java.util.Objects; import java.util.function.Function; import org.junit.jupiter.api.Test; -import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.framework.time.TimeUtils; +import org.opentripplanner.framework.time.ZoneIds; public class ToStringBuilderTest { diff --git a/application/src/test/java/org/opentripplanner/framework/tostring/ValueObjectToStringBuilderTest.java b/framework/src/test/java/org/opentripplanner/framework/tostring/ValueObjectToStringBuilderTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/tostring/ValueObjectToStringBuilderTest.java rename to framework/src/test/java/org/opentripplanner/framework/tostring/ValueObjectToStringBuilderTest.java diff --git a/pom.xml b/pom.xml index e590501e6c4..3b1ff48c427 100644 --- a/pom.xml +++ b/pom.xml @@ -96,6 +96,7 @@ application gtfs-realtime-protobuf + framework From 0f685399b9ca4fe6205b321775aefc0947363787 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Tue, 29 Oct 2024 22:08:10 +0100 Subject: [PATCH 2/6] Rename Maven module to utils --- pom.xml | 2 +- {framework => utils}/pom.xml | 4 ++-- .../opentripplanner/utils}/collection/CollectionUtils.java | 0 .../opentripplanner/utils}/collection/CollectionsView.java | 0 .../utils}/collection/CompositeComparator.java | 0 .../org/opentripplanner/utils}/collection/ListSection.java | 0 .../java/org/opentripplanner/utils}/collection/ListUtils.java | 0 .../java/org/opentripplanner/utils}/collection/MapUtils.java | 0 .../java/org/opentripplanner/utils}/collection/SetUtils.java | 0 .../main/java/org/opentripplanner/utils}/lang/ArrayUtils.java | 0 .../java/org/opentripplanner/utils}/lang/BitSetUtils.java | 0 .../src/main/java/org/opentripplanner/utils}/lang/Box.java | 0 .../java/org/opentripplanner/utils}/lang/DoubleUtils.java | 0 .../src/main/java/org/opentripplanner/utils}/lang/IntBox.java | 0 .../main/java/org/opentripplanner/utils}/lang/IntRange.java | 0 .../main/java/org/opentripplanner/utils}/lang/IntUtils.java | 0 .../opentripplanner/utils}/lang/MemEfficientArrayBuilder.java | 0 .../java/org/opentripplanner/utils}/lang/ObjectUtils.java | 0 .../java/org/opentripplanner/utils}/lang/OtpNumberFormat.java | 0 .../main/java/org/opentripplanner/utils}/lang/Sandbox.java | 0 .../java/org/opentripplanner/utils}/lang/StringUtils.java | 0 .../org/opentripplanner/utils}/logging/ProgressTracker.java | 0 .../utils}/logging/ProgressTrackerInputStream.java | 0 .../utils}/logging/ProgressTrackerOutputStream.java | 0 .../java/org/opentripplanner/utils}/logging/Throttle.java | 0 .../opentripplanner/utils}/text/CharacterEscapeFormatter.java | 0 .../opentripplanner/utils}/text/FileSizeToTextConverter.java | 0 .../main/java/org/opentripplanner/utils}/text/HexString.java | 0 .../org/opentripplanner/utils}/text/MarkdownFormatter.java | 0 .../src/main/java/org/opentripplanner/utils}/text/Table.java | 0 .../java/org/opentripplanner/utils}/text/TableBuilder.java | 0 .../org/opentripplanner/utils}/text/TableRowFormatter.java | 0 .../java/org/opentripplanner/utils}/time/CountdownTimer.java | 0 .../main/java/org/opentripplanner/utils}/time/DateUtils.java | 0 .../java/org/opentripplanner/utils}/time/DurationUtils.java | 0 .../java/org/opentripplanner/utils}/time/LocalDateUtils.java | 0 .../org/opentripplanner/utils}/time/OffsetDateTimeParser.java | 0 .../java/org/opentripplanner/utils}/time/RelativeTime.java | 0 .../org/opentripplanner/utils}/time/ServiceDateUtils.java | 0 .../main/java/org/opentripplanner/utils}/time/TimeUtils.java | 0 .../utils}/tostring/MultiLineToStringBuilder.java | 0 .../org/opentripplanner/utils}/tostring/ToStringBuilder.java | 0 .../utils}/tostring/ValueObjectToStringBuilder.java | 0 .../utils}/collection/CollectionUtilsTest.java | 0 .../utils}/collection/CollectionsViewTest.java | 0 .../utils}/collection/CompositeComparatorTest.java | 0 .../opentripplanner/utils}/collection/ListSectionTest.java | 0 .../org/opentripplanner/utils}/collection/ListUtilsTest.java | 0 .../org/opentripplanner/utils}/collection/MapUtilsTest.java | 0 .../org/opentripplanner/utils}/collection/SetUtilsTest.java | 0 .../java/org/opentripplanner/utils}/lang/ArrayUtilsTest.java | 0 .../java/org/opentripplanner/utils}/lang/BitSetUtilsTest.java | 0 .../test/java/org/opentripplanner/utils}/lang/BoxTest.java | 0 .../java/org/opentripplanner/utils}/lang/DoubleUtilsTest.java | 0 .../test/java/org/opentripplanner/utils}/lang/IntBoxTest.java | 0 .../java/org/opentripplanner/utils}/lang/IntRangeTest.java | 0 .../java/org/opentripplanner/utils}/lang/IntUtilsTest.java | 0 .../utils}/lang/MemEfficientArrayBuilderTest.java | 0 .../java/org/opentripplanner/utils}/lang/ObjectUtilsTest.java | 0 .../org/opentripplanner/utils}/lang/OtpNumberFormatTest.java | 0 .../java/org/opentripplanner/utils}/lang/StringUtilsTest.java | 0 .../opentripplanner/utils}/logging/ProgressTrackerTest.java | 0 .../java/org/opentripplanner/utils}/logging/ThrottleTest.java | 0 .../utils}/text/CharacterEscapeFormatterTest.java | 0 .../utils}/text/FileSizeToTextConverterTest.java | 0 .../java/org/opentripplanner/utils}/text/HexStringTest.java | 0 .../opentripplanner/utils}/text/MarkdownFormatterTest.java | 0 .../test/java/org/opentripplanner/utils}/text/TableTest.java | 0 .../org/opentripplanner/utils}/time/CountdownTimerTest.java | 0 .../java/org/opentripplanner/utils}/time/DateUtilsTest.java | 0 .../org/opentripplanner/utils}/time/DurationUtilsTest.java | 0 .../org/opentripplanner/utils}/time/LocalDateUtilsTest.java | 0 .../opentripplanner/utils}/time/OffsetDateTimeParserTest.java | 0 .../org/opentripplanner/utils}/time/ServiceDateUtilsTest.java | 0 .../java/org/opentripplanner/utils}/time/TimeUtilsTest.java | 0 .../test/java/org/opentripplanner/utils}/time/ZoneIds.java | 0 .../utils}/tostring/MultiLineToStringBuilderTest.java | 0 .../opentripplanner/utils}/tostring/ToStringBuilderTest.java | 0 .../utils}/tostring/ValueObjectToStringBuilderTest.java | 0 79 files changed, 3 insertions(+), 3 deletions(-) rename {framework => utils}/pom.xml (93%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/collection/CollectionUtils.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/collection/CollectionsView.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/collection/CompositeComparator.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/collection/ListSection.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/collection/ListUtils.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/collection/MapUtils.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/collection/SetUtils.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/lang/ArrayUtils.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/lang/BitSetUtils.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/lang/Box.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/lang/DoubleUtils.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/lang/IntBox.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/lang/IntRange.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/lang/IntUtils.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/lang/MemEfficientArrayBuilder.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/lang/ObjectUtils.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/lang/OtpNumberFormat.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/lang/Sandbox.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/lang/StringUtils.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/logging/ProgressTracker.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/logging/ProgressTrackerInputStream.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/logging/ProgressTrackerOutputStream.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/logging/Throttle.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/text/CharacterEscapeFormatter.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/text/FileSizeToTextConverter.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/text/HexString.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/text/MarkdownFormatter.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/text/Table.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/text/TableBuilder.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/text/TableRowFormatter.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/time/CountdownTimer.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/time/DateUtils.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/time/DurationUtils.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/time/LocalDateUtils.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/time/OffsetDateTimeParser.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/time/RelativeTime.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/time/ServiceDateUtils.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/time/TimeUtils.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/tostring/MultiLineToStringBuilder.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/tostring/ToStringBuilder.java (100%) rename {framework/src/main/java/org/opentripplanner/framework => utils/src/main/java/org/opentripplanner/utils}/tostring/ValueObjectToStringBuilder.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/collection/CollectionUtilsTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/collection/CollectionsViewTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/collection/CompositeComparatorTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/collection/ListSectionTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/collection/ListUtilsTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/collection/MapUtilsTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/collection/SetUtilsTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/lang/ArrayUtilsTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/lang/BitSetUtilsTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/lang/BoxTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/lang/DoubleUtilsTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/lang/IntBoxTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/lang/IntRangeTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/lang/IntUtilsTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/lang/MemEfficientArrayBuilderTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/lang/ObjectUtilsTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/lang/OtpNumberFormatTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/lang/StringUtilsTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/logging/ProgressTrackerTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/logging/ThrottleTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/text/CharacterEscapeFormatterTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/text/FileSizeToTextConverterTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/text/HexStringTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/text/MarkdownFormatterTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/text/TableTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/time/CountdownTimerTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/time/DateUtilsTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/time/DurationUtilsTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/time/LocalDateUtilsTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/time/OffsetDateTimeParserTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/time/ServiceDateUtilsTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/time/TimeUtilsTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/time/ZoneIds.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/tostring/MultiLineToStringBuilderTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/tostring/ToStringBuilderTest.java (100%) rename {framework/src/test/java/org/opentripplanner/framework => utils/src/test/java/org/opentripplanner/utils}/tostring/ValueObjectToStringBuilderTest.java (100%) diff --git a/pom.xml b/pom.xml index 3b1ff48c427..6aedbf90268 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ application gtfs-realtime-protobuf - framework + utils diff --git a/framework/pom.xml b/utils/pom.xml similarity index 93% rename from framework/pom.xml rename to utils/pom.xml index bc210986a7e..1cace007d00 100644 --- a/framework/pom.xml +++ b/utils/pom.xml @@ -9,8 +9,8 @@ 2.7.0-SNAPSHOT - otp-framework - OpenTripPlanner - Framework + otp-utils + OpenTripPlanner - Utils diff --git a/framework/src/main/java/org/opentripplanner/framework/collection/CollectionUtils.java b/utils/src/main/java/org/opentripplanner/utils/collection/CollectionUtils.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/collection/CollectionUtils.java rename to utils/src/main/java/org/opentripplanner/utils/collection/CollectionUtils.java diff --git a/framework/src/main/java/org/opentripplanner/framework/collection/CollectionsView.java b/utils/src/main/java/org/opentripplanner/utils/collection/CollectionsView.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/collection/CollectionsView.java rename to utils/src/main/java/org/opentripplanner/utils/collection/CollectionsView.java diff --git a/framework/src/main/java/org/opentripplanner/framework/collection/CompositeComparator.java b/utils/src/main/java/org/opentripplanner/utils/collection/CompositeComparator.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/collection/CompositeComparator.java rename to utils/src/main/java/org/opentripplanner/utils/collection/CompositeComparator.java diff --git a/framework/src/main/java/org/opentripplanner/framework/collection/ListSection.java b/utils/src/main/java/org/opentripplanner/utils/collection/ListSection.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/collection/ListSection.java rename to utils/src/main/java/org/opentripplanner/utils/collection/ListSection.java diff --git a/framework/src/main/java/org/opentripplanner/framework/collection/ListUtils.java b/utils/src/main/java/org/opentripplanner/utils/collection/ListUtils.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/collection/ListUtils.java rename to utils/src/main/java/org/opentripplanner/utils/collection/ListUtils.java diff --git a/framework/src/main/java/org/opentripplanner/framework/collection/MapUtils.java b/utils/src/main/java/org/opentripplanner/utils/collection/MapUtils.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/collection/MapUtils.java rename to utils/src/main/java/org/opentripplanner/utils/collection/MapUtils.java diff --git a/framework/src/main/java/org/opentripplanner/framework/collection/SetUtils.java b/utils/src/main/java/org/opentripplanner/utils/collection/SetUtils.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/collection/SetUtils.java rename to utils/src/main/java/org/opentripplanner/utils/collection/SetUtils.java diff --git a/framework/src/main/java/org/opentripplanner/framework/lang/ArrayUtils.java b/utils/src/main/java/org/opentripplanner/utils/lang/ArrayUtils.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/lang/ArrayUtils.java rename to utils/src/main/java/org/opentripplanner/utils/lang/ArrayUtils.java diff --git a/framework/src/main/java/org/opentripplanner/framework/lang/BitSetUtils.java b/utils/src/main/java/org/opentripplanner/utils/lang/BitSetUtils.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/lang/BitSetUtils.java rename to utils/src/main/java/org/opentripplanner/utils/lang/BitSetUtils.java diff --git a/framework/src/main/java/org/opentripplanner/framework/lang/Box.java b/utils/src/main/java/org/opentripplanner/utils/lang/Box.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/lang/Box.java rename to utils/src/main/java/org/opentripplanner/utils/lang/Box.java diff --git a/framework/src/main/java/org/opentripplanner/framework/lang/DoubleUtils.java b/utils/src/main/java/org/opentripplanner/utils/lang/DoubleUtils.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/lang/DoubleUtils.java rename to utils/src/main/java/org/opentripplanner/utils/lang/DoubleUtils.java diff --git a/framework/src/main/java/org/opentripplanner/framework/lang/IntBox.java b/utils/src/main/java/org/opentripplanner/utils/lang/IntBox.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/lang/IntBox.java rename to utils/src/main/java/org/opentripplanner/utils/lang/IntBox.java diff --git a/framework/src/main/java/org/opentripplanner/framework/lang/IntRange.java b/utils/src/main/java/org/opentripplanner/utils/lang/IntRange.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/lang/IntRange.java rename to utils/src/main/java/org/opentripplanner/utils/lang/IntRange.java diff --git a/framework/src/main/java/org/opentripplanner/framework/lang/IntUtils.java b/utils/src/main/java/org/opentripplanner/utils/lang/IntUtils.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/lang/IntUtils.java rename to utils/src/main/java/org/opentripplanner/utils/lang/IntUtils.java diff --git a/framework/src/main/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilder.java b/utils/src/main/java/org/opentripplanner/utils/lang/MemEfficientArrayBuilder.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilder.java rename to utils/src/main/java/org/opentripplanner/utils/lang/MemEfficientArrayBuilder.java diff --git a/framework/src/main/java/org/opentripplanner/framework/lang/ObjectUtils.java b/utils/src/main/java/org/opentripplanner/utils/lang/ObjectUtils.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/lang/ObjectUtils.java rename to utils/src/main/java/org/opentripplanner/utils/lang/ObjectUtils.java diff --git a/framework/src/main/java/org/opentripplanner/framework/lang/OtpNumberFormat.java b/utils/src/main/java/org/opentripplanner/utils/lang/OtpNumberFormat.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/lang/OtpNumberFormat.java rename to utils/src/main/java/org/opentripplanner/utils/lang/OtpNumberFormat.java diff --git a/framework/src/main/java/org/opentripplanner/framework/lang/Sandbox.java b/utils/src/main/java/org/opentripplanner/utils/lang/Sandbox.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/lang/Sandbox.java rename to utils/src/main/java/org/opentripplanner/utils/lang/Sandbox.java diff --git a/framework/src/main/java/org/opentripplanner/framework/lang/StringUtils.java b/utils/src/main/java/org/opentripplanner/utils/lang/StringUtils.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/lang/StringUtils.java rename to utils/src/main/java/org/opentripplanner/utils/lang/StringUtils.java diff --git a/framework/src/main/java/org/opentripplanner/framework/logging/ProgressTracker.java b/utils/src/main/java/org/opentripplanner/utils/logging/ProgressTracker.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/logging/ProgressTracker.java rename to utils/src/main/java/org/opentripplanner/utils/logging/ProgressTracker.java diff --git a/framework/src/main/java/org/opentripplanner/framework/logging/ProgressTrackerInputStream.java b/utils/src/main/java/org/opentripplanner/utils/logging/ProgressTrackerInputStream.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/logging/ProgressTrackerInputStream.java rename to utils/src/main/java/org/opentripplanner/utils/logging/ProgressTrackerInputStream.java diff --git a/framework/src/main/java/org/opentripplanner/framework/logging/ProgressTrackerOutputStream.java b/utils/src/main/java/org/opentripplanner/utils/logging/ProgressTrackerOutputStream.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/logging/ProgressTrackerOutputStream.java rename to utils/src/main/java/org/opentripplanner/utils/logging/ProgressTrackerOutputStream.java diff --git a/framework/src/main/java/org/opentripplanner/framework/logging/Throttle.java b/utils/src/main/java/org/opentripplanner/utils/logging/Throttle.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/logging/Throttle.java rename to utils/src/main/java/org/opentripplanner/utils/logging/Throttle.java diff --git a/framework/src/main/java/org/opentripplanner/framework/text/CharacterEscapeFormatter.java b/utils/src/main/java/org/opentripplanner/utils/text/CharacterEscapeFormatter.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/text/CharacterEscapeFormatter.java rename to utils/src/main/java/org/opentripplanner/utils/text/CharacterEscapeFormatter.java diff --git a/framework/src/main/java/org/opentripplanner/framework/text/FileSizeToTextConverter.java b/utils/src/main/java/org/opentripplanner/utils/text/FileSizeToTextConverter.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/text/FileSizeToTextConverter.java rename to utils/src/main/java/org/opentripplanner/utils/text/FileSizeToTextConverter.java diff --git a/framework/src/main/java/org/opentripplanner/framework/text/HexString.java b/utils/src/main/java/org/opentripplanner/utils/text/HexString.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/text/HexString.java rename to utils/src/main/java/org/opentripplanner/utils/text/HexString.java diff --git a/framework/src/main/java/org/opentripplanner/framework/text/MarkdownFormatter.java b/utils/src/main/java/org/opentripplanner/utils/text/MarkdownFormatter.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/text/MarkdownFormatter.java rename to utils/src/main/java/org/opentripplanner/utils/text/MarkdownFormatter.java diff --git a/framework/src/main/java/org/opentripplanner/framework/text/Table.java b/utils/src/main/java/org/opentripplanner/utils/text/Table.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/text/Table.java rename to utils/src/main/java/org/opentripplanner/utils/text/Table.java diff --git a/framework/src/main/java/org/opentripplanner/framework/text/TableBuilder.java b/utils/src/main/java/org/opentripplanner/utils/text/TableBuilder.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/text/TableBuilder.java rename to utils/src/main/java/org/opentripplanner/utils/text/TableBuilder.java diff --git a/framework/src/main/java/org/opentripplanner/framework/text/TableRowFormatter.java b/utils/src/main/java/org/opentripplanner/utils/text/TableRowFormatter.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/text/TableRowFormatter.java rename to utils/src/main/java/org/opentripplanner/utils/text/TableRowFormatter.java diff --git a/framework/src/main/java/org/opentripplanner/framework/time/CountdownTimer.java b/utils/src/main/java/org/opentripplanner/utils/time/CountdownTimer.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/time/CountdownTimer.java rename to utils/src/main/java/org/opentripplanner/utils/time/CountdownTimer.java diff --git a/framework/src/main/java/org/opentripplanner/framework/time/DateUtils.java b/utils/src/main/java/org/opentripplanner/utils/time/DateUtils.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/time/DateUtils.java rename to utils/src/main/java/org/opentripplanner/utils/time/DateUtils.java diff --git a/framework/src/main/java/org/opentripplanner/framework/time/DurationUtils.java b/utils/src/main/java/org/opentripplanner/utils/time/DurationUtils.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/time/DurationUtils.java rename to utils/src/main/java/org/opentripplanner/utils/time/DurationUtils.java diff --git a/framework/src/main/java/org/opentripplanner/framework/time/LocalDateUtils.java b/utils/src/main/java/org/opentripplanner/utils/time/LocalDateUtils.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/time/LocalDateUtils.java rename to utils/src/main/java/org/opentripplanner/utils/time/LocalDateUtils.java diff --git a/framework/src/main/java/org/opentripplanner/framework/time/OffsetDateTimeParser.java b/utils/src/main/java/org/opentripplanner/utils/time/OffsetDateTimeParser.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/time/OffsetDateTimeParser.java rename to utils/src/main/java/org/opentripplanner/utils/time/OffsetDateTimeParser.java diff --git a/framework/src/main/java/org/opentripplanner/framework/time/RelativeTime.java b/utils/src/main/java/org/opentripplanner/utils/time/RelativeTime.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/time/RelativeTime.java rename to utils/src/main/java/org/opentripplanner/utils/time/RelativeTime.java diff --git a/framework/src/main/java/org/opentripplanner/framework/time/ServiceDateUtils.java b/utils/src/main/java/org/opentripplanner/utils/time/ServiceDateUtils.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/time/ServiceDateUtils.java rename to utils/src/main/java/org/opentripplanner/utils/time/ServiceDateUtils.java diff --git a/framework/src/main/java/org/opentripplanner/framework/time/TimeUtils.java b/utils/src/main/java/org/opentripplanner/utils/time/TimeUtils.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/time/TimeUtils.java rename to utils/src/main/java/org/opentripplanner/utils/time/TimeUtils.java diff --git a/framework/src/main/java/org/opentripplanner/framework/tostring/MultiLineToStringBuilder.java b/utils/src/main/java/org/opentripplanner/utils/tostring/MultiLineToStringBuilder.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/tostring/MultiLineToStringBuilder.java rename to utils/src/main/java/org/opentripplanner/utils/tostring/MultiLineToStringBuilder.java diff --git a/framework/src/main/java/org/opentripplanner/framework/tostring/ToStringBuilder.java b/utils/src/main/java/org/opentripplanner/utils/tostring/ToStringBuilder.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/tostring/ToStringBuilder.java rename to utils/src/main/java/org/opentripplanner/utils/tostring/ToStringBuilder.java diff --git a/framework/src/main/java/org/opentripplanner/framework/tostring/ValueObjectToStringBuilder.java b/utils/src/main/java/org/opentripplanner/utils/tostring/ValueObjectToStringBuilder.java similarity index 100% rename from framework/src/main/java/org/opentripplanner/framework/tostring/ValueObjectToStringBuilder.java rename to utils/src/main/java/org/opentripplanner/utils/tostring/ValueObjectToStringBuilder.java diff --git a/framework/src/test/java/org/opentripplanner/framework/collection/CollectionUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/collection/CollectionUtilsTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/collection/CollectionUtilsTest.java rename to utils/src/test/java/org/opentripplanner/utils/collection/CollectionUtilsTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/collection/CollectionsViewTest.java b/utils/src/test/java/org/opentripplanner/utils/collection/CollectionsViewTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/collection/CollectionsViewTest.java rename to utils/src/test/java/org/opentripplanner/utils/collection/CollectionsViewTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/collection/CompositeComparatorTest.java b/utils/src/test/java/org/opentripplanner/utils/collection/CompositeComparatorTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/collection/CompositeComparatorTest.java rename to utils/src/test/java/org/opentripplanner/utils/collection/CompositeComparatorTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/collection/ListSectionTest.java b/utils/src/test/java/org/opentripplanner/utils/collection/ListSectionTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/collection/ListSectionTest.java rename to utils/src/test/java/org/opentripplanner/utils/collection/ListSectionTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/collection/ListUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/collection/ListUtilsTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/collection/ListUtilsTest.java rename to utils/src/test/java/org/opentripplanner/utils/collection/ListUtilsTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/collection/MapUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/collection/MapUtilsTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/collection/MapUtilsTest.java rename to utils/src/test/java/org/opentripplanner/utils/collection/MapUtilsTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/collection/SetUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/collection/SetUtilsTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/collection/SetUtilsTest.java rename to utils/src/test/java/org/opentripplanner/utils/collection/SetUtilsTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/lang/ArrayUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/lang/ArrayUtilsTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/lang/ArrayUtilsTest.java rename to utils/src/test/java/org/opentripplanner/utils/lang/ArrayUtilsTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/lang/BitSetUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/lang/BitSetUtilsTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/lang/BitSetUtilsTest.java rename to utils/src/test/java/org/opentripplanner/utils/lang/BitSetUtilsTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/lang/BoxTest.java b/utils/src/test/java/org/opentripplanner/utils/lang/BoxTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/lang/BoxTest.java rename to utils/src/test/java/org/opentripplanner/utils/lang/BoxTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/lang/DoubleUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/lang/DoubleUtilsTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/lang/DoubleUtilsTest.java rename to utils/src/test/java/org/opentripplanner/utils/lang/DoubleUtilsTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/lang/IntBoxTest.java b/utils/src/test/java/org/opentripplanner/utils/lang/IntBoxTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/lang/IntBoxTest.java rename to utils/src/test/java/org/opentripplanner/utils/lang/IntBoxTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/lang/IntRangeTest.java b/utils/src/test/java/org/opentripplanner/utils/lang/IntRangeTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/lang/IntRangeTest.java rename to utils/src/test/java/org/opentripplanner/utils/lang/IntRangeTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/lang/IntUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/lang/IntUtilsTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/lang/IntUtilsTest.java rename to utils/src/test/java/org/opentripplanner/utils/lang/IntUtilsTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilderTest.java b/utils/src/test/java/org/opentripplanner/utils/lang/MemEfficientArrayBuilderTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilderTest.java rename to utils/src/test/java/org/opentripplanner/utils/lang/MemEfficientArrayBuilderTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/lang/ObjectUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/lang/ObjectUtilsTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/lang/ObjectUtilsTest.java rename to utils/src/test/java/org/opentripplanner/utils/lang/ObjectUtilsTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/lang/OtpNumberFormatTest.java b/utils/src/test/java/org/opentripplanner/utils/lang/OtpNumberFormatTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/lang/OtpNumberFormatTest.java rename to utils/src/test/java/org/opentripplanner/utils/lang/OtpNumberFormatTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/lang/StringUtilsTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java rename to utils/src/test/java/org/opentripplanner/utils/lang/StringUtilsTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/logging/ProgressTrackerTest.java b/utils/src/test/java/org/opentripplanner/utils/logging/ProgressTrackerTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/logging/ProgressTrackerTest.java rename to utils/src/test/java/org/opentripplanner/utils/logging/ProgressTrackerTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/logging/ThrottleTest.java b/utils/src/test/java/org/opentripplanner/utils/logging/ThrottleTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/logging/ThrottleTest.java rename to utils/src/test/java/org/opentripplanner/utils/logging/ThrottleTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/text/CharacterEscapeFormatterTest.java b/utils/src/test/java/org/opentripplanner/utils/text/CharacterEscapeFormatterTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/text/CharacterEscapeFormatterTest.java rename to utils/src/test/java/org/opentripplanner/utils/text/CharacterEscapeFormatterTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/text/FileSizeToTextConverterTest.java b/utils/src/test/java/org/opentripplanner/utils/text/FileSizeToTextConverterTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/text/FileSizeToTextConverterTest.java rename to utils/src/test/java/org/opentripplanner/utils/text/FileSizeToTextConverterTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/text/HexStringTest.java b/utils/src/test/java/org/opentripplanner/utils/text/HexStringTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/text/HexStringTest.java rename to utils/src/test/java/org/opentripplanner/utils/text/HexStringTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/text/MarkdownFormatterTest.java b/utils/src/test/java/org/opentripplanner/utils/text/MarkdownFormatterTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/text/MarkdownFormatterTest.java rename to utils/src/test/java/org/opentripplanner/utils/text/MarkdownFormatterTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/text/TableTest.java b/utils/src/test/java/org/opentripplanner/utils/text/TableTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/text/TableTest.java rename to utils/src/test/java/org/opentripplanner/utils/text/TableTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/time/CountdownTimerTest.java b/utils/src/test/java/org/opentripplanner/utils/time/CountdownTimerTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/time/CountdownTimerTest.java rename to utils/src/test/java/org/opentripplanner/utils/time/CountdownTimerTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/time/DateUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/time/DateUtilsTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/time/DateUtilsTest.java rename to utils/src/test/java/org/opentripplanner/utils/time/DateUtilsTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/time/DurationUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/time/DurationUtilsTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/time/DurationUtilsTest.java rename to utils/src/test/java/org/opentripplanner/utils/time/DurationUtilsTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/time/LocalDateUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/time/LocalDateUtilsTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/time/LocalDateUtilsTest.java rename to utils/src/test/java/org/opentripplanner/utils/time/LocalDateUtilsTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/time/OffsetDateTimeParserTest.java b/utils/src/test/java/org/opentripplanner/utils/time/OffsetDateTimeParserTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/time/OffsetDateTimeParserTest.java rename to utils/src/test/java/org/opentripplanner/utils/time/OffsetDateTimeParserTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/time/ServiceDateUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/time/ServiceDateUtilsTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/time/ServiceDateUtilsTest.java rename to utils/src/test/java/org/opentripplanner/utils/time/ServiceDateUtilsTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/time/TimeUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/time/TimeUtilsTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/time/TimeUtilsTest.java rename to utils/src/test/java/org/opentripplanner/utils/time/TimeUtilsTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/time/ZoneIds.java b/utils/src/test/java/org/opentripplanner/utils/time/ZoneIds.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/time/ZoneIds.java rename to utils/src/test/java/org/opentripplanner/utils/time/ZoneIds.java diff --git a/framework/src/test/java/org/opentripplanner/framework/tostring/MultiLineToStringBuilderTest.java b/utils/src/test/java/org/opentripplanner/utils/tostring/MultiLineToStringBuilderTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/tostring/MultiLineToStringBuilderTest.java rename to utils/src/test/java/org/opentripplanner/utils/tostring/MultiLineToStringBuilderTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/tostring/ToStringBuilderTest.java b/utils/src/test/java/org/opentripplanner/utils/tostring/ToStringBuilderTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/tostring/ToStringBuilderTest.java rename to utils/src/test/java/org/opentripplanner/utils/tostring/ToStringBuilderTest.java diff --git a/framework/src/test/java/org/opentripplanner/framework/tostring/ValueObjectToStringBuilderTest.java b/utils/src/test/java/org/opentripplanner/utils/tostring/ValueObjectToStringBuilderTest.java similarity index 100% rename from framework/src/test/java/org/opentripplanner/framework/tostring/ValueObjectToStringBuilderTest.java rename to utils/src/test/java/org/opentripplanner/utils/tostring/ValueObjectToStringBuilderTest.java From 09e2de79e913a931c90958d24352bd40d6797827 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Tue, 29 Oct 2024 22:42:43 +0100 Subject: [PATCH 3/6] Rename all packages in utils from framework to utils We do this in a separate PR from moving the files to keep git-history. --- application/pom.xml | 2 +- .../ext/flex/FlexStopTimesForTest.java | 2 +- .../template/FlexTemplateFactoryTest.java | 2 +- .../flex/trip/ScheduledDeviatedTripTest.java | 2 +- .../ext/flex/trip/UnscheduledTripTest.java | 6 +++--- .../RealtimeResolverTest.java | 2 +- .../vectortiles/VectorTilesConfigDocTest.java | 2 +- .../layers/stops/RealtimeStopsLayerTest.java | 2 +- ...leRentalServiceDirectoryConfigDocTest.java | 2 +- .../api/DataOverlayParameters.java | 2 +- .../configuration/DataOverlayConfig.java | 2 +- .../DataOverlayParameterBindings.java | 2 +- .../configuration/IndexVariable.java | 2 +- .../configuration/ParameterBinding.java | 2 +- .../ext/dataoverlay/routing/Parameter.java | 2 +- .../ext/emissions/Co2EmissionsDataReader.java | 4 ++-- .../ext/emissions/DecorateWithEmission.java | 2 +- .../emissions/DefaultEmissionsService.java | 2 +- .../ext/emissions/EmissionsService.java | 2 +- .../ext/fares/FaresToItineraryMapper.java | 2 +- .../impl/CombinedInterlinedTransitLeg.java | 2 +- .../ext/fares/model/Distance.java | 2 +- .../ext/fares/model/FareRule.java | 2 +- .../ext/flex/AreaStopsToVerticesMapper.java | 2 +- .../ext/flex/FlexAccessEgress.java | 2 +- .../ext/flex/FlexPathDurations.java | 2 +- .../opentripplanner/ext/flex/FlexRouter.java | 2 +- .../ext/flex/FlexTripsMapper.java | 2 +- .../ext/flex/FlexibleTransitLeg.java | 4 ++-- .../ext/flex/flexpathcalculator/FlexPath.java | 2 +- .../flex/template/AbstractFlexTemplate.java | 2 +- .../ext/flex/template/ClosestTrip.java | 2 +- .../ext/flex/trip/StopTimeWindow.java | 2 +- .../ext/flex/trip/UnscheduledTrip.java | 6 +++--- .../ext/geocoder/LuceneIndex.java | 2 +- .../ext/geocoder/StopClusterMapper.java | 2 +- .../debug/raptor/RaptorDebugModel.java | 2 +- .../ext/reportapi/model/CsvReportBuilder.java | 4 ++-- .../ext/reportapi/model/TransfersReport.java | 2 +- .../ext/restapi/mapping/LocalDateMapper.java | 2 +- .../ext/restapi/model/ApiBookingInfo.java | 2 +- .../ext/restapi/model/ApiBookingTime.java | 2 +- .../ext/restapi/model/ApiContactInfo.java | 2 +- .../ext/restapi/resources/IndexAPI.java | 2 +- .../resources/RequestToPreferencesMapper.java | 2 +- .../restapi/resources/RoutingResource.java | 4 ++-- ...DigitransitRealtimeStopPropertyMapper.java | 2 +- .../vehicleparking/bikeep/BikeepUpdater.java | 2 +- .../parkapi/ParkAPIUpdater.java | 2 +- .../sirifm/SiriFmDatasource.java | 2 +- .../apis/gtfs/GraphQLScalars.java | 2 +- .../apis/gtfs/datafetchers/PatternImpl.java | 2 +- .../apis/gtfs/datafetchers/QueryTypeImpl.java | 2 +- .../apis/gtfs/datafetchers/StopImpl.java | 2 +- .../apis/gtfs/datafetchers/TripImpl.java | 2 +- .../BicyclePreferencesMapper.java | 2 +- .../routerequest/RouteRequestMapper.java | 2 +- .../TransitPreferencesMapper.java | 4 ++-- .../apis/transmodel/TransmodelGraph.java | 2 +- .../transmodel/mapping/TransitIdMapper.java | 2 +- .../framework/PenaltyForStreetModeType.java | 2 +- .../StreetModeDurationInputType.java | 2 +- .../transmodel/model/plan/RelaxCostType.java | 2 +- .../plan/TripPatternTimePenaltyType.java | 2 +- .../model/scalars/DateTimeScalarFactory.java | 2 +- ...UnprocessableRequestExecutionStrategy.java | 2 +- .../apis/vectortiles/DebugStyleSpec.java | 2 +- .../apis/vectortiles/model/StyleBuilder.java | 2 +- .../model/ZoomDependentNumber.java | 3 --- .../java/org/opentripplanner/astar/AStar.java | 2 +- .../datastore/api/DataSource.java | 2 +- .../https/HttpsDataSourceMetadata.java | 2 +- .../framework/application/LogMDCSupport.java | 2 +- .../geometry/CompactElevationProfile.java | 2 +- .../geometry/CompactLineStringUtils.java | 2 +- .../geometry/HashGridSpatialIndex.java | 2 +- .../framework/geometry/WgsCoordinate.java | 4 ++-- .../graphql/scalar/CostScalarFactory.java | 2 +- .../graphql/scalar/DurationScalarFactory.java | 2 +- .../opentripplanner/framework/model/Cost.java | 4 ++-- .../framework/model/TimeAndCost.java | 2 +- .../framework/model/Units.java | 4 ++-- .../framework/time/ZoneIdFallback.java | 2 +- .../framework/token/Serializer.java | 2 +- .../framework/token/TokenBuilder.java | 2 +- .../framework/token/TokenDefinition.java | 2 +- .../token/TokenDefinitionBuilder.java | 4 ++-- .../token/TokenFormatterConfiguration.java | 2 +- .../framework/token/TokenSchema.java | 2 +- .../framework/token/TokenType.java | 2 +- .../graph_builder/GraphBuilder.java | 4 ++-- .../graph_builder/issue/api/Issue.java | 2 +- .../issue/report/DataImportIssueReporter.java | 2 +- .../graph_builder/issues/HopZeroDistance.java | 2 +- .../module/DirectTransferGenerator.java | 2 +- .../module/StreetLinkerModule.java | 2 +- ...ateAndInterpolateStopTimesForEachTrip.java | 2 +- .../CalculateWorldEnvelopeModule.java | 2 +- .../module/ned/ElevationModule.java | 6 +++--- .../module/ned/MissingElevationHandler.java | 2 +- .../graph_builder/module/osm/OsmDatabase.java | 2 +- .../graph_builder/module/osm/OsmModule.java | 2 +- .../module/osm/naming/SidewalkNamer.java | 4 ++-- .../gtfs/GenerateTripPatternsOperation.java | 2 +- .../gtfs/interlining/InterlineProcessor.java | 2 +- .../gtfs/mapping/AgencyMapper.java | 2 +- .../gtfs/mapping/BoardingAreaMapper.java | 2 +- .../gtfs/mapping/EntranceMapper.java | 2 +- .../gtfs/mapping/FareAttributeMapper.java | 2 +- .../gtfs/mapping/FareRuleMapper.java | 2 +- .../gtfs/mapping/FeedInfoMapper.java | 2 +- .../gtfs/mapping/FrequencyMapper.java | 2 +- .../gtfs/mapping/LocationGroupMapper.java | 2 +- .../gtfs/mapping/LocationMapper.java | 2 +- .../gtfs/mapping/PathwayMapper.java | 2 +- .../gtfs/mapping/PathwayNodeMapper.java | 2 +- .../gtfs/mapping/RouteMapper.java | 2 +- .../mapping/ServiceCalendarDateMapper.java | 2 +- .../gtfs/mapping/ServiceCalendarMapper.java | 2 +- .../gtfs/mapping/ShapePointMapper.java | 2 +- .../gtfs/mapping/StopMapper.java | 2 +- .../gtfs/mapping/StopTimeMapper.java | 2 +- .../gtfs/mapping/TripMapper.java | 2 +- .../vector/edge/EdgePropertyMapper.java | 4 ++-- .../vector/vertex/VertexPropertyMapper.java | 2 +- .../org/opentripplanner/model/Frequency.java | 2 +- .../model/GenericLocation.java | 4 ++-- .../opentripplanner/model/PathTransfer.java | 2 +- .../org/opentripplanner/model/StopTime.java | 2 +- .../opentripplanner/model/SystemNotice.java | 2 +- .../org/opentripplanner/model/Timetable.java | 2 +- .../model/TimetableSnapshot.java | 2 +- .../model/calendar/CalendarServiceData.java | 2 +- .../model/calendar/ServiceCalendarDate.java | 2 +- .../model/calendar/ServiceDateInterval.java | 2 +- .../calendar/openinghours/OHCalendar.java | 2 +- .../calendar/openinghours/OpeningHours.java | 2 +- .../openinghours/OsmOpeningHoursSupport.java | 2 +- .../model/fare/FareMedium.java | 2 +- .../model/fare/FareProduct.java | 4 ++-- .../model/fare/FareProductUse.java | 2 +- .../model/fare/ItineraryFares.java | 4 ++-- .../model/fare/RiderCategory.java | 2 +- .../modes/AllowMainAndSubModeFilter.java | 2 +- .../modes/AllowMainAndSubModesFilter.java | 2 +- .../model/modes/AllowMainModeFilter.java | 2 +- .../model/modes/AllowMainModesFilter.java | 2 +- .../model/modes/ExcludeAllTransitFilter.java | 2 +- .../model/plan/ElevationProfile.java | 4 ++-- .../opentripplanner/model/plan/Emissions.java | 2 +- .../model/plan/FrequencyTransitLeg.java | 2 +- .../opentripplanner/model/plan/Itinerary.java | 4 ++-- .../model/plan/ItinerarySortKey.java | 2 +- .../org/opentripplanner/model/plan/Leg.java | 2 +- .../org/opentripplanner/model/plan/Place.java | 2 +- .../model/plan/ScheduledTransitLeg.java | 6 +++--- .../model/plan/StopArrival.java | 2 +- .../model/plan/StopArrivalMapper.java | 2 +- .../opentripplanner/model/plan/StreetLeg.java | 4 ++-- .../opentripplanner/model/plan/TripPlan.java | 2 +- .../model/plan/UnknownTransitPathLeg.java | 4 ++-- .../opentripplanner/model/plan/WalkStep.java | 4 ++-- .../model/plan/WalkStepBuilder.java | 4 ++-- .../ScheduledTransitLegReference.java | 2 +- .../model/plan/paging/cursor/PageCursor.java | 4 ++-- .../plan/paging/cursor/PageCursorFactory.java | 2 +- .../paging/cursor/PageCursorSerializer.java | 2 +- .../model/projectinfo/VersionControlInfo.java | 2 +- .../model/transfer/ConstrainedTransfer.java | 2 +- .../transfer/RouteStopTransferPoint.java | 2 +- .../model/transfer/StationTransferPoint.java | 2 +- .../model/transfer/TransferConstraint.java | 2 +- .../model/transfer/TripTransferPoint.java | 2 +- .../netex/config/NetexFeedParameters.java | 2 +- .../mapping/AuthorityToAgencyMapper.java | 2 +- .../mapping/MultilingualStringMapper.java | 2 +- .../netex/mapping/OperatorToAgencyMapper.java | 2 +- .../org/opentripplanner/osm/OsmProvider.java | 4 ++-- .../osm/model/OsmWithTags.java | 2 +- .../specifier/BestMatchSpecifier.java | 2 +- .../raptor/api/debug/DebugEvent.java | 2 +- .../model/GeneralizedCostRelaxFunction.java | 4 ++-- .../raptor/api/model/RaptorAccessEgress.java | 4 ++-- .../raptor/api/model/RaptorTransfer.java | 2 +- .../raptor/api/path/PathLeg.java | 4 ++-- .../raptor/api/path/PathStringBuilder.java | 4 ++-- .../raptor/api/request/DebugRequest.java | 2 +- .../api/request/MultiCriteriaRequest.java | 2 +- .../raptor/api/request/PassThroughPoint.java | 2 +- .../raptor/api/request/RaptorRequest.java | 2 +- .../api/request/RaptorViaConnection.java | 2 +- .../raptor/api/request/RaptorViaLocation.java | 4 ++-- .../raptor/api/request/SearchParams.java | 2 +- .../api/request/SearchParamsBuilder.java | 2 +- .../raptor/api/response/RaptorResponse.java | 2 +- .../raptor/api/view/ArrivalView.java | 2 +- .../raptor/path/PathBuilderLeg.java | 2 +- .../rangeraptor/SystemErrDebugLogger.java | 20 +++++++++---------- .../internalapi/HeuristicAtStop.java | 4 ++-- .../multicriteria/ride/c1/PatternRideC1.java | 2 +- .../ride/c2/PassThroughRideFactory.java | 2 +- .../multicriteria/ride/c2/PatternRideC2.java | 2 +- .../path/DestinationArrivalPaths.java | 4 ++-- .../MinTravelDurationRoutingStrategy.java | 2 +- .../standard/besttimes/BestTimes.java | 4 ++-- .../SimpleBestNumberOfTransfers.java | 2 +- .../heuristics/HeuristicsAdapter.java | 6 +++--- .../stoparrivals/AccessStopArrivalState.java | 2 +- .../stoparrivals/DefaultStopArrivalState.java | 2 +- .../stoparrivals/EgressStopArrivalState.java | 2 +- .../path/EgressArrivalToPathAdapter.java | 4 ++-- .../ForwardRaptorTransitCalculator.java | 2 +- .../transit/RaptorTransitCalculator.java | 2 +- .../ReverseRaptorTransitCalculator.java | 2 +- .../transit/TripScheduleExactMatchSearch.java | 2 +- .../rangeraptor/transit/TripTimesSearch.java | 2 +- .../raptor/service/DebugHeuristics.java | 2 +- .../raptor/service/HeuristicSearchTask.java | 2 +- .../raptor/spi/BoardAndAlightTime.java | 4 ++-- .../raptor/util/CompareIntArrays.java | 2 +- .../routing/TripTimeOnDateHelper.java | 2 +- .../routing/algorithm/RoutingWorker.java | 2 +- .../ItineraryListFilterChainBuilder.java | 4 ++-- .../filterchain/api/GroupBySimilarity.java | 2 +- .../TransitGeneralizedCostFilterParams.java | 2 +- .../filters/system/NumItinerariesFilter.java | 2 +- .../system/NumItinerariesFilterResults.java | 6 +++--- .../filters/system/PagingFilter.java | 2 +- .../transit/TransitGeneralizedCostFilter.java | 2 +- .../framework/groupids/GroupByDistance.java | 2 +- .../framework/sort/SortOrderComparator.java | 2 +- .../raptoradapter/path/PathDiff.java | 16 +++++++-------- .../router/street/AccessEgressRouter.java | 2 +- .../raptoradapter/transit/Transfer.java | 4 ++-- .../transit/TransitTuningParameters.java | 2 +- .../transit/TripPatternForDate.java | 2 +- .../ConstrainedTransfersForPatterns.java | 2 +- .../cost/GeneralizedCostParameters.java | 2 +- .../request/RaptorRequestTransferCache.java | 2 +- .../RaptorRoutingRequestTransitData.java | 2 +- ...aptorRoutingRequestTransitDataCreator.java | 6 +++--- .../transit/request/TripPatternForDates.java | 2 +- .../request/TripScheduleAlightSearch.java | 2 +- .../request/TripScheduleBoardSearch.java | 2 +- .../request/TripScheduleWithOffset.java | 2 +- .../OptimizeTransferService.java | 2 +- .../model/BasicStopTime.java | 2 +- .../model/MinSafeTransferTimeCalculator.java | 4 ++-- .../model/OptimizedPathTail.java | 2 +- .../model/StopPriorityCostCalculator.java | 2 +- .../model/TripStopTime.java | 2 +- .../model/TripToTripTransfer.java | 2 +- .../costfilter/MinCostPathTailFilter.java | 2 +- .../PassThroughPathTailFilter.java | 2 +- .../services/TransitPathLegSelector.java | 2 +- .../alternativelegs/AlternativeLegs.java | 2 +- .../routing/api/request/DebugRaptor.java | 2 +- .../routing/api/request/RequestModes.java | 2 +- .../routing/api/request/RouteRequest.java | 10 +++++----- .../request/framework/DurationForEnum.java | 2 +- .../LinearFunctionSerialization.java | 6 +++--- .../framework/TimeAndCostPenaltyForEnum.java | 2 +- .../api/request/framework/TimePenalty.java | 4 ++-- .../preference/AccessEgressPreferences.java | 2 +- .../preference/AccessibilityPreferences.java | 2 +- .../request/preference/BikePreferences.java | 6 +++--- .../request/preference/CarPreferences.java | 6 +++--- .../preference/ElevatorPreferences.java | 2 +- .../ItineraryFilterPreferences.java | 2 +- .../request/preference/RaptorPreferences.java | 2 +- .../routing/api/request/preference/Relax.java | 4 ++-- .../preference/RoutingPreferences.java | 2 +- .../preference/ScooterPreferences.java | 6 +++--- .../request/preference/StreetPreferences.java | 6 ++---- .../request/preference/SystemPreferences.java | 2 +- .../preference/TimeSlopeSafetyTriangle.java | 4 ++-- .../TransferOptimizationPreferences.java | 4 ++-- .../preference/TransferPreferences.java | 6 +++--- .../preference/TransitPreferences.java | 2 +- .../preference/VehicleParkingPreferences.java | 2 +- .../preference/VehicleRentalPreferences.java | 2 +- .../preference/VehicleWalkingPreferences.java | 2 +- .../request/preference/WalkPreferences.java | 4 ++-- .../preference/WheelchairPreferences.java | 2 +- .../filter/VehicleParkingFilter.java | 2 +- .../request/request/filter/SelectRequest.java | 2 +- .../request/filter/TransitFilterRequest.java | 2 +- .../request/filter/TransitGroupSelect.java | 2 +- .../request/via/PassThroughViaLocation.java | 2 +- .../api/request/via/VisitViaLocation.java | 4 ++-- .../routing/api/response/RoutingError.java | 2 +- .../routing/api/response/RoutingResponse.java | 2 +- .../api/response/TripSearchMetadata.java | 2 +- .../routing/graph/SerializedGraphObject.java | 4 ++-- .../routing/graph/index/StreetIndex.java | 2 +- .../routing/graphfinder/PatternAtStop.java | 2 +- .../StopFinderTraverseVisitor.java | 2 +- .../service/DefaultRoutingService.java | 2 +- .../routing/stoptimes/StopTimesHelper.java | 2 +- .../vehicle_parking/VehicleParking.java | 2 +- .../VehicleParkingEntrance.java | 2 +- .../vehicle_parking/VehicleParkingGroup.java | 2 +- .../vehicle_parking/VehicleParkingSpaces.java | 2 +- .../service/paging/PagingService.java | 2 +- .../model/VehicleRentalStation.java | 2 +- .../worldenvelope/model/WorldEnvelope.java | 2 +- .../standalone/config/BuildConfig.java | 2 +- .../config/framework/json/ConfigType.java | 6 +++--- .../config/framework/json/EnumMapper.java | 2 +- .../config/framework/json/NodeInfo.java | 4 ++-- .../framework/json/ParameterBuilder.java | 4 ++-- .../routerequest/RouteRequestConfig.java | 2 +- .../configure/ConstructApplication.java | 2 +- .../standalone/server/EtagRequestFilter.java | 2 +- .../standalone/server/RequestTraceFilter.java | 2 +- .../server/RequestTraceParameter.java | 2 +- .../street/model/edge/ElevatorBoardEdge.java | 1 - .../street/model/edge/ElevatorHopEdge.java | 1 - .../street/model/edge/StreetEdge.java | 4 ++-- .../street/model/edge/StreetEdgeBuilder.java | 2 +- .../model/edge/StreetElevationExtension.java | 2 +- .../model/edge/StreetTransitEntityLink.java | 1 - .../model/edge/StreetVehicleParkingLink.java | 1 - .../model/note/StreetNoteAndMatcher.java | 2 +- .../model/vertex/IntersectionVertex.java | 2 +- .../vertex/OsmBoardingLocationVertex.java | 2 +- .../street/search/state/State.java | 4 ++-- .../api/request/TripOnServiceDateRequest.java | 2 +- .../transit/model/basic/Money.java | 2 +- .../transit/model/framework/Deduplicator.java | 2 +- .../transit/model/framework/FeedScopedId.java | 4 ++-- .../transit/model/network/Route.java | 2 +- .../transit/model/network/StopPattern.java | 2 +- .../transit/model/network/TripPattern.java | 2 +- .../TransitGroupPriorityService.java | 2 +- .../transit/model/organization/Agency.java | 2 +- .../model/organization/ContactInfo.java | 2 +- .../transit/model/organization/Operator.java | 2 +- .../transit/model/site/StopLocation.java | 2 +- .../model/site/StopLocationsGroup.java | 2 +- .../model/timetable/ScheduledTripTimes.java | 6 +++--- .../timetable/ScheduledTripTimesBuilder.java | 2 +- .../transit/model/timetable/Trip.java | 4 ++-- .../timetable/TripTimesStringBuilder.java | 2 +- .../model/timetable/booking/BookingInfo.java | 2 +- .../model/timetable/booking/BookingTime.java | 2 +- .../timetable/booking/RoutingBookingInfo.java | 2 +- .../service/DefaultTransitService.java | 2 +- .../transit/service/SiteRepository.java | 4 ++-- .../transit/service/StopModelIndex.java | 2 +- .../transit/service/TimetableRepository.java | 4 ++-- .../updater/GtfsRealtimeFuzzyTripMatcher.java | 4 ++-- .../alert/GtfsRealtimeAlertsUpdater.java | 2 +- .../updater/siri/AddedTripBuilder.java | 2 +- .../updater/siri/DebugString.java | 2 +- .../updater/siri/ModifiedTripBuilder.java | 2 +- .../updater/siri/SiriFuzzyTripMatcher.java | 2 +- .../updater/siri/TimetableHelper.java | 2 +- .../GooglePubsubEstimatedTimetableSource.java | 4 ++-- .../SiriETGooglePubsubUpdaterParameters.java | 2 +- .../updater/spi/ResultLogger.java | 2 +- .../updater/spi/UpdateSuccess.java | 2 +- .../trip/GtfsRealtimeTripUpdateSource.java | 2 +- .../updater/trip/MqttGtfsRealtimeUpdater.java | 2 +- .../updater/trip/PollingTripUpdater.java | 2 +- .../updater/trip/TimetableSnapshotSource.java | 4 ++-- .../vehicle_parking/AvailabiltyUpdate.java | 2 +- .../VehicleParkingAvailabilityUpdater.java | 2 +- .../VehicleParkingUpdater.java | 2 +- ...GtfsRealtimeHttpVehiclePositionSource.java | 2 +- .../PollingVehiclePositionUpdater.java | 2 +- .../RealtimeVehiclePatternMatcher.java | 4 ++-- .../vehicle_rental/VehicleRentalUpdater.java | 10 +++++----- .../datasources/GbfsGeofencingZoneMapper.java | 2 +- .../GbfsVehicleRentalDataSource.java | 2 +- .../org/opentripplanner/DateTimeHelper.java | 2 +- .../apis/gtfs/GraphQLIntegrationTest.java | 2 +- .../mapping/TripRequestMapperTest.java | 2 +- .../plan/TripPlanTimePenaltyDtoTest.java | 2 +- .../support/ExecutionResultMapperTest.java | 2 +- .../datastore/OtpDataStoreTest.java | 2 +- .../framework/model/TimeAndCostTest.java | 2 +- .../token/TestTokenSchemaConstants.java | 2 +- .../doc/BuildConfigurationDocTest.java | 2 +- .../doc/EmissionsConfigurationDocTest.java | 2 +- .../doc/FlexConfigurationDocTest.java | 2 +- .../generate/doc/OsmMapperDocTest.java | 4 ++-- .../generate/doc/RideHailingDocTest.java | 2 +- .../generate/doc/RouteRequestDocTest.java | 2 +- .../doc/RouterConfigurationDocTest.java | 2 +- .../generate/doc/SiriAzureConfigDocTest.java | 2 +- .../generate/doc/SiriConfigDocTest.java | 2 +- .../doc/SiriGooglePubSubConfigDocTest.java | 2 +- .../generate/doc/UpdaterConfigDocTest.java | 2 +- .../generate/doc/VehicleParkingDocTest.java | 2 +- .../generate/doc/framework/AbstractTable.java | 10 +++++----- .../generate/doc/framework/DocBuilder.java | 4 ++-- .../doc/framework/DocBuilderTest.java | 2 +- .../doc/framework/ParameterDetailsList.java | 2 +- .../doc/framework/ParameterSummaryTable.java | 10 +++++----- .../generate/doc/support/ConfigTypeTable.java | 4 ++-- .../generate/doc/support/OTPFeatureTable.java | 10 +++++----- .../issue/api/DataImportIssueSummaryTest.java | 2 +- .../module/DirectTransferGeneratorTest.java | 2 +- .../ServiceCalendarDateMapperTest.java | 2 +- .../mapping/ServiceCalendarMapperTest.java | 2 +- .../CalendarServiceDataFactoryImplTest.java | 2 +- .../model/plan/PlanTestConstants.java | 4 ++-- .../model/plan/TestItineraryBuilder.java | 4 ++-- .../PagingSearchWindowAdjusterTest.java | 2 +- .../paging/cursor/PageCursorFactoryTest.java | 2 +- .../cursor/PageCursorSerializerTest.java | 2 +- .../plan/paging/cursor/PageCursorTest.java | 6 +++--- .../transfer/TransferConstraintTest.java | 2 +- .../raptor/_data/RaptorTestConstants.java | 4 ++-- .../_data/api/TestPathBuilderTestRaptor.java | 5 ++--- .../_data/stoparrival/BasicPathTestCase.java | 4 ++-- .../raptor/_data/stoparrival/Egress.java | 2 +- .../FlexAccessAndEgressPathTestCase.java | 6 +++--- .../_data/transit/TestAccessEgress.java | 2 +- .../TestConstrainedBoardingSearch.java | 2 +- .../transit/TestConstrainedTransfer.java | 2 +- .../raptor/_data/transit/TestRoute.java | 2 +- .../_data/transit/TestTransferPoint.java | 2 +- .../raptor/_data/transit/TestTripPattern.java | 2 +- .../_data/transit/TestTripSchedule.java | 6 +++--- .../raptor/api/path/PathTest.java | 4 ++-- .../raptor/moduletests/B01_AccessTest.java | 2 +- .../moduletests/F02_EgressWithRidesTest.java | 2 +- .../G01_AccessWithOpeningHoursTest.java | 2 +- .../G02_EgressWithOpeningHoursTest.java | 2 +- .../L01_TimePenaltyAccessTest.java | 2 +- .../L01_TimePenaltyEgressTest.java | 2 +- .../support/RaptorModuleTestCaseFactory.java | 2 +- .../arrivals/c1/StopArrivalFactoryC1Test.java | 4 ++-- .../arrivals/c2/StopArrivalFactoryC2Test.java | 4 ++-- .../rangeraptor/transit/EgressPathsTest.java | 2 +- .../ForwardRaptorTransitCalculatorTest.java | 2 +- .../transit/ForwardTransitCalculatorTest.java | 2 +- .../ReverseRaptorTransitCalculatorTest.java | 2 +- .../transit/TripTimesSearchTest.java | 4 ++-- .../raptor/spi/RaptorTripScheduleTest.java | 2 +- .../raptor/util/paretoset/ParetoSetTest.java | 2 +- ...RemoveBikeRentalWithMostlyWalkingTest.java | 4 ++-- ...emoveParkAndRideWithMostlyWalkingTest.java | 4 ++-- .../street/RemoveWalkOnlyFilterTest.java | 4 ++-- .../system/FlexSearchWindowFilterTest.java | 2 +- .../system/NumItinerariesFilterTest.java | 2 +- .../system/OutsideSearchWindowFilterTest.java | 2 +- .../filters/system/PagingFilterTest.java | 8 ++++---- .../mapping/PagingServiceFactoryTest.java | 4 ++-- .../RaptorPathToItineraryMapperTest.java | 2 +- .../algorithm/mapping/SnapshotTestBase.java | 2 +- .../AccessEgressPenaltyDecoratorTest.java | 2 +- ...rRoutingRequestTransitDataCreatorTest.java | 2 +- .../transit/request/TestRouteData.java | 2 +- .../MinSafeTransferTimeCalculatorTest.java | 4 ++-- .../TransferWaitTimeCostCalculatorTest.java | 2 +- .../model/TripStopTimeTest.java | 4 ++-- .../PassThroughNoTransfersTest.java | 2 +- .../PassThroughOneTransferTest.java | 2 +- .../PassThroughTwoTransfersTest.java | 2 +- .../WalkDurationForStopCombinations.java | 2 +- ...imizePathDomainServiceConstrainedTest.java | 2 +- .../OptimizePathDomainServiceTest.java | 2 +- .../services/TestTransferBuilder.java | 2 +- .../services/TransferGeneratorTest.java | 2 +- .../services/TransitPathLegSelectorTest.java | 2 +- .../algorithm/via/ViaRoutingWorkerTest.java | 2 +- .../framework/CostLinearFunctionTest.java | 2 +- .../LinearFunctionSerializationTest.java | 2 +- .../framework/TimeAndCostPenaltyTest.java | 2 +- .../request/framework/TimePenaltyTest.java | 2 +- .../paging/PS1_LegacyMetaDataTest.java | 2 +- ...FewItinerariesOnSearchWindowLimitTest.java | 2 +- .../service/paging/TestDriver.java | 4 ++-- .../service/paging/TestPagingModel.java | 4 ++-- .../config/OtpConfigLoaderTest.java | 2 +- .../framework/file/ConfigFileLoaderTest.java | 2 +- .../file/IncludeFileDirectiveTest.java | 2 +- .../timetable/ScheduledTripTimesTest.java | 2 +- .../timetable/booking/BookingTimeTest.java | 2 +- .../booking/RoutingBookingInfoTest.java | 2 +- .../transit/speed_test/ResultPrinter.java | 6 +++--- .../model/testcase/ItineraryResultMapper.java | 2 +- .../speed_test/model/testcase/Result.java | 6 +++--- .../model/testcase/TableTestReport.java | 12 +++++------ .../model/testcase/TestCaseDefinition.java | 6 +++--- .../model/testcase/io/AbstractCsvFile.java | 4 ++-- .../trip/TimetableSnapshotSourceTest.java | 2 +- .../updater/trip/TripInput.java | 2 +- .../updater/trip/TripUpdateBuilder.java | 2 +- .../utils/collection/CollectionUtils.java | 2 +- .../utils/collection/CollectionsView.java | 2 +- .../utils/collection/CompositeComparator.java | 2 +- .../utils/collection/ListSection.java | 2 +- .../utils/collection/ListUtils.java | 2 +- .../utils/collection/MapUtils.java | 2 +- .../utils/collection/SetUtils.java | 2 +- .../utils/lang/ArrayUtils.java | 2 +- .../utils/lang/BitSetUtils.java | 2 +- .../org/opentripplanner/utils/lang/Box.java | 2 +- .../utils/lang/DoubleUtils.java | 4 ++-- .../opentripplanner/utils/lang/IntBox.java | 2 +- .../opentripplanner/utils/lang/IntRange.java | 2 +- .../opentripplanner/utils/lang/IntUtils.java | 2 +- .../utils/lang/MemEfficientArrayBuilder.java | 2 +- .../utils/lang/ObjectUtils.java | 2 +- .../utils/lang/OtpNumberFormat.java | 2 +- .../opentripplanner/utils/lang/Sandbox.java | 2 +- .../utils/lang/StringUtils.java | 2 +- .../utils/logging/ProgressTracker.java | 6 +++--- .../logging/ProgressTrackerInputStream.java | 2 +- .../logging/ProgressTrackerOutputStream.java | 2 +- .../utils/logging/Throttle.java | 4 ++-- .../utils/text/CharacterEscapeFormatter.java | 2 +- .../utils/text/FileSizeToTextConverter.java | 2 +- .../opentripplanner/utils/text/HexString.java | 2 +- .../utils/text/MarkdownFormatter.java | 2 +- .../org/opentripplanner/utils/text/Table.java | 6 +++--- .../utils/text/TableBuilder.java | 2 +- .../utils/text/TableRowFormatter.java | 6 +++--- .../utils/time/CountdownTimer.java | 2 +- .../opentripplanner/utils/time/DateUtils.java | 2 +- .../utils/time/DurationUtils.java | 2 +- .../utils/time/LocalDateUtils.java | 2 +- .../utils/time/OffsetDateTimeParser.java | 2 +- .../utils/time/RelativeTime.java | 2 +- .../utils/time/ServiceDateUtils.java | 2 +- .../opentripplanner/utils/time/TimeUtils.java | 2 +- .../tostring/MultiLineToStringBuilder.java | 4 ++-- .../utils/tostring/ToStringBuilder.java | 12 +++++------ .../tostring/ValueObjectToStringBuilder.java | 8 ++++---- .../utils/collection/CollectionUtilsTest.java | 2 +- .../utils/collection/CollectionsViewTest.java | 2 +- .../collection/CompositeComparatorTest.java | 2 +- .../utils/collection/ListSectionTest.java | 2 +- .../utils/collection/ListUtilsTest.java | 6 +++--- .../utils/collection/MapUtilsTest.java | 4 ++-- .../utils/collection/SetUtilsTest.java | 2 +- .../utils/lang/ArrayUtilsTest.java | 4 ++-- .../utils/lang/BitSetUtilsTest.java | 2 +- .../opentripplanner/utils/lang/BoxTest.java | 2 +- .../utils/lang/DoubleUtilsTest.java | 14 ++++++------- .../utils/lang/IntBoxTest.java | 2 +- .../utils/lang/IntRangeTest.java | 2 +- .../utils/lang/IntUtilsTest.java | 20 +++++++++---------- .../lang/MemEfficientArrayBuilderTest.java | 2 +- .../utils/lang/ObjectUtilsTest.java | 2 +- .../utils/lang/OtpNumberFormatTest.java | 2 +- .../utils/lang/StringUtilsTest.java | 2 +- .../utils/logging/ProgressTrackerTest.java | 2 +- .../utils/logging/ThrottleTest.java | 2 +- .../text/CharacterEscapeFormatterTest.java | 2 +- .../text/FileSizeToTextConverterTest.java | 4 ++-- .../utils/text/HexStringTest.java | 2 +- .../utils/text/MarkdownFormatterTest.java | 2 +- .../opentripplanner/utils/text/TableTest.java | 8 ++++---- .../utils/time/CountdownTimerTest.java | 2 +- .../utils/time/DateUtilsTest.java | 4 ++-- .../utils/time/DurationUtilsTest.java | 12 +++++------ .../utils/time/LocalDateUtilsTest.java | 2 +- .../utils/time/OffsetDateTimeParserTest.java | 2 +- .../utils/time/ServiceDateUtilsTest.java | 4 ++-- .../utils/time/TimeUtilsTest.java | 2 +- .../opentripplanner/utils/time/ZoneIds.java | 2 +- .../MultiLineToStringBuilderTest.java | 2 +- .../utils/tostring/ToStringBuilderTest.java | 6 +++--- .../ValueObjectToStringBuilderTest.java | 2 +- 569 files changed, 774 insertions(+), 784 deletions(-) diff --git a/application/pom.xml b/application/pom.xml index 60765797344..f7ff90f8db0 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -20,7 +20,7 @@ ${project.groupId} - otp-framework + otp-utils ${project.version} diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexStopTimesForTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexStopTimesForTest.java index acf0d3b2699..50c2dd45340 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexStopTimesForTest.java +++ b/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 { diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java index cdb8bb8ff4e..159e25ff113 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java +++ b/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; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java index 4c77ecc6134..38f3a1fc2a8 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java +++ b/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 diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java index d235dd5a950..cfcbc123642 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java +++ b/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 { diff --git a/application/src/ext-test/java/org/opentripplanner/ext/realtimeresolver/RealtimeResolverTest.java b/application/src/ext-test/java/org/opentripplanner/ext/realtimeresolver/RealtimeResolverTest.java index 6150cfc6c18..80e5d1b153b 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/realtimeresolver/RealtimeResolverTest.java +++ b/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; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesConfigDocTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesConfigDocTest.java index 51e1738ff6c..3a057182a67 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesConfigDocTest.java +++ b/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; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java index 6723034f2a7..0db19baf6e5 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java +++ b/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; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/vehiclerentalservicedirectory/generatedoc/VehicleRentalServiceDirectoryConfigDocTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vehiclerentalservicedirectory/generatedoc/VehicleRentalServiceDirectoryConfigDocTest.java index 2afcd95949c..06d75073029 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/vehiclerentalservicedirectory/generatedoc/VehicleRentalServiceDirectoryConfigDocTest.java +++ b/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; diff --git a/application/src/ext/java/org/opentripplanner/ext/dataoverlay/api/DataOverlayParameters.java b/application/src/ext/java/org/opentripplanner/ext/dataoverlay/api/DataOverlayParameters.java index 5e18a914d34..42a0209ba94 100644 --- a/application/src/ext/java/org/opentripplanner/ext/dataoverlay/api/DataOverlayParameters.java +++ b/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 diff --git a/application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/DataOverlayConfig.java b/application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/DataOverlayConfig.java index c650bdf8a3c..858ac97d8ce 100644 --- a/application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/DataOverlayConfig.java +++ b/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 diff --git a/application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/DataOverlayParameterBindings.java b/application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/DataOverlayParameterBindings.java index c86cf24bb79..7b3d1f19bac 100644 --- a/application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/DataOverlayParameterBindings.java +++ b/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 { diff --git a/application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/IndexVariable.java b/application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/IndexVariable.java index 56b55b3a6b0..720ded65f89 100644 --- a/application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/IndexVariable.java +++ b/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 diff --git a/application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/ParameterBinding.java b/application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/ParameterBinding.java index 94a992eb552..07a29d4c4c1 100644 --- a/application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/ParameterBinding.java +++ b/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 diff --git a/application/src/ext/java/org/opentripplanner/ext/dataoverlay/routing/Parameter.java b/application/src/ext/java/org/opentripplanner/ext/dataoverlay/routing/Parameter.java index 7b6078bb04f..542f7ee26dc 100644 --- a/application/src/ext/java/org/opentripplanner/ext/dataoverlay/routing/Parameter.java +++ b/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 { diff --git a/application/src/ext/java/org/opentripplanner/ext/emissions/Co2EmissionsDataReader.java b/application/src/ext/java/org/opentripplanner/ext/emissions/Co2EmissionsDataReader.java index 597a7d89380..f3988265085 100644 --- a/application/src/ext/java/org/opentripplanner/ext/emissions/Co2EmissionsDataReader.java +++ b/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; diff --git a/application/src/ext/java/org/opentripplanner/ext/emissions/DecorateWithEmission.java b/application/src/ext/java/org/opentripplanner/ext/emissions/DecorateWithEmission.java index 1f6e79fc4df..9657e053cb9 100644 --- a/application/src/ext/java/org/opentripplanner/ext/emissions/DecorateWithEmission.java +++ b/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. diff --git a/application/src/ext/java/org/opentripplanner/ext/emissions/DefaultEmissionsService.java b/application/src/ext/java/org/opentripplanner/ext/emissions/DefaultEmissionsService.java index 5df2ca17f26..4aaefd5a7a3 100644 --- a/application/src/ext/java/org/opentripplanner/ext/emissions/DefaultEmissionsService.java +++ b/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 { diff --git a/application/src/ext/java/org/opentripplanner/ext/emissions/EmissionsService.java b/application/src/ext/java/org/opentripplanner/ext/emissions/EmissionsService.java index 6f69ac60d06..18712bb590c 100644 --- a/application/src/ext/java/org/opentripplanner/ext/emissions/EmissionsService.java +++ b/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. diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/FaresToItineraryMapper.java b/application/src/ext/java/org/opentripplanner/ext/fares/FaresToItineraryMapper.java index c545cbbb858..b936e458c00 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/FaresToItineraryMapper.java +++ b/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. diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java b/application/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java index d3608ccf8d9..85aa1a25004 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java +++ b/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. diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/model/Distance.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/Distance.java index e29282fb4b8..f30712d4cad 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/model/Distance.java +++ b/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 { diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareRule.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareRule.java index 3e70ef1cf2e..3b416ec2a6d 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareRule.java +++ b/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 { diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapper.java b/application/src/ext/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapper.java index 796971a43b5..85a4f749b16 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapper.java +++ b/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; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java b/application/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java index f464f1e1907..9ff2b3f67be 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java +++ b/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 { diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/FlexPathDurations.java b/application/src/ext/java/org/opentripplanner/ext/flex/FlexPathDurations.java index a77d72185d0..258435a6d6b 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/FlexPathDurations.java +++ b/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 diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java b/application/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java index 84098db9dc9..103a27e7554 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java +++ b/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 { diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java b/application/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java index c4167f2f9e1..696c5df4c2a 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java +++ b/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; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java b/application/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java index cf6c229c46f..25c4abee12e 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java +++ b/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 diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java b/application/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java index 4a494286313..86934a22310 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java +++ b/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. diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java b/application/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java index 9ce9cf8a4c4..8dbcf4d785e 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java +++ b/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, diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java b/application/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java index a30ebacc497..553c8aee6c0 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java +++ b/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. diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/trip/StopTimeWindow.java b/application/src/ext/java/org/opentripplanner/ext/flex/trip/StopTimeWindow.java index 5b7ebbbc575..24b33360fce 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/trip/StopTimeWindow.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/trip/StopTimeWindow.java @@ -3,10 +3,10 @@ import static org.opentripplanner.model.StopTime.MISSING_VALUE; import java.io.Serializable; -import org.opentripplanner.framework.lang.IntRange; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; import org.opentripplanner.transit.model.site.StopLocation; +import org.opentripplanner.utils.lang.IntRange; class StopTimeWindow implements Serializable { diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java b/application/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java index 30c79ac0d1a..b0286541bd2 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java @@ -12,9 +12,6 @@ import java.util.stream.Collectors; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.TimePenaltyCalculator; -import org.opentripplanner.framework.lang.DoubleUtils; -import org.opentripplanner.framework.lang.IntRange; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; import org.opentripplanner.routing.api.request.framework.TimePenalty; @@ -23,6 +20,9 @@ import org.opentripplanner.transit.model.site.GroupStop; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.booking.BookingInfo; +import org.opentripplanner.utils.lang.DoubleUtils; +import org.opentripplanner.utils.lang.IntRange; +import org.opentripplanner.utils.time.DurationUtils; /** * This type of FlexTrip is used when a taxi-type service is modeled, which operates in any number diff --git a/application/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java b/application/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java index 72ac22b027a..f742ddb131a 100644 --- a/application/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java +++ b/application/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java @@ -42,7 +42,6 @@ import org.apache.lucene.search.suggest.document.SuggestIndexSearcher; import org.apache.lucene.store.ByteBuffersDirectory; import org.opentripplanner.ext.stopconsolidation.StopConsolidationService; -import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.site.StopLocation; @@ -50,6 +49,7 @@ import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.TimetableRepository; import org.opentripplanner.transit.service.TransitService; +import org.opentripplanner.utils.collection.ListUtils; public class LuceneIndex implements Serializable { diff --git a/application/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java b/application/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java index 98a617b809f..3a6546cfe1e 100644 --- a/application/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java @@ -13,7 +13,6 @@ import javax.annotation.Nullable; import org.opentripplanner.ext.stopconsolidation.StopConsolidationService; import org.opentripplanner.ext.stopconsolidation.model.StopReplacement; -import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.model.FeedInfo; @@ -24,6 +23,7 @@ import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.site.StopLocationsGroup; import org.opentripplanner.transit.service.TransitService; +import org.opentripplanner.utils.collection.ListUtils; /** * Mappers for generating {@link LuceneStopCluster} from the transit model. diff --git a/application/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/raptor/RaptorDebugModel.java b/application/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/raptor/RaptorDebugModel.java index 41d6ed6be1a..71fb682581c 100644 --- a/application/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/raptor/RaptorDebugModel.java +++ b/application/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/raptor/RaptorDebugModel.java @@ -7,9 +7,9 @@ import java.util.Set; import javax.annotation.Nullable; import org.opentripplanner.ext.interactivelauncher.api.LauncherRequestDecorator; -import org.opentripplanner.framework.lang.StringUtils; import org.opentripplanner.routing.api.request.DebugEventType; import org.opentripplanner.routing.api.request.RouteRequest; +import org.opentripplanner.utils.lang.StringUtils; public class RaptorDebugModel implements LauncherRequestDecorator { diff --git a/application/src/ext/java/org/opentripplanner/ext/reportapi/model/CsvReportBuilder.java b/application/src/ext/java/org/opentripplanner/ext/reportapi/model/CsvReportBuilder.java index f2513159fa6..087ed028a23 100644 --- a/application/src/ext/java/org/opentripplanner/ext/reportapi/model/CsvReportBuilder.java +++ b/application/src/ext/java/org/opentripplanner/ext/reportapi/model/CsvReportBuilder.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.reportapi.model; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.time.TimeUtils; +import org.opentripplanner.utils.time.DurationUtils; +import org.opentripplanner.utils.time.TimeUtils; /** * A very simple CSV builder to create CSV reports. diff --git a/application/src/ext/java/org/opentripplanner/ext/reportapi/model/TransfersReport.java b/application/src/ext/java/org/opentripplanner/ext/reportapi/model/TransfersReport.java index e53cd6c3c58..cff5d2f791e 100644 --- a/application/src/ext/java/org/opentripplanner/ext/reportapi/model/TransfersReport.java +++ b/application/src/ext/java/org/opentripplanner/ext/reportapi/model/TransfersReport.java @@ -1,6 +1,6 @@ package org.opentripplanner.ext.reportapi.model; -import static org.opentripplanner.framework.time.DurationUtils.durationToStr; +import static org.opentripplanner.utils.time.DurationUtils.durationToStr; import java.util.List; import java.util.Optional; diff --git a/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/LocalDateMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/LocalDateMapper.java index 940bcc13d54..09ff79ef9fd 100644 --- a/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/LocalDateMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/restapi/mapping/LocalDateMapper.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.restapi.mapping; import java.time.LocalDate; -import org.opentripplanner.framework.time.ServiceDateUtils; +import org.opentripplanner.utils.time.ServiceDateUtils; public class LocalDateMapper { diff --git a/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiBookingInfo.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiBookingInfo.java index c89d6429caa..1fd4566a9b8 100644 --- a/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiBookingInfo.java +++ b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiBookingInfo.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.time.Duration; import java.util.Set; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Info about how a trip might be booked at a particular stop. All of this is pass-through diff --git a/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiBookingTime.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiBookingTime.java index 08eee69a3cf..f2a8d5767ff 100644 --- a/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiBookingTime.java +++ b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiBookingTime.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.restapi.model; import java.io.Serializable; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Represents either an earliest or latest time a trip can be booked relative to the departure day diff --git a/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiContactInfo.java b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiContactInfo.java index b7c2ec90166..cc7e6d069f1 100644 --- a/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiContactInfo.java +++ b/application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiContactInfo.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.restapi.model; import java.io.Serializable; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * How to contact the agency to book a trip or requests information. diff --git a/application/src/ext/java/org/opentripplanner/ext/restapi/resources/IndexAPI.java b/application/src/ext/java/org/opentripplanner/ext/restapi/resources/IndexAPI.java index cab2be13ad0..ccf18217148 100644 --- a/application/src/ext/java/org/opentripplanner/ext/restapi/resources/IndexAPI.java +++ b/application/src/ext/java/org/opentripplanner/ext/restapi/resources/IndexAPI.java @@ -51,7 +51,6 @@ import org.opentripplanner.ext.restapi.model.ApiTripShort; import org.opentripplanner.ext.restapi.model.ApiTripTimeShort; import org.opentripplanner.framework.geometry.EncodedPolyline; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.model.StopTimesInPattern; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.routing.graphfinder.DirectGraphFinder; @@ -64,6 +63,7 @@ import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.service.TransitService; +import org.opentripplanner.utils.time.ServiceDateUtils; // TODO move to org.opentripplanner.api.resource, this is a Jersey resource class diff --git a/application/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java b/application/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java index 51b2fae86b5..22aa194d4bb 100644 --- a/application/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java @@ -3,7 +3,6 @@ import jakarta.validation.constraints.NotNull; import java.util.function.Consumer; import org.opentripplanner.ext.restapi.mapping.LegacyVehicleRoutingOptimizeType; -import org.opentripplanner.framework.lang.ObjectUtils; import org.opentripplanner.routing.algorithm.filterchain.api.TransitGeneralizedCostFilterParams; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.routing.api.request.preference.ItineraryFilterPreferences; @@ -11,6 +10,7 @@ import org.opentripplanner.routing.api.request.preference.RoutingPreferences; import org.opentripplanner.routing.api.request.preference.VehicleParkingPreferences; import org.opentripplanner.routing.api.request.preference.VehicleRentalPreferences; +import org.opentripplanner.utils.lang.ObjectUtils; class RequestToPreferencesMapper { diff --git a/application/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java b/application/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java index 3ae029fdb2d..9a0f030a807 100644 --- a/application/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java +++ b/application/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java @@ -23,8 +23,6 @@ import org.opentripplanner.ext.dataoverlay.api.DataOverlayParameters; import org.opentripplanner.ext.restapi.mapping.LegacyVehicleRoutingOptimizeType; import org.opentripplanner.framework.application.OTPFeature; -import org.opentripplanner.framework.lang.StringUtils; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.framework.time.ZoneIdFallback; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.preference.ItineraryFilterDebugProfile; @@ -35,6 +33,8 @@ import org.opentripplanner.standalone.config.framework.json.NodeAdapter; import org.opentripplanner.standalone.config.routerequest.RouteRequestConfig; import org.opentripplanner.transit.model.basic.MainAndSubMode; +import org.opentripplanner.utils.lang.StringUtils; +import org.opentripplanner.utils.time.DurationUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java index cf555d6412f..af2ec7212ec 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java @@ -8,12 +8,12 @@ import java.util.List; import java.util.Locale; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.framework.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.routing.stoptimes.ArrivalDeparture; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.service.TransitService; +import org.opentripplanner.utils.collection.ListUtils; public class DigitransitRealtimeStopPropertyMapper extends PropertyMapper { diff --git a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdater.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdater.java index 9216eb79995..cd6a39fecd3 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdater.java +++ b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdater.java @@ -7,12 +7,12 @@ import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.framework.json.ObjectMappers; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.vehicle_parking.VehicleParking; import org.opentripplanner.routing.vehicle_parking.VehicleParkingSpaces; import org.opentripplanner.routing.vehicle_parking.VehicleParkingState; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.updater.spi.GenericJsonDataSource; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Vehicle parking updater for Bikeep's API. diff --git a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/parkapi/ParkAPIUpdater.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/parkapi/ParkAPIUpdater.java index 59a19b1cce7..c7bd6631a48 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/parkapi/ParkAPIUpdater.java +++ b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/parkapi/ParkAPIUpdater.java @@ -12,7 +12,6 @@ import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.framework.i18n.TranslatedString; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.calendar.openinghours.OHCalendar; import org.opentripplanner.model.calendar.openinghours.OpeningHoursCalendarService; import org.opentripplanner.osm.OsmOpeningHoursParser; @@ -21,6 +20,7 @@ import org.opentripplanner.routing.vehicle_parking.VehicleParkingState; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.updater.spi.GenericJsonDataSource; +import org.opentripplanner.utils.tostring.ToStringBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/sirifm/SiriFmDatasource.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/sirifm/SiriFmDatasource.java index abfdf4d29be..e05cfdb42ad 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/sirifm/SiriFmDatasource.java +++ b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/sirifm/SiriFmDatasource.java @@ -8,11 +8,11 @@ import org.entur.siri21.util.SiriXml; import org.opentripplanner.framework.io.OtpHttpClient; import org.opentripplanner.framework.io.OtpHttpClientFactory; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.updater.spi.DataSource; import org.opentripplanner.updater.spi.HttpHeaders; import org.opentripplanner.updater.vehicle_parking.AvailabiltyUpdate; +import org.opentripplanner.utils.tostring.ToStringBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import uk.org.siri.siri21.FacilityConditionStructure; diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java b/application/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java index 25953652365..8427777bd38 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java @@ -22,7 +22,7 @@ import org.opentripplanner.framework.json.ObjectMappers; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.framework.model.Grams; -import org.opentripplanner.framework.time.OffsetDateTimeParser; +import org.opentripplanner.utils.time.OffsetDateTimeParser; public class GraphQLScalars { diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PatternImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PatternImpl.java index 88db00c3c4e..fbab1e95400 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PatternImpl.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PatternImpl.java @@ -18,7 +18,6 @@ import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.apis.support.SemanticHash; import org.opentripplanner.framework.graphql.GraphQLUtils; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.routing.alertpatch.EntitySelector; import org.opentripplanner.routing.alertpatch.TransitAlert; import org.opentripplanner.routing.services.TransitAlertService; @@ -31,6 +30,7 @@ import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.transit.service.TransitService; +import org.opentripplanner.utils.time.ServiceDateUtils; public class PatternImpl implements GraphQLDataFetchers.GraphQLPattern { diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java index 95984ba6dd0..9e9d78445f3 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java @@ -38,7 +38,6 @@ import org.opentripplanner.ext.fares.impl.GtfsFaresService; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.framework.application.OTPFeature; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.gtfs.mapping.DirectionMapper; import org.opentripplanner.model.TripTimeOnDate; @@ -74,6 +73,7 @@ import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.service.TransitService; import org.opentripplanner.updater.GtfsRealtimeFuzzyTripMatcher; +import org.opentripplanner.utils.time.ServiceDateUtils; public class QueryTypeImpl implements GraphQLDataFetchers.GraphQLQueryType { diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopImpl.java index 8d9c11bb7d4..2d17326a0ef 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopImpl.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StopImpl.java @@ -20,7 +20,6 @@ import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.apis.gtfs.support.filter.PatternByDateFilterUtil; import org.opentripplanner.apis.gtfs.support.time.LocalDateRangeUtil; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.model.StopTimesInPattern; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.routing.alertpatch.EntitySelector; @@ -37,6 +36,7 @@ import org.opentripplanner.transit.model.site.Station; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.service.TransitService; +import org.opentripplanner.utils.time.ServiceDateUtils; public class StopImpl implements GraphQLDataFetchers.GraphQLStop { diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripImpl.java index 21bff637976..956b35309e2 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripImpl.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripImpl.java @@ -23,7 +23,6 @@ import org.opentripplanner.apis.gtfs.mapping.BikesAllowedMapper; import org.opentripplanner.apis.gtfs.model.TripOccupancy; import org.opentripplanner.apis.support.SemanticHash; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.model.Timetable; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.routing.alertpatch.EntitySelector; @@ -39,6 +38,7 @@ import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.transit.service.TransitService; +import org.opentripplanner.utils.time.ServiceDateUtils; public class TripImpl implements GraphQLDataFetchers.GraphQLTrip { diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/BicyclePreferencesMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/BicyclePreferencesMapper.java index cd4d508282e..263f6ee33ee 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/BicyclePreferencesMapper.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/BicyclePreferencesMapper.java @@ -8,11 +8,11 @@ import graphql.schema.DataFetchingEnvironment; import java.util.Set; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.routing.api.request.preference.BikePreferences; import org.opentripplanner.routing.api.request.preference.VehicleParkingPreferences; import org.opentripplanner.routing.api.request.preference.VehicleRentalPreferences; import org.opentripplanner.routing.api.request.preference.VehicleWalkingPreferences; +import org.opentripplanner.utils.time.DurationUtils; public class BicyclePreferencesMapper { diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java index 22834b200f6..95752548ca8 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java @@ -12,12 +12,12 @@ import org.opentripplanner.apis.gtfs.GraphQLRequestContext; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.framework.graphql.GraphQLUtils; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.preference.ItineraryFilterPreferences; import org.opentripplanner.routing.api.request.preference.RoutingPreferences; import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.utils.time.DurationUtils; public class RouteRequestMapper { diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransitPreferencesMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransitPreferencesMapper.java index f9ef3d2af55..4ac55add5a9 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransitPreferencesMapper.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransitPreferencesMapper.java @@ -7,10 +7,10 @@ import java.util.stream.Collectors; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.apis.gtfs.mapping.TransitModeMapper; -import org.opentripplanner.framework.collection.CollectionUtils; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.routing.api.request.preference.TransferPreferences; import org.opentripplanner.routing.api.request.preference.TransitPreferences; +import org.opentripplanner.utils.collection.CollectionUtils; +import org.opentripplanner.utils.time.DurationUtils; public class TransitPreferencesMapper { diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java b/application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java index f4241fcbc61..e7f3fc7b8e0 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java @@ -23,9 +23,9 @@ import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.framework.application.OTPRequestTimeoutException; import org.opentripplanner.framework.concurrent.OtpRequestThreadFactory; -import org.opentripplanner.framework.lang.ObjectUtils; import org.opentripplanner.standalone.api.OtpServerRequestContext; import org.opentripplanner.transit.model.framework.EntityNotFoundException; +import org.opentripplanner.utils.lang.ObjectUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TransitIdMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TransitIdMapper.java index 1231ebd73b6..4bb1bb556e1 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TransitIdMapper.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TransitIdMapper.java @@ -5,9 +5,9 @@ import java.util.Map; import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.opentripplanner.framework.lang.StringUtils; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.utils.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/PenaltyForStreetModeType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/PenaltyForStreetModeType.java index b899ada3599..c553fccf667 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/PenaltyForStreetModeType.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/PenaltyForStreetModeType.java @@ -19,10 +19,10 @@ import org.opentripplanner.apis.transmodel.model.EnumTypes; import org.opentripplanner.apis.transmodel.model.scalars.DoubleFunction; import org.opentripplanner.apis.transmodel.support.GqlUtil; -import org.opentripplanner.framework.lang.ObjectUtils; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.routing.api.request.framework.TimeAndCostPenalty; import org.opentripplanner.routing.api.request.framework.TimeAndCostPenaltyForEnum; +import org.opentripplanner.utils.lang.ObjectUtils; /** * Access and egress penalty: diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/StreetModeDurationInputType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/StreetModeDurationInputType.java index 2fba22c78b7..9c92d7253d5 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/StreetModeDurationInputType.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/model/framework/StreetModeDurationInputType.java @@ -17,9 +17,9 @@ import java.util.Objects; import org.opentripplanner.apis.transmodel.model.EnumTypes; import org.opentripplanner.apis.transmodel.support.GqlUtil; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.routing.api.request.framework.DurationForEnum; +import org.opentripplanner.utils.time.DurationUtils; public class StreetModeDurationInputType { diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostType.java index 41435c83a2f..9272bd86757 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostType.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostType.java @@ -10,8 +10,8 @@ import java.util.Map; import org.opentripplanner.framework.graphql.scalar.CostScalarFactory; import org.opentripplanner.framework.model.Cost; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; +import org.opentripplanner.utils.time.DurationUtils; public class RelaxCostType { diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternTimePenaltyType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternTimePenaltyType.java index 744113929c7..2ad88762408 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternTimePenaltyType.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternTimePenaltyType.java @@ -4,7 +4,7 @@ import graphql.schema.DataFetchingEnvironment; import graphql.schema.GraphQLFieldDefinition; import graphql.schema.GraphQLObjectType; -import org.opentripplanner.framework.time.DurationUtils; +import org.opentripplanner.utils.time.DurationUtils; public class TripPatternTimePenaltyType { diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/DateTimeScalarFactory.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/DateTimeScalarFactory.java index f539715206e..19681987199 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/DateTimeScalarFactory.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/DateTimeScalarFactory.java @@ -12,7 +12,7 @@ import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; import java.time.temporal.TemporalAccessor; -import org.opentripplanner.framework.time.OffsetDateTimeParser; +import org.opentripplanner.utils.time.OffsetDateTimeParser; public final class DateTimeScalarFactory { diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnUnprocessableRequestExecutionStrategy.java b/application/src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnUnprocessableRequestExecutionStrategy.java index c395d359131..f47b2404bb2 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnUnprocessableRequestExecutionStrategy.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnUnprocessableRequestExecutionStrategy.java @@ -8,7 +8,7 @@ import org.opentripplanner.apis.support.graphql.LoggingDataFetcherExceptionHandler; import org.opentripplanner.apis.transmodel.ResponseTooLargeException; import org.opentripplanner.framework.application.OTPRequestTimeoutException; -import org.opentripplanner.framework.logging.ProgressTracker; +import org.opentripplanner.utils.logging.ProgressTracker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java b/application/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java index 1fc87176af8..3c8423c5270 100644 --- a/application/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java +++ b/application/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java @@ -11,7 +11,6 @@ import org.opentripplanner.apis.vectortiles.model.VectorSourceLayer; import org.opentripplanner.apis.vectortiles.model.ZoomDependentNumber; import org.opentripplanner.apis.vectortiles.model.ZoomDependentNumber.ZoomStop; -import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.service.vehiclerental.street.StreetVehicleRentalLink; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.edge.AreaEdge; @@ -28,6 +27,7 @@ import org.opentripplanner.street.model.edge.TemporaryFreeEdge; import org.opentripplanner.street.model.edge.TemporaryPartialStreetEdge; import org.opentripplanner.street.model.vertex.VehicleParkingEntranceVertex; +import org.opentripplanner.utils.collection.ListUtils; /** * A Mapbox/Mapblibre style specification for rendering debug information about transit and diff --git a/application/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java b/application/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java index 93b7ea91e7c..6f81e7fd998 100644 --- a/application/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java +++ b/application/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java @@ -9,11 +9,11 @@ import java.util.Objects; import java.util.stream.Stream; import org.opentripplanner.apis.vectortiles.model.ZoomDependentNumber.ZoomStop; -import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.framework.json.ObjectMappers; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.vertex.Vertex; +import org.opentripplanner.utils.collection.ListUtils; /** * Builds a Maplibre/Mapbox vector tile diff --git a/application/src/main/java/org/opentripplanner/apis/vectortiles/model/ZoomDependentNumber.java b/application/src/main/java/org/opentripplanner/apis/vectortiles/model/ZoomDependentNumber.java index 4d1d83ee8a9..cc655ba2038 100644 --- a/application/src/main/java/org/opentripplanner/apis/vectortiles/model/ZoomDependentNumber.java +++ b/application/src/main/java/org/opentripplanner/apis/vectortiles/model/ZoomDependentNumber.java @@ -3,10 +3,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import java.util.ArrayList; -import java.util.LinkedHashMap; import java.util.List; -import java.util.stream.Stream; -import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.framework.json.ObjectMappers; /** diff --git a/application/src/main/java/org/opentripplanner/astar/AStar.java b/application/src/main/java/org/opentripplanner/astar/AStar.java index 9c14669a159..86d48a3cbd8 100644 --- a/application/src/main/java/org/opentripplanner/astar/AStar.java +++ b/application/src/main/java/org/opentripplanner/astar/AStar.java @@ -19,7 +19,7 @@ import org.opentripplanner.astar.spi.SkipEdgeStrategy; import org.opentripplanner.astar.spi.TraverseVisitor; import org.opentripplanner.framework.application.OTPRequestTimeoutException; -import org.opentripplanner.framework.time.DateUtils; +import org.opentripplanner.utils.time.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/datastore/api/DataSource.java b/application/src/main/java/org/opentripplanner/datastore/api/DataSource.java index e1eafcbdb2a..ee95f50680e 100644 --- a/application/src/main/java/org/opentripplanner/datastore/api/DataSource.java +++ b/application/src/main/java/org/opentripplanner/datastore/api/DataSource.java @@ -6,7 +6,7 @@ import java.net.URI; import java.text.SimpleDateFormat; import org.opentripplanner.datastore.OtpDataStore; -import org.opentripplanner.framework.text.FileSizeToTextConverter; +import org.opentripplanner.utils.text.FileSizeToTextConverter; /** * A data source is generalized type to represent an file, database blob or unit that OTP read or diff --git a/application/src/main/java/org/opentripplanner/datastore/https/HttpsDataSourceMetadata.java b/application/src/main/java/org/opentripplanner/datastore/https/HttpsDataSourceMetadata.java index 9011f99d5ce..8a84b0210b1 100644 --- a/application/src/main/java/org/opentripplanner/datastore/https/HttpsDataSourceMetadata.java +++ b/application/src/main/java/org/opentripplanner/datastore/https/HttpsDataSourceMetadata.java @@ -9,7 +9,7 @@ import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HttpHeaders; import org.opentripplanner.datastore.api.DataSource; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * HTTPS data source metadata returned by the HTTP server (HTTP headers). diff --git a/application/src/main/java/org/opentripplanner/framework/application/LogMDCSupport.java b/application/src/main/java/org/opentripplanner/framework/application/LogMDCSupport.java index 6dccdcd8152..909363badd3 100644 --- a/application/src/main/java/org/opentripplanner/framework/application/LogMDCSupport.java +++ b/application/src/main/java/org/opentripplanner/framework/application/LogMDCSupport.java @@ -2,7 +2,7 @@ import java.util.Map; import javax.annotation.Nullable; -import org.opentripplanner.framework.lang.StringUtils; +import org.opentripplanner.utils.lang.StringUtils; import org.slf4j.MDC; /** diff --git a/application/src/main/java/org/opentripplanner/framework/geometry/CompactElevationProfile.java b/application/src/main/java/org/opentripplanner/framework/geometry/CompactElevationProfile.java index bdab5f492e3..105c79973cd 100644 --- a/application/src/main/java/org/opentripplanner/framework/geometry/CompactElevationProfile.java +++ b/application/src/main/java/org/opentripplanner/framework/geometry/CompactElevationProfile.java @@ -4,7 +4,7 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.CoordinateSequence; import org.locationtech.jts.geom.impl.PackedCoordinateSequence; -import org.opentripplanner.framework.lang.IntUtils; +import org.opentripplanner.utils.lang.IntUtils; /** * Compact elevation profile. To optimize storage, we use the following tricks: diff --git a/application/src/main/java/org/opentripplanner/framework/geometry/CompactLineStringUtils.java b/application/src/main/java/org/opentripplanner/framework/geometry/CompactLineStringUtils.java index d464d96fcee..19bf9824726 100644 --- a/application/src/main/java/org/opentripplanner/framework/geometry/CompactLineStringUtils.java +++ b/application/src/main/java/org/opentripplanner/framework/geometry/CompactLineStringUtils.java @@ -2,7 +2,7 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.framework.lang.IntUtils; +import org.opentripplanner.utils.lang.IntUtils; /** * Compact line string. To optimize storage, we use the following tricks: diff --git a/application/src/main/java/org/opentripplanner/framework/geometry/HashGridSpatialIndex.java b/application/src/main/java/org/opentripplanner/framework/geometry/HashGridSpatialIndex.java index d4082f9e22d..edda3fe4086 100644 --- a/application/src/main/java/org/opentripplanner/framework/geometry/HashGridSpatialIndex.java +++ b/application/src/main/java/org/opentripplanner/framework/geometry/HashGridSpatialIndex.java @@ -14,7 +14,7 @@ import org.locationtech.jts.geom.LineString; import org.locationtech.jts.index.ItemVisitor; import org.locationtech.jts.index.SpatialIndex; -import org.opentripplanner.framework.lang.IntBox; +import org.opentripplanner.utils.lang.IntBox; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/framework/geometry/WgsCoordinate.java b/application/src/main/java/org/opentripplanner/framework/geometry/WgsCoordinate.java index 6c3dbf0f9d3..e6b88ad0223 100644 --- a/application/src/main/java/org/opentripplanner/framework/geometry/WgsCoordinate.java +++ b/application/src/main/java/org/opentripplanner/framework/geometry/WgsCoordinate.java @@ -5,8 +5,8 @@ import java.util.Objects; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Point; -import org.opentripplanner.framework.lang.DoubleUtils; -import org.opentripplanner.framework.tostring.ValueObjectToStringBuilder; +import org.opentripplanner.utils.lang.DoubleUtils; +import org.opentripplanner.utils.tostring.ValueObjectToStringBuilder; /** * This class represent a OTP coordinate. diff --git a/application/src/main/java/org/opentripplanner/framework/graphql/scalar/CostScalarFactory.java b/application/src/main/java/org/opentripplanner/framework/graphql/scalar/CostScalarFactory.java index 415118013f3..fc109444786 100644 --- a/application/src/main/java/org/opentripplanner/framework/graphql/scalar/CostScalarFactory.java +++ b/application/src/main/java/org/opentripplanner/framework/graphql/scalar/CostScalarFactory.java @@ -11,7 +11,7 @@ import java.util.Locale; import java.util.NoSuchElementException; import org.opentripplanner.framework.model.Cost; -import org.opentripplanner.framework.time.DurationUtils; +import org.opentripplanner.utils.time.DurationUtils; public class CostScalarFactory { diff --git a/application/src/main/java/org/opentripplanner/framework/graphql/scalar/DurationScalarFactory.java b/application/src/main/java/org/opentripplanner/framework/graphql/scalar/DurationScalarFactory.java index b685ecc597e..5a61816ea06 100644 --- a/application/src/main/java/org/opentripplanner/framework/graphql/scalar/DurationScalarFactory.java +++ b/application/src/main/java/org/opentripplanner/framework/graphql/scalar/DurationScalarFactory.java @@ -8,7 +8,7 @@ import graphql.schema.GraphQLScalarType; import java.time.Duration; import java.time.format.DateTimeParseException; -import org.opentripplanner.framework.time.DurationUtils; +import org.opentripplanner.utils.time.DurationUtils; public class DurationScalarFactory { diff --git a/application/src/main/java/org/opentripplanner/framework/model/Cost.java b/application/src/main/java/org/opentripplanner/framework/model/Cost.java index dbd96b81180..47ab4875f5b 100644 --- a/application/src/main/java/org/opentripplanner/framework/model/Cost.java +++ b/application/src/main/java/org/opentripplanner/framework/model/Cost.java @@ -2,8 +2,8 @@ import java.io.Serializable; import java.time.Duration; -import org.opentripplanner.framework.lang.IntUtils; -import org.opentripplanner.framework.lang.OtpNumberFormat; +import org.opentripplanner.utils.lang.IntUtils; +import org.opentripplanner.utils.lang.OtpNumberFormat; /** * A type safe representation of a cost, like generalized-cost. A cost unit is equivalent of riding diff --git a/application/src/main/java/org/opentripplanner/framework/model/TimeAndCost.java b/application/src/main/java/org/opentripplanner/framework/model/TimeAndCost.java index e9376dad622..77c568d0b55 100644 --- a/application/src/main/java/org/opentripplanner/framework/model/TimeAndCost.java +++ b/application/src/main/java/org/opentripplanner/framework/model/TimeAndCost.java @@ -1,7 +1,7 @@ package org.opentripplanner.framework.model; import java.time.Duration; -import org.opentripplanner.framework.time.DurationUtils; +import org.opentripplanner.utils.time.DurationUtils; /** * Tuple of time(duration) and cost. diff --git a/application/src/main/java/org/opentripplanner/framework/model/Units.java b/application/src/main/java/org/opentripplanner/framework/model/Units.java index 736846c869f..ab3d77e5703 100644 --- a/application/src/main/java/org/opentripplanner/framework/model/Units.java +++ b/application/src/main/java/org/opentripplanner/framework/model/Units.java @@ -3,8 +3,8 @@ import static java.lang.Math.abs; import java.util.Locale; -import org.opentripplanner.framework.lang.DoubleUtils; -import org.opentripplanner.framework.lang.IntUtils; +import org.opentripplanner.utils.lang.DoubleUtils; +import org.opentripplanner.utils.lang.IntUtils; /** * This utility can be used to perform sanity checks on common number types. It will also normalize diff --git a/application/src/main/java/org/opentripplanner/framework/time/ZoneIdFallback.java b/application/src/main/java/org/opentripplanner/framework/time/ZoneIdFallback.java index 2d43216e4b2..b645dbe88f4 100644 --- a/application/src/main/java/org/opentripplanner/framework/time/ZoneIdFallback.java +++ b/application/src/main/java/org/opentripplanner/framework/time/ZoneIdFallback.java @@ -2,7 +2,7 @@ import java.time.ZoneId; import javax.annotation.Nullable; -import org.opentripplanner.framework.logging.Throttle; +import org.opentripplanner.utils.logging.Throttle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/framework/token/Serializer.java b/application/src/main/java/org/opentripplanner/framework/token/Serializer.java index 2d01a0ebf5e..3b48792c06d 100644 --- a/application/src/main/java/org/opentripplanner/framework/token/Serializer.java +++ b/application/src/main/java/org/opentripplanner/framework/token/Serializer.java @@ -1,7 +1,7 @@ package org.opentripplanner.framework.token; import java.util.Base64; -import org.opentripplanner.framework.text.CharacterEscapeFormatter; +import org.opentripplanner.utils.text.CharacterEscapeFormatter; class Serializer { diff --git a/application/src/main/java/org/opentripplanner/framework/token/TokenBuilder.java b/application/src/main/java/org/opentripplanner/framework/token/TokenBuilder.java index 4061d073a2d..4a6af98319d 100644 --- a/application/src/main/java/org/opentripplanner/framework/token/TokenBuilder.java +++ b/application/src/main/java/org/opentripplanner/framework/token/TokenBuilder.java @@ -2,7 +2,7 @@ import java.time.Duration; import java.time.Instant; -import org.opentripplanner.framework.lang.ObjectUtils; +import org.opentripplanner.utils.lang.ObjectUtils; /** * This class is used to create a {@link Token} before encoding it. diff --git a/application/src/main/java/org/opentripplanner/framework/token/TokenDefinition.java b/application/src/main/java/org/opentripplanner/framework/token/TokenDefinition.java index d4ac7a61aec..e8e44f0f293 100644 --- a/application/src/main/java/org/opentripplanner/framework/token/TokenDefinition.java +++ b/application/src/main/java/org/opentripplanner/framework/token/TokenDefinition.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * A token definition is an ordered list of fields. A field has a name and a type. The diff --git a/application/src/main/java/org/opentripplanner/framework/token/TokenDefinitionBuilder.java b/application/src/main/java/org/opentripplanner/framework/token/TokenDefinitionBuilder.java index 06a935c7b47..6fb9f500e88 100644 --- a/application/src/main/java/org/opentripplanner/framework/token/TokenDefinitionBuilder.java +++ b/application/src/main/java/org/opentripplanner/framework/token/TokenDefinitionBuilder.java @@ -2,8 +2,8 @@ import java.util.ArrayList; import java.util.List; -import org.opentripplanner.framework.collection.ListUtils; -import org.opentripplanner.framework.lang.IntUtils; +import org.opentripplanner.utils.collection.ListUtils; +import org.opentripplanner.utils.lang.IntUtils; public class TokenDefinitionBuilder { diff --git a/application/src/main/java/org/opentripplanner/framework/token/TokenFormatterConfiguration.java b/application/src/main/java/org/opentripplanner/framework/token/TokenFormatterConfiguration.java index 3945014dad5..16f71d7475c 100644 --- a/application/src/main/java/org/opentripplanner/framework/token/TokenFormatterConfiguration.java +++ b/application/src/main/java/org/opentripplanner/framework/token/TokenFormatterConfiguration.java @@ -1,6 +1,6 @@ package org.opentripplanner.framework.token; -import org.opentripplanner.framework.text.CharacterEscapeFormatter; +import org.opentripplanner.utils.text.CharacterEscapeFormatter; class TokenFormatterConfiguration { diff --git a/application/src/main/java/org/opentripplanner/framework/token/TokenSchema.java b/application/src/main/java/org/opentripplanner/framework/token/TokenSchema.java index 7ac3aa63c9f..35bb836251b 100644 --- a/application/src/main/java/org/opentripplanner/framework/token/TokenSchema.java +++ b/application/src/main/java/org/opentripplanner/framework/token/TokenSchema.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * A token schema contains a set of token definitions, one for each version. This is diff --git a/application/src/main/java/org/opentripplanner/framework/token/TokenType.java b/application/src/main/java/org/opentripplanner/framework/token/TokenType.java index aea39949b0e..b60d80f3406 100644 --- a/application/src/main/java/org/opentripplanner/framework/token/TokenType.java +++ b/application/src/main/java/org/opentripplanner/framework/token/TokenType.java @@ -3,7 +3,7 @@ import java.time.Duration; import java.time.Instant; import javax.annotation.Nullable; -import org.opentripplanner.framework.time.DurationUtils; +import org.opentripplanner.utils.time.DurationUtils; /** * List of types we can store in a token. diff --git a/application/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java b/application/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java index f88cc6ea937..bc83ad2a8af 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java @@ -13,8 +13,6 @@ import org.opentripplanner.ext.stopconsolidation.StopConsolidationRepository; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.framework.application.OtpAppException; -import org.opentripplanner.framework.lang.OtpNumberFormat; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issue.api.DataImportIssueSummary; import org.opentripplanner.graph_builder.model.GraphBuilderModule; @@ -24,6 +22,8 @@ import org.opentripplanner.standalone.config.BuildConfig; import org.opentripplanner.street.model.StreetLimitationParameters; import org.opentripplanner.transit.service.TimetableRepository; +import org.opentripplanner.utils.lang.OtpNumberFormat; +import org.opentripplanner.utils.time.DurationUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/issue/api/Issue.java b/application/src/main/java/org/opentripplanner/graph_builder/issue/api/Issue.java index 24beb48e845..cb50320345c 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/issue/api/Issue.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/issue/api/Issue.java @@ -1,6 +1,6 @@ package org.opentripplanner.graph_builder.issue.api; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Generic issue type, which can be used to create issues. diff --git a/application/src/main/java/org/opentripplanner/graph_builder/issue/report/DataImportIssueReporter.java b/application/src/main/java/org/opentripplanner/graph_builder/issue/report/DataImportIssueReporter.java index 5d209f26ac9..28daceccbba 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/issue/report/DataImportIssueReporter.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/issue/report/DataImportIssueReporter.java @@ -8,10 +8,10 @@ import java.util.Map; import java.util.stream.Collectors; import org.opentripplanner.datastore.api.CompositeDataSource; -import org.opentripplanner.framework.logging.ProgressTracker; import org.opentripplanner.graph_builder.issue.api.DataImportIssue; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.model.GraphBuilderModule; +import org.opentripplanner.utils.logging.ProgressTracker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/issues/HopZeroDistance.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/HopZeroDistance.java index 3ea11b25901..cf11f011d00 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/issues/HopZeroDistance.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/issues/HopZeroDistance.java @@ -1,10 +1,10 @@ package org.opentripplanner.graph_builder.issues; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.graph_builder.issue.api.DataImportIssue; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.Trip; +import org.opentripplanner.utils.time.DurationUtils; public record HopZeroDistance( int sec, diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/DirectTransferGenerator.java b/application/src/main/java/org/opentripplanner/graph_builder/module/DirectTransferGenerator.java index a1a0796c66a..c0deb932418 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/DirectTransferGenerator.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/DirectTransferGenerator.java @@ -8,7 +8,6 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; import org.opentripplanner.framework.application.OTPFeature; -import org.opentripplanner.framework.logging.ProgressTracker; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issues.StopNotLinkedForTransfers; import org.opentripplanner.graph_builder.model.GraphBuilderModule; @@ -26,6 +25,7 @@ import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.TimetableRepository; +import org.opentripplanner.utils.logging.ProgressTracker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/StreetLinkerModule.java b/application/src/main/java/org/opentripplanner/graph_builder/module/StreetLinkerModule.java index 32495617db9..a52f705147e 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/StreetLinkerModule.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/StreetLinkerModule.java @@ -6,7 +6,6 @@ import java.util.function.BiFunction; import java.util.stream.Collectors; import org.opentripplanner.framework.application.OTPFeature; -import org.opentripplanner.framework.logging.ProgressTracker; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issues.ParkAndRideEntranceRemoved; import org.opentripplanner.graph_builder.model.GraphBuilderModule; @@ -32,6 +31,7 @@ import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.service.TimetableRepository; +import org.opentripplanner.utils.logging.ProgressTracker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/ValidateAndInterpolateStopTimesForEachTrip.java b/application/src/main/java/org/opentripplanner/graph_builder/module/ValidateAndInterpolateStopTimesForEachTrip.java index b0fc10fbe37..62b8e5c8173 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/ValidateAndInterpolateStopTimesForEachTrip.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/ValidateAndInterpolateStopTimesForEachTrip.java @@ -8,7 +8,6 @@ import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.framework.geometry.SphericalDistanceLibrary; -import org.opentripplanner.framework.logging.ProgressTracker; import org.opentripplanner.graph_builder.issue.api.DataImportIssue; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issues.HopSpeedFast; @@ -23,6 +22,7 @@ import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.timetable.Trip; +import org.opentripplanner.utils.logging.ProgressTracker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/geometry/CalculateWorldEnvelopeModule.java b/application/src/main/java/org/opentripplanner/graph_builder/module/geometry/CalculateWorldEnvelopeModule.java index e114eb612e3..87bb931cd3a 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/geometry/CalculateWorldEnvelopeModule.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/geometry/CalculateWorldEnvelopeModule.java @@ -2,7 +2,6 @@ import jakarta.inject.Inject; import java.util.Collection; -import org.opentripplanner.framework.logging.ProgressTracker; import org.opentripplanner.graph_builder.model.GraphBuilderModule; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.service.worldenvelope.WorldEnvelopeRepository; @@ -10,6 +9,7 @@ import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.service.TimetableRepository; +import org.opentripplanner.utils.logging.ProgressTracker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java b/application/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java index 6bcab049bd4..af8fb943072 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java @@ -29,9 +29,6 @@ import org.locationtech.jts.geom.impl.PackedCoordinateSequence; import org.opentripplanner.framework.geometry.EncodedPolyline; import org.opentripplanner.framework.geometry.SphericalDistanceLibrary; -import org.opentripplanner.framework.lang.IntUtils; -import org.opentripplanner.framework.logging.ProgressTracker; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issues.ElevationFlattened; import org.opentripplanner.graph_builder.issues.ElevationProfileFailure; @@ -43,6 +40,9 @@ import org.opentripplanner.street.model.edge.StreetEdge; import org.opentripplanner.street.model.edge.StreetElevationExtensionBuilder; import org.opentripplanner.street.model.vertex.Vertex; +import org.opentripplanner.utils.lang.IntUtils; +import org.opentripplanner.utils.logging.ProgressTracker; +import org.opentripplanner.utils.time.DurationUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/ned/MissingElevationHandler.java b/application/src/main/java/org/opentripplanner/graph_builder/module/ned/MissingElevationHandler.java index 4ae6c698d03..e0f5672a6ca 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/ned/MissingElevationHandler.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/ned/MissingElevationHandler.java @@ -5,7 +5,6 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.impl.PackedCoordinateSequence; import org.opentripplanner.astar.model.BinHeap; -import org.opentripplanner.framework.lang.DoubleUtils; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issues.ElevationFlattened; import org.opentripplanner.graph_builder.issues.ElevationProfileFailure; @@ -13,6 +12,7 @@ import org.opentripplanner.street.model.edge.StreetEdge; import org.opentripplanner.street.model.edge.StreetElevationExtensionBuilder; import org.opentripplanner.street.model.vertex.Vertex; +import org.opentripplanner.utils.lang.DoubleUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmDatabase.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmDatabase.java index 0fa3c4cbd3b..382b206a053 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmDatabase.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmDatabase.java @@ -27,7 +27,6 @@ import org.opentripplanner.framework.collection.ToveUtils; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.geometry.HashGridSpatialIndex; -import org.opentripplanner.framework.lang.StringUtils; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issue.api.Issue; import org.opentripplanner.graph_builder.issues.DisconnectedOsmNode; @@ -50,6 +49,7 @@ import org.opentripplanner.street.model.TurnRestrictionType; import org.opentripplanner.street.search.TraverseMode; import org.opentripplanner.street.search.TraverseModeSet; +import org.opentripplanner.utils.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java index 98ed4953b91..08d23087a45 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java @@ -14,7 +14,6 @@ import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.geometry.SphericalDistanceLibrary; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.framework.logging.ProgressTracker; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.model.GraphBuilderModule; import org.opentripplanner.graph_builder.module.osm.parameters.OsmProcessingParameters; @@ -34,6 +33,7 @@ import org.opentripplanner.street.model.vertex.BarrierVertex; import org.opentripplanner.street.model.vertex.IntersectionVertex; import org.opentripplanner.street.model.vertex.Vertex; +import org.opentripplanner.utils.logging.ProgressTracker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java index f2bb2951239..582684d3bea 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java @@ -27,12 +27,12 @@ import org.opentripplanner.framework.geometry.HashGridSpatialIndex; import org.opentripplanner.framework.geometry.SphericalDistanceLibrary; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.framework.lang.DoubleUtils; -import org.opentripplanner.framework.logging.ProgressTracker; import org.opentripplanner.graph_builder.module.osm.StreetEdgePair; import org.opentripplanner.graph_builder.services.osm.EdgeNamer; import org.opentripplanner.osm.model.OsmWithTags; import org.opentripplanner.street.model.edge.StreetEdge; +import org.opentripplanner.utils.lang.DoubleUtils; +import org.opentripplanner.utils.logging.ProgressTracker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/gtfs/GenerateTripPatternsOperation.java b/application/src/main/java/org/opentripplanner/gtfs/GenerateTripPatternsOperation.java index 08ad300fa9a..e647bc4cb9e 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/GenerateTripPatternsOperation.java +++ b/application/src/main/java/org/opentripplanner/gtfs/GenerateTripPatternsOperation.java @@ -10,7 +10,6 @@ import java.util.Map; import java.util.Set; import org.opentripplanner.ext.flex.trip.FlexTrip; -import org.opentripplanner.framework.logging.ProgressTracker; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issues.TripDegenerate; import org.opentripplanner.graph_builder.issues.TripUndefinedService; @@ -30,6 +29,7 @@ import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.transit.model.timetable.TripTimesFactory; +import org.opentripplanner.utils.logging.ProgressTracker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/gtfs/interlining/InterlineProcessor.java b/application/src/main/java/org/opentripplanner/gtfs/interlining/InterlineProcessor.java index 4247af4117e..dbfe3af1c9b 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/interlining/InterlineProcessor.java +++ b/application/src/main/java/org/opentripplanner/gtfs/interlining/InterlineProcessor.java @@ -12,7 +12,6 @@ import java.util.List; import java.util.Map; import org.opentripplanner.framework.geometry.SphericalDistanceLibrary; -import org.opentripplanner.framework.lang.StringUtils; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issues.InterliningTeleport; import org.opentripplanner.gtfs.mapping.StaySeatedNotAllowed; @@ -27,6 +26,7 @@ import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripTimes; +import org.opentripplanner.utils.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/AgencyMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/AgencyMapper.java index f57a9db8684..3e826c998a5 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/AgencyMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/AgencyMapper.java @@ -3,9 +3,9 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.opentripplanner.framework.collection.MapUtils; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.organization.Agency; +import org.opentripplanner.utils.collection.MapUtils; /** Responsible for mapping GTFS Agency into the OTP model. */ class AgencyMapper { diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/BoardingAreaMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/BoardingAreaMapper.java index 9c818e97bdb..d757a08d6df 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/BoardingAreaMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/BoardingAreaMapper.java @@ -7,10 +7,10 @@ import java.util.Map; import java.util.Optional; import java.util.function.Function; -import org.opentripplanner.framework.collection.MapUtils; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.site.BoardingArea; import org.opentripplanner.transit.model.site.RegularStop; +import org.opentripplanner.utils.collection.MapUtils; /** * Responsible for mapping GTFS Boarding areas into the OTP model. diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/EntranceMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/EntranceMapper.java index 786baeb1ba8..eb005ebd641 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/EntranceMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/EntranceMapper.java @@ -4,10 +4,10 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.opentripplanner.framework.collection.MapUtils; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.site.Entrance; import org.opentripplanner.transit.model.site.Station; +import org.opentripplanner.utils.collection.MapUtils; /** * Responsible for mapping GTFS Entrance into the OTP model. diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/FareAttributeMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/FareAttributeMapper.java index 6b1a195b399..87b06edb82b 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/FareAttributeMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/FareAttributeMapper.java @@ -8,9 +8,9 @@ import java.util.Map; import org.opentripplanner.ext.fares.model.FareAttribute; import org.opentripplanner.ext.fares.model.FareAttributeBuilder; -import org.opentripplanner.framework.collection.MapUtils; import org.opentripplanner.transit.model.basic.Money; import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.utils.collection.MapUtils; /** Responsible for mapping GTFS FareAttribute into the OTP model. */ class FareAttributeMapper { diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/FareRuleMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/FareRuleMapper.java index 35cefa510f9..022de12404b 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/FareRuleMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/FareRuleMapper.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Map; import org.opentripplanner.ext.fares.model.FareRule; -import org.opentripplanner.framework.collection.MapUtils; +import org.opentripplanner.utils.collection.MapUtils; /** Responsible for mapping GTFS FareRule into the OTP model. */ class FareRuleMapper { diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/FeedInfoMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/FeedInfoMapper.java index a8ec889372e..1ee10dcfc78 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/FeedInfoMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/FeedInfoMapper.java @@ -5,8 +5,8 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.opentripplanner.framework.collection.MapUtils; import org.opentripplanner.model.FeedInfo; +import org.opentripplanner.utils.collection.MapUtils; /** Responsible for mapping GTFS FeedInfo into the OTP model. */ class FeedInfoMapper { diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/FrequencyMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/FrequencyMapper.java index 1144e926499..18927d67000 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/FrequencyMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/FrequencyMapper.java @@ -3,8 +3,8 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.opentripplanner.framework.collection.MapUtils; import org.opentripplanner.model.Frequency; +import org.opentripplanner.utils.collection.MapUtils; /** Responsible for mapping GTFS Frequency into the OTP model. */ class FrequencyMapper { diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/LocationGroupMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/LocationGroupMapper.java index b4ba6d3cc27..cf1022d671a 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/LocationGroupMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/LocationGroupMapper.java @@ -9,11 +9,11 @@ import org.onebusaway.gtfs.model.Location; import org.onebusaway.gtfs.model.LocationGroup; import org.onebusaway.gtfs.model.Stop; -import org.opentripplanner.framework.collection.MapUtils; import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.transit.model.site.GroupStop; import org.opentripplanner.transit.model.site.GroupStopBuilder; import org.opentripplanner.transit.service.SiteRepositoryBuilder; +import org.opentripplanner.utils.collection.MapUtils; public class LocationGroupMapper { diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/LocationMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/LocationMapper.java index 5a845b8bfe8..4e75eaac312 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/LocationMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/LocationMapper.java @@ -8,7 +8,6 @@ import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.operation.valid.IsValidOp; import org.onebusaway.gtfs.model.Location; -import org.opentripplanner.framework.collection.MapUtils; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.geometry.UnsupportedGeometryException; import org.opentripplanner.framework.i18n.NonLocalizedString; @@ -16,6 +15,7 @@ import org.opentripplanner.graph_builder.issue.api.Issue; import org.opentripplanner.transit.model.site.AreaStop; import org.opentripplanner.transit.service.SiteRepositoryBuilder; +import org.opentripplanner.utils.collection.MapUtils; /** Responsible for mapping GTFS Location into the OTP model. */ public class LocationMapper { diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/PathwayMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/PathwayMapper.java index d92087d4d41..3f5633a3da4 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/PathwayMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/PathwayMapper.java @@ -4,10 +4,10 @@ import java.util.HashMap; import java.util.Map; import org.onebusaway.gtfs.model.Stop; -import org.opentripplanner.framework.collection.MapUtils; import org.opentripplanner.transit.model.site.Pathway; import org.opentripplanner.transit.model.site.PathwayBuilder; import org.opentripplanner.transit.model.site.StationElement; +import org.opentripplanner.utils.collection.MapUtils; /** Responsible for mapping GTFS Pathway into the OTP model. */ class PathwayMapper { diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/PathwayNodeMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/PathwayNodeMapper.java index 06c1dfb3f18..ab74d4c8e58 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/PathwayNodeMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/PathwayNodeMapper.java @@ -5,10 +5,10 @@ import java.util.Map; import java.util.Optional; import java.util.function.Function; -import org.opentripplanner.framework.collection.MapUtils; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.site.PathwayNode; import org.opentripplanner.transit.model.site.Station; +import org.opentripplanner.utils.collection.MapUtils; /** Responsible for mapping GTFS Node into the OTP model. */ class PathwayNodeMapper { diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/RouteMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/RouteMapper.java index 0c668f64b92..96c10c20c01 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/RouteMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/RouteMapper.java @@ -3,13 +3,13 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.opentripplanner.framework.collection.MapUtils; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.network.GroupOfRoutes; import org.opentripplanner.transit.model.network.Route; +import org.opentripplanner.utils.collection.MapUtils; /** Responsible for mapping GTFS Route into the OTP model. */ class RouteMapper { diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/ServiceCalendarDateMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/ServiceCalendarDateMapper.java index a722a8ad9e3..53e35380198 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/ServiceCalendarDateMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/ServiceCalendarDateMapper.java @@ -3,8 +3,8 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.opentripplanner.framework.collection.MapUtils; import org.opentripplanner.model.calendar.ServiceCalendarDate; +import org.opentripplanner.utils.collection.MapUtils; /** Responsible for mapping GTFS ServiceCalendarDate into the OTP model. */ class ServiceCalendarDateMapper { diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/ServiceCalendarMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/ServiceCalendarMapper.java index 1d229c57b19..0bb1f220a30 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/ServiceCalendarMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/ServiceCalendarMapper.java @@ -5,8 +5,8 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.opentripplanner.framework.collection.MapUtils; import org.opentripplanner.model.calendar.ServiceCalendar; +import org.opentripplanner.utils.collection.MapUtils; /** Responsible for mapping GTFS ServiceCalendar into the OTP model. */ class ServiceCalendarMapper { diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/ShapePointMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/ShapePointMapper.java index 78318559e88..8b24bc8f4ea 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/ShapePointMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/ShapePointMapper.java @@ -3,8 +3,8 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.opentripplanner.framework.collection.MapUtils; import org.opentripplanner.model.ShapePoint; +import org.opentripplanner.utils.collection.MapUtils; /** Responsible for mapping GTFS ShapePoint into the OTP model. */ class ShapePointMapper { diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/StopMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/StopMapper.java index 4cbe252d68f..e5d68e71fee 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/StopMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/StopMapper.java @@ -6,13 +6,13 @@ import java.util.Map; import java.util.function.Function; import org.onebusaway.gtfs.model.Stop; -import org.opentripplanner.framework.collection.MapUtils; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.site.FareZone; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.RegularStopBuilder; import org.opentripplanner.transit.model.site.Station; import org.opentripplanner.transit.service.SiteRepositoryBuilder; +import org.opentripplanner.utils.collection.MapUtils; /** Responsible for mapping GTFS Stop into the OTP model. */ class StopMapper { diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java index 5f20b6e0224..2b1d30c09bd 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java @@ -7,9 +7,9 @@ import org.onebusaway.gtfs.model.Location; import org.onebusaway.gtfs.model.LocationGroup; import org.onebusaway.gtfs.model.Stop; -import org.opentripplanner.framework.collection.MapUtils; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.model.StopTime; +import org.opentripplanner.utils.collection.MapUtils; /** * Responsible for mapping GTFS StopTime into the OTP Transit model. diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java index fdef2bb4e0c..70f2fe3094e 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java @@ -5,10 +5,10 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; -import org.opentripplanner.framework.collection.MapUtils; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.routing.api.request.framework.TimePenalty; import org.opentripplanner.transit.model.timetable.Trip; +import org.opentripplanner.utils.collection.MapUtils; /** Responsible for mapping GTFS TripMapper into the OTP model. */ class TripMapper { diff --git a/application/src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java b/application/src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java index d43a91d384d..5dc68fc335f 100644 --- a/application/src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java +++ b/application/src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java @@ -1,17 +1,17 @@ package org.opentripplanner.inspector.vector.edge; -import static org.opentripplanner.framework.lang.DoubleUtils.roundTo2Decimals; import static org.opentripplanner.inspector.vector.KeyValue.kv; +import static org.opentripplanner.utils.lang.DoubleUtils.roundTo2Decimals; import com.google.common.collect.Lists; import java.util.Collection; import java.util.List; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.edge.EscalatorEdge; import org.opentripplanner.street.model.edge.StreetEdge; +import org.opentripplanner.utils.collection.ListUtils; public class EdgePropertyMapper extends PropertyMapper { diff --git a/application/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java b/application/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java index 01f5263b11a..de700486c77 100644 --- a/application/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java +++ b/application/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java @@ -8,7 +8,6 @@ import java.util.List; import java.util.Set; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.routing.vehicle_parking.VehicleParking; import org.opentripplanner.routing.vehicle_parking.VehicleParkingEntrance; @@ -17,6 +16,7 @@ import org.opentripplanner.street.model.vertex.VehicleParkingEntranceVertex; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.TraverseMode; +import org.opentripplanner.utils.collection.ListUtils; public class VertexPropertyMapper extends PropertyMapper { diff --git a/application/src/main/java/org/opentripplanner/model/Frequency.java b/application/src/main/java/org/opentripplanner/model/Frequency.java index c4bd653d41b..fd50219d865 100644 --- a/application/src/main/java/org/opentripplanner/model/Frequency.java +++ b/application/src/main/java/org/opentripplanner/model/Frequency.java @@ -3,9 +3,9 @@ import java.io.Serializable; import java.util.Objects; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; import org.opentripplanner.transit.model.timetable.Trip; +import org.opentripplanner.utils.tostring.ToStringBuilder; public final class Frequency implements Serializable { diff --git a/application/src/main/java/org/opentripplanner/model/GenericLocation.java b/application/src/main/java/org/opentripplanner/model/GenericLocation.java index fd270741e92..bd053cd7147 100644 --- a/application/src/main/java/org/opentripplanner/model/GenericLocation.java +++ b/application/src/main/java/org/opentripplanner/model/GenericLocation.java @@ -2,9 +2,9 @@ import javax.annotation.Nullable; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.framework.lang.StringUtils; -import org.opentripplanner.framework.tostring.ValueObjectToStringBuilder; import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.utils.lang.StringUtils; +import org.opentripplanner.utils.tostring.ValueObjectToStringBuilder; /** * Represents a location that is to be used in a routing request. It can be either a from, to, or diff --git a/application/src/main/java/org/opentripplanner/model/PathTransfer.java b/application/src/main/java/org/opentripplanner/model/PathTransfer.java index 161df9fd3b8..5b42a8149e3 100644 --- a/application/src/main/java/org/opentripplanner/model/PathTransfer.java +++ b/application/src/main/java/org/opentripplanner/model/PathTransfer.java @@ -2,10 +2,10 @@ import java.io.Serializable; import java.util.List; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.transfer.ConstrainedTransfer; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.transit.model.site.StopLocation; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Represents a transfer between stops with the street network path attatched to it. diff --git a/application/src/main/java/org/opentripplanner/model/StopTime.java b/application/src/main/java/org/opentripplanner/model/StopTime.java index edd5fbdb52d..e31350192e1 100644 --- a/application/src/main/java/org/opentripplanner/model/StopTime.java +++ b/application/src/main/java/org/opentripplanner/model/StopTime.java @@ -3,11 +3,11 @@ import java.util.List; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.framework.time.TimeUtils; 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; +import org.opentripplanner.utils.time.TimeUtils; /** * This class is TEMPORALLY used during mapping of GTFS and Netex into the internal Model, it is not diff --git a/application/src/main/java/org/opentripplanner/model/SystemNotice.java b/application/src/main/java/org/opentripplanner/model/SystemNotice.java index f9af41d3fd0..6e6b910665a 100644 --- a/application/src/main/java/org/opentripplanner/model/SystemNotice.java +++ b/application/src/main/java/org/opentripplanner/model/SystemNotice.java @@ -1,8 +1,8 @@ package org.opentripplanner.model; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.alertpatch.TransitAlert; import org.opentripplanner.transit.model.basic.Notice; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * A system notice is used to tag elements with system information. diff --git a/application/src/main/java/org/opentripplanner/model/Timetable.java b/application/src/main/java/org/opentripplanner/model/Timetable.java index 6740e2cc99d..c437a60b0d5 100644 --- a/application/src/main/java/org/opentripplanner/model/Timetable.java +++ b/application/src/main/java/org/opentripplanner/model/Timetable.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.transit.model.framework.DataValidationException; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.framework.Result; @@ -36,6 +35,7 @@ import org.opentripplanner.updater.spi.DataValidationExceptionMapper; import org.opentripplanner.updater.spi.UpdateError; import org.opentripplanner.updater.trip.BackwardsDelayPropagationType; +import org.opentripplanner.utils.time.ServiceDateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/model/TimetableSnapshot.java b/application/src/main/java/org/opentripplanner/model/TimetableSnapshot.java index fa8bb2e55e0..0a54fc964d8 100644 --- a/application/src/main/java/org/opentripplanner/model/TimetableSnapshot.java +++ b/application/src/main/java/org/opentripplanner/model/TimetableSnapshot.java @@ -1,6 +1,6 @@ package org.opentripplanner.model; -import static org.opentripplanner.framework.collection.CollectionUtils.getByNullableKey; +import static org.opentripplanner.utils.collection.CollectionUtils.getByNullableKey; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableSetMultimap; diff --git a/application/src/main/java/org/opentripplanner/model/calendar/CalendarServiceData.java b/application/src/main/java/org/opentripplanner/model/calendar/CalendarServiceData.java index b007fa08ea1..81011f03bd0 100644 --- a/application/src/main/java/org/opentripplanner/model/calendar/CalendarServiceData.java +++ b/application/src/main/java/org/opentripplanner/model/calendar/CalendarServiceData.java @@ -11,8 +11,8 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.utils.time.ServiceDateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/model/calendar/ServiceCalendarDate.java b/application/src/main/java/org/opentripplanner/model/calendar/ServiceCalendarDate.java index 87fb173a112..9d6ddb748cf 100644 --- a/application/src/main/java/org/opentripplanner/model/calendar/ServiceCalendarDate.java +++ b/application/src/main/java/org/opentripplanner/model/calendar/ServiceCalendarDate.java @@ -4,8 +4,8 @@ import java.io.Serializable; import java.time.LocalDate; import java.util.Objects; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * This class explicitly activate or disable a service by date. It can be used in two ways. diff --git a/application/src/main/java/org/opentripplanner/model/calendar/ServiceDateInterval.java b/application/src/main/java/org/opentripplanner/model/calendar/ServiceDateInterval.java index a879f6c790e..db0aef21bd0 100644 --- a/application/src/main/java/org/opentripplanner/model/calendar/ServiceDateInterval.java +++ b/application/src/main/java/org/opentripplanner/model/calendar/ServiceDateInterval.java @@ -6,7 +6,7 @@ import java.time.LocalDate; import java.time.temporal.ChronoUnit; import java.util.Objects; -import org.opentripplanner.framework.time.ServiceDateUtils; +import org.opentripplanner.utils.time.ServiceDateUtils; /** * Value object which represent a service date interval from a starting date until an end date. diff --git a/application/src/main/java/org/opentripplanner/model/calendar/openinghours/OHCalendar.java b/application/src/main/java/org/opentripplanner/model/calendar/openinghours/OHCalendar.java index 7c084d28186..1881ed72dcc 100644 --- a/application/src/main/java/org/opentripplanner/model/calendar/openinghours/OHCalendar.java +++ b/application/src/main/java/org/opentripplanner/model/calendar/openinghours/OHCalendar.java @@ -8,7 +8,7 @@ import java.time.temporal.ChronoUnit; import java.util.List; import java.util.Objects; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; public class OHCalendar implements Serializable { diff --git a/application/src/main/java/org/opentripplanner/model/calendar/openinghours/OpeningHours.java b/application/src/main/java/org/opentripplanner/model/calendar/openinghours/OpeningHours.java index 2918b43bd42..258caedacdc 100644 --- a/application/src/main/java/org/opentripplanner/model/calendar/openinghours/OpeningHours.java +++ b/application/src/main/java/org/opentripplanner/model/calendar/openinghours/OpeningHours.java @@ -4,7 +4,7 @@ import java.time.LocalTime; import java.util.BitSet; import java.util.Objects; -import org.opentripplanner.framework.time.TimeUtils; +import org.opentripplanner.utils.time.TimeUtils; /** */ diff --git a/application/src/main/java/org/opentripplanner/model/calendar/openinghours/OsmOpeningHoursSupport.java b/application/src/main/java/org/opentripplanner/model/calendar/openinghours/OsmOpeningHoursSupport.java index acb500fee62..e87a63fc678 100644 --- a/application/src/main/java/org/opentripplanner/model/calendar/openinghours/OsmOpeningHoursSupport.java +++ b/application/src/main/java/org/opentripplanner/model/calendar/openinghours/OsmOpeningHoursSupport.java @@ -3,7 +3,7 @@ import java.time.Duration; import java.time.temporal.ChronoUnit; import java.util.stream.Collectors; -import org.opentripplanner.framework.time.TimeUtils; +import org.opentripplanner.utils.time.TimeUtils; public class OsmOpeningHoursSupport { diff --git a/application/src/main/java/org/opentripplanner/model/fare/FareMedium.java b/application/src/main/java/org/opentripplanner/model/fare/FareMedium.java index 08a0a738666..caa286b1c31 100644 --- a/application/src/main/java/org/opentripplanner/model/fare/FareMedium.java +++ b/application/src/main/java/org/opentripplanner/model/fare/FareMedium.java @@ -1,8 +1,8 @@ package org.opentripplanner.model.fare; import java.util.Objects; -import org.opentripplanner.framework.lang.Sandbox; import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.utils.lang.Sandbox; /** * diff --git a/application/src/main/java/org/opentripplanner/model/fare/FareProduct.java b/application/src/main/java/org/opentripplanner/model/fare/FareProduct.java index 189b73807e7..8aa86e5af89 100644 --- a/application/src/main/java/org/opentripplanner/model/fare/FareProduct.java +++ b/application/src/main/java/org/opentripplanner/model/fare/FareProduct.java @@ -6,10 +6,10 @@ import java.util.Objects; import java.util.UUID; import javax.annotation.Nullable; -import org.opentripplanner.framework.lang.Sandbox; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.transit.model.basic.Money; import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.utils.lang.Sandbox; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * A ticket that a user can purchase to travel. diff --git a/application/src/main/java/org/opentripplanner/model/fare/FareProductUse.java b/application/src/main/java/org/opentripplanner/model/fare/FareProductUse.java index 33c67f56314..99f34503270 100644 --- a/application/src/main/java/org/opentripplanner/model/fare/FareProductUse.java +++ b/application/src/main/java/org/opentripplanner/model/fare/FareProductUse.java @@ -1,6 +1,6 @@ package org.opentripplanner.model.fare; -import org.opentripplanner.framework.lang.Sandbox; +import org.opentripplanner.utils.lang.Sandbox; /** * diff --git a/application/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java b/application/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java index 1a64f21c41b..d39180ac3a9 100644 --- a/application/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java +++ b/application/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java @@ -8,9 +8,9 @@ import java.util.List; import java.util.Objects; import java.util.Set; -import org.opentripplanner.framework.lang.Sandbox; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.plan.Leg; +import org.opentripplanner.utils.lang.Sandbox; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * diff --git a/application/src/main/java/org/opentripplanner/model/fare/RiderCategory.java b/application/src/main/java/org/opentripplanner/model/fare/RiderCategory.java index df68d3a8ce6..ee293d2142c 100644 --- a/application/src/main/java/org/opentripplanner/model/fare/RiderCategory.java +++ b/application/src/main/java/org/opentripplanner/model/fare/RiderCategory.java @@ -2,8 +2,8 @@ import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.framework.lang.Sandbox; import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.utils.lang.Sandbox; @Sandbox public record RiderCategory(FeedScopedId id, String name, @Nullable String url) { diff --git a/application/src/main/java/org/opentripplanner/model/modes/AllowMainAndSubModeFilter.java b/application/src/main/java/org/opentripplanner/model/modes/AllowMainAndSubModeFilter.java index 1b34acd5327..a6f75ac0ed9 100644 --- a/application/src/main/java/org/opentripplanner/model/modes/AllowMainAndSubModeFilter.java +++ b/application/src/main/java/org/opentripplanner/model/modes/AllowMainAndSubModeFilter.java @@ -2,10 +2,10 @@ import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.transit.model.basic.MainAndSubMode; import org.opentripplanner.transit.model.basic.SubMode; import org.opentripplanner.transit.model.basic.TransitMode; +import org.opentripplanner.utils.tostring.ToStringBuilder; class AllowMainAndSubModeFilter implements AllowTransitModeFilter { diff --git a/application/src/main/java/org/opentripplanner/model/modes/AllowMainAndSubModesFilter.java b/application/src/main/java/org/opentripplanner/model/modes/AllowMainAndSubModesFilter.java index 50a20f72c55..5d40b365204 100644 --- a/application/src/main/java/org/opentripplanner/model/modes/AllowMainAndSubModesFilter.java +++ b/application/src/main/java/org/opentripplanner/model/modes/AllowMainAndSubModesFilter.java @@ -5,9 +5,9 @@ import java.util.Comparator; import java.util.List; import java.util.Objects; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.transit.model.basic.SubMode; import org.opentripplanner.transit.model.basic.TransitMode; +import org.opentripplanner.utils.tostring.ToStringBuilder; class AllowMainAndSubModesFilter implements AllowTransitModeFilter { diff --git a/application/src/main/java/org/opentripplanner/model/modes/AllowMainModeFilter.java b/application/src/main/java/org/opentripplanner/model/modes/AllowMainModeFilter.java index eaa6719d143..9efcceee86e 100644 --- a/application/src/main/java/org/opentripplanner/model/modes/AllowMainModeFilter.java +++ b/application/src/main/java/org/opentripplanner/model/modes/AllowMainModeFilter.java @@ -1,8 +1,8 @@ package org.opentripplanner.model.modes; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.transit.model.basic.SubMode; import org.opentripplanner.transit.model.basic.TransitMode; +import org.opentripplanner.utils.tostring.ToStringBuilder; class AllowMainModeFilter implements AllowTransitModeFilter { diff --git a/application/src/main/java/org/opentripplanner/model/modes/AllowMainModesFilter.java b/application/src/main/java/org/opentripplanner/model/modes/AllowMainModesFilter.java index f6c8aa3b4a2..0926f6d5621 100644 --- a/application/src/main/java/org/opentripplanner/model/modes/AllowMainModesFilter.java +++ b/application/src/main/java/org/opentripplanner/model/modes/AllowMainModesFilter.java @@ -3,9 +3,9 @@ import java.util.Collection; import java.util.EnumSet; import java.util.Set; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.transit.model.basic.SubMode; import org.opentripplanner.transit.model.basic.TransitMode; +import org.opentripplanner.utils.tostring.ToStringBuilder; class AllowMainModesFilter implements AllowTransitModeFilter { diff --git a/application/src/main/java/org/opentripplanner/model/modes/ExcludeAllTransitFilter.java b/application/src/main/java/org/opentripplanner/model/modes/ExcludeAllTransitFilter.java index 163d82170b0..08fdf4a528b 100644 --- a/application/src/main/java/org/opentripplanner/model/modes/ExcludeAllTransitFilter.java +++ b/application/src/main/java/org/opentripplanner/model/modes/ExcludeAllTransitFilter.java @@ -1,10 +1,10 @@ package org.opentripplanner.model.modes; import java.io.Serializable; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.api.request.request.filter.TransitFilter; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.TripTimes; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * This filter will exclude everything. diff --git a/application/src/main/java/org/opentripplanner/model/plan/ElevationProfile.java b/application/src/main/java/org/opentripplanner/model/plan/ElevationProfile.java index a293039c3c3..91f3a748a37 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/ElevationProfile.java +++ b/application/src/main/java/org/opentripplanner/model/plan/ElevationProfile.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.Objects; import java.util.function.Predicate; -import org.opentripplanner.framework.lang.DoubleUtils; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.lang.DoubleUtils; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Represents an elevation profile as a list of {@code x,y} coordinates. The {@code x} is the diff --git a/application/src/main/java/org/opentripplanner/model/plan/Emissions.java b/application/src/main/java/org/opentripplanner/model/plan/Emissions.java index e19ce3a914a..3339cc8b93f 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/Emissions.java +++ b/application/src/main/java/org/opentripplanner/model/plan/Emissions.java @@ -1,7 +1,7 @@ package org.opentripplanner.model.plan; -import org.opentripplanner.framework.lang.Sandbox; import org.opentripplanner.framework.model.Grams; +import org.opentripplanner.utils.lang.Sandbox; /** * Represents the emissions of a journey. Each type of emissions has its own field and unit. diff --git a/application/src/main/java/org/opentripplanner/model/plan/FrequencyTransitLeg.java b/application/src/main/java/org/opentripplanner/model/plan/FrequencyTransitLeg.java index 48c4b1b7b87..dc00dd49f22 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/FrequencyTransitLeg.java +++ b/application/src/main/java/org/opentripplanner/model/plan/FrequencyTransitLeg.java @@ -2,8 +2,8 @@ import java.util.ArrayList; import java.util.List; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.transit.model.site.StopLocation; +import org.opentripplanner.utils.time.ServiceDateUtils; /** * One leg of a trip -- that is, a temporally continuous piece of the journey that takes place on a diff --git a/application/src/main/java/org/opentripplanner/model/plan/Itinerary.java b/application/src/main/java/org/opentripplanner/model/plan/Itinerary.java index 18055690b6e..f707b97c131 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/Itinerary.java +++ b/application/src/main/java/org/opentripplanner/model/plan/Itinerary.java @@ -13,9 +13,7 @@ import java.util.stream.Stream; import javax.annotation.Nullable; import org.opentripplanner.ext.flex.FlexibleTransitLeg; -import org.opentripplanner.framework.lang.DoubleUtils; import org.opentripplanner.framework.model.TimeAndCost; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.SystemNotice; import org.opentripplanner.model.fare.ItineraryFares; import org.opentripplanner.raptor.api.model.RaptorConstants; @@ -23,6 +21,8 @@ import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.RaptorCostConverter; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.preference.ItineraryFilterPreferences; +import org.opentripplanner.utils.lang.DoubleUtils; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * An Itinerary is one complete way of getting from the start location to the end location. diff --git a/application/src/main/java/org/opentripplanner/model/plan/ItinerarySortKey.java b/application/src/main/java/org/opentripplanner/model/plan/ItinerarySortKey.java index 18939c95f8c..6df5d828633 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/ItinerarySortKey.java +++ b/application/src/main/java/org/opentripplanner/model/plan/ItinerarySortKey.java @@ -1,7 +1,7 @@ package org.opentripplanner.model.plan; import java.time.Instant; -import org.opentripplanner.framework.tostring.ValueObjectToStringBuilder; +import org.opentripplanner.utils.tostring.ValueObjectToStringBuilder; /** * This interface is used to sort itineraries and other instances that we might want to sort among diff --git a/application/src/main/java/org/opentripplanner/model/plan/Leg.java b/application/src/main/java/org/opentripplanner/model/plan/Leg.java index 174fdf70452..b3c9b526f03 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/Leg.java +++ b/application/src/main/java/org/opentripplanner/model/plan/Leg.java @@ -10,7 +10,6 @@ import javax.annotation.Nullable; import org.locationtech.jts.geom.LineString; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.framework.lang.Sandbox; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.legreference.LegReference; @@ -26,6 +25,7 @@ import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripOnServiceDate; import org.opentripplanner.transit.model.timetable.booking.BookingInfo; +import org.opentripplanner.utils.lang.Sandbox; /** * One leg of a trip -- that is, a temporally continuous piece of the journey that takes place on a diff --git a/application/src/main/java/org/opentripplanner/model/plan/Place.java b/application/src/main/java/org/opentripplanner/model/plan/Place.java index fe3a9dee420..4e2e2a425f1 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/Place.java +++ b/application/src/main/java/org/opentripplanner/model/plan/Place.java @@ -3,7 +3,6 @@ import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.LocalizedString; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; import org.opentripplanner.service.vehiclerental.street.VehicleRentalPlaceVertex; import org.opentripplanner.street.model.vertex.StreetVertex; @@ -14,6 +13,7 @@ import org.opentripplanner.street.search.state.State; import org.opentripplanner.transit.model.site.AreaStop; import org.opentripplanner.transit.model.site.StopLocation; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * A Place is where a journey starts or ends, or a transit stop along the way. diff --git a/application/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java b/application/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java index 9949d83cdfe..f3fba29515e 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java +++ b/application/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java @@ -16,9 +16,6 @@ import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.geometry.SphericalDistanceLibrary; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.framework.lang.DoubleUtils; -import org.opentripplanner.framework.time.ServiceDateUtils; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.legreference.LegReference; @@ -38,6 +35,9 @@ import org.opentripplanner.transit.model.timetable.TripOnServiceDate; import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.transit.model.timetable.booking.BookingInfo; +import org.opentripplanner.utils.lang.DoubleUtils; +import org.opentripplanner.utils.time.ServiceDateUtils; +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 diff --git a/application/src/main/java/org/opentripplanner/model/plan/StopArrival.java b/application/src/main/java/org/opentripplanner/model/plan/StopArrival.java index 489b122da09..d43df69ff21 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/StopArrival.java +++ b/application/src/main/java/org/opentripplanner/model/plan/StopArrival.java @@ -1,6 +1,6 @@ package org.opentripplanner.model.plan; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * This class is used to represent a stop arrival event mostly for intermediate visits to a stops diff --git a/application/src/main/java/org/opentripplanner/model/plan/StopArrivalMapper.java b/application/src/main/java/org/opentripplanner/model/plan/StopArrivalMapper.java index 25bab2a7c3f..c6a719addd5 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/StopArrivalMapper.java +++ b/application/src/main/java/org/opentripplanner/model/plan/StopArrivalMapper.java @@ -3,9 +3,9 @@ import java.time.LocalDate; import java.time.ZoneId; import java.util.Objects; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.TripTimes; +import org.opentripplanner.utils.time.ServiceDateUtils; /** * Maps leg-related information to an instance of {@link StopArrival}. diff --git a/application/src/main/java/org/opentripplanner/model/plan/StreetLeg.java b/application/src/main/java/org/opentripplanner/model/plan/StreetLeg.java index 6384159a4ec..a61c68dccc5 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/StreetLeg.java +++ b/application/src/main/java/org/opentripplanner/model/plan/StreetLeg.java @@ -7,11 +7,11 @@ import java.util.Set; import javax.annotation.Nullable; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.framework.lang.DoubleUtils; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.street.model.note.StreetNote; import org.opentripplanner.street.search.TraverseMode; +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 using diff --git a/application/src/main/java/org/opentripplanner/model/plan/TripPlan.java b/application/src/main/java/org/opentripplanner/model/plan/TripPlan.java index 2640d655bde..ccd2af8b333 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/TripPlan.java +++ b/application/src/main/java/org/opentripplanner/model/plan/TripPlan.java @@ -3,7 +3,7 @@ import java.time.Instant; import java.util.Collection; import java.util.List; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * A TripPlan is a set of ways to get from point A to point B at time T. diff --git a/application/src/main/java/org/opentripplanner/model/plan/UnknownTransitPathLeg.java b/application/src/main/java/org/opentripplanner/model/plan/UnknownTransitPathLeg.java index 76179a8ee7c..45a9c6561d3 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/UnknownTransitPathLeg.java +++ b/application/src/main/java/org/opentripplanner/model/plan/UnknownTransitPathLeg.java @@ -6,10 +6,10 @@ import java.util.List; import javax.annotation.Nullable; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.raptor.spi.RaptorCostCalculator; +import org.opentripplanner.utils.time.DurationUtils; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * A transit search may return an unknown transit path. A path consisting of a mix of diff --git a/application/src/main/java/org/opentripplanner/model/plan/WalkStep.java b/application/src/main/java/org/opentripplanner/model/plan/WalkStep.java index 13249d5da52..45f2b5da701 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/WalkStep.java +++ b/application/src/main/java/org/opentripplanner/model/plan/WalkStep.java @@ -6,10 +6,10 @@ import java.util.Set; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.framework.lang.DoubleUtils; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.note.StreetNote; +import org.opentripplanner.utils.lang.DoubleUtils; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Represents one instruction in walking directions. Three examples from New York City: diff --git a/application/src/main/java/org/opentripplanner/model/plan/WalkStepBuilder.java b/application/src/main/java/org/opentripplanner/model/plan/WalkStepBuilder.java index 25c6ee25b6b..8d4df6634fd 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/WalkStepBuilder.java +++ b/application/src/main/java/org/opentripplanner/model/plan/WalkStepBuilder.java @@ -7,10 +7,10 @@ import javax.annotation.Nullable; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.framework.lang.DoubleUtils; -import org.opentripplanner.framework.lang.IntUtils; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.note.StreetNote; +import org.opentripplanner.utils.lang.DoubleUtils; +import org.opentripplanner.utils.lang.IntUtils; public class WalkStepBuilder { diff --git a/application/src/main/java/org/opentripplanner/model/plan/legreference/ScheduledTransitLegReference.java b/application/src/main/java/org/opentripplanner/model/plan/legreference/ScheduledTransitLegReference.java index b008dea5737..422a62ce763 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/legreference/ScheduledTransitLegReference.java +++ b/application/src/main/java/org/opentripplanner/model/plan/legreference/ScheduledTransitLegReference.java @@ -3,7 +3,6 @@ import java.time.LocalDate; import java.time.ZoneId; import javax.annotation.Nullable; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.model.Timetable; import org.opentripplanner.model.plan.ScheduledTransitLeg; import org.opentripplanner.model.plan.ScheduledTransitLegBuilder; @@ -15,6 +14,7 @@ import org.opentripplanner.transit.model.timetable.TripOnServiceDate; import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.transit.service.TransitService; +import org.opentripplanner.utils.time.ServiceDateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursor.java b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursor.java index a52dc0429c1..ead71fbeb38 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursor.java +++ b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursor.java @@ -3,10 +3,10 @@ import java.time.Duration; import java.time.Instant; import javax.annotation.Nullable; -import org.opentripplanner.framework.collection.ListSection; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.SortOrder; +import org.opentripplanner.utils.collection.ListSection; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * This class holds all the information needed to page to the next/previous page. It is serialized diff --git a/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorFactory.java b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorFactory.java index 92f59319cc1..4e2fad2a398 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorFactory.java +++ b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorFactory.java @@ -6,9 +6,9 @@ import java.time.Duration; import java.time.Instant; import javax.annotation.Nullable; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.SortOrder; +import org.opentripplanner.utils.tostring.ToStringBuilder; public class PageCursorFactory { diff --git a/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorSerializer.java b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorSerializer.java index 396c7499d2f..ac2a8e1df0b 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorSerializer.java +++ b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorSerializer.java @@ -1,10 +1,10 @@ package org.opentripplanner.model.plan.paging.cursor; import javax.annotation.Nullable; -import org.opentripplanner.framework.lang.StringUtils; import org.opentripplanner.framework.token.TokenSchema; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.SortOrder; +import org.opentripplanner.utils.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/model/projectinfo/VersionControlInfo.java b/application/src/main/java/org/opentripplanner/model/projectinfo/VersionControlInfo.java index d2bbca43e66..6cd6a47f5ef 100644 --- a/application/src/main/java/org/opentripplanner/model/projectinfo/VersionControlInfo.java +++ b/application/src/main/java/org/opentripplanner/model/projectinfo/VersionControlInfo.java @@ -3,7 +3,7 @@ import static org.opentripplanner.model.projectinfo.OtpProjectInfo.UNKNOWN; import java.io.Serializable; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; public class VersionControlInfo implements Serializable { diff --git a/application/src/main/java/org/opentripplanner/model/transfer/ConstrainedTransfer.java b/application/src/main/java/org/opentripplanner/model/transfer/ConstrainedTransfer.java index d289727fd57..a5e6c624d9c 100644 --- a/application/src/main/java/org/opentripplanner/model/transfer/ConstrainedTransfer.java +++ b/application/src/main/java/org/opentripplanner/model/transfer/ConstrainedTransfer.java @@ -3,9 +3,9 @@ import java.io.Serializable; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.api.model.RaptorConstrainedTransfer; import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * A constrained transfer is a transfer which is restricted in one ore more ways by the transit data diff --git a/application/src/main/java/org/opentripplanner/model/transfer/RouteStopTransferPoint.java b/application/src/main/java/org/opentripplanner/model/transfer/RouteStopTransferPoint.java index 7b81f44c6a6..627d82f7ccd 100644 --- a/application/src/main/java/org/opentripplanner/model/transfer/RouteStopTransferPoint.java +++ b/application/src/main/java/org/opentripplanner/model/transfer/RouteStopTransferPoint.java @@ -1,9 +1,9 @@ package org.opentripplanner.model.transfer; import java.io.Serializable; -import org.opentripplanner.framework.tostring.ValueObjectToStringBuilder; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.site.StopLocation; +import org.opentripplanner.utils.tostring.ValueObjectToStringBuilder; public final class RouteStopTransferPoint implements TransferPoint, Serializable { diff --git a/application/src/main/java/org/opentripplanner/model/transfer/StationTransferPoint.java b/application/src/main/java/org/opentripplanner/model/transfer/StationTransferPoint.java index 53219e7fbcc..4af961ff0f4 100644 --- a/application/src/main/java/org/opentripplanner/model/transfer/StationTransferPoint.java +++ b/application/src/main/java/org/opentripplanner/model/transfer/StationTransferPoint.java @@ -1,8 +1,8 @@ package org.opentripplanner.model.transfer; import java.io.Serializable; -import org.opentripplanner.framework.tostring.ValueObjectToStringBuilder; import org.opentripplanner.transit.model.site.Station; +import org.opentripplanner.utils.tostring.ValueObjectToStringBuilder; public final class StationTransferPoint implements TransferPoint, Serializable { diff --git a/application/src/main/java/org/opentripplanner/model/transfer/TransferConstraint.java b/application/src/main/java/org/opentripplanner/model/transfer/TransferConstraint.java index bc8dc4cd28f..e6509c7d8ca 100644 --- a/application/src/main/java/org/opentripplanner/model/transfer/TransferConstraint.java +++ b/application/src/main/java/org/opentripplanner/model/transfer/TransferConstraint.java @@ -10,9 +10,9 @@ import java.util.function.IntSupplier; import javax.annotation.Nullable; import org.opentripplanner.framework.application.OTPFeature; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.api.model.RaptorTransferConstraint; import org.opentripplanner.raptor.api.model.SearchDirection; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * This class holds transfer constraint information. diff --git a/application/src/main/java/org/opentripplanner/model/transfer/TripTransferPoint.java b/application/src/main/java/org/opentripplanner/model/transfer/TripTransferPoint.java index ca3359f27dd..5dd23269779 100644 --- a/application/src/main/java/org/opentripplanner/model/transfer/TripTransferPoint.java +++ b/application/src/main/java/org/opentripplanner/model/transfer/TripTransferPoint.java @@ -1,8 +1,8 @@ package org.opentripplanner.model.transfer; import java.io.Serializable; -import org.opentripplanner.framework.tostring.ValueObjectToStringBuilder; import org.opentripplanner.transit.model.timetable.Trip; +import org.opentripplanner.utils.tostring.ValueObjectToStringBuilder; public final class TripTransferPoint implements TransferPoint, Serializable { diff --git a/application/src/main/java/org/opentripplanner/netex/config/NetexFeedParameters.java b/application/src/main/java/org/opentripplanner/netex/config/NetexFeedParameters.java index 723c707ecf1..604a28b1ab5 100644 --- a/application/src/main/java/org/opentripplanner/netex/config/NetexFeedParameters.java +++ b/application/src/main/java/org/opentripplanner/netex/config/NetexFeedParameters.java @@ -11,8 +11,8 @@ import java.util.Objects; import java.util.Set; import java.util.regex.Pattern; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.graph_builder.model.DataSourceConfig; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Parameters to configure the NETEX import. Se the generated build-config documentation or diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java index ec466cc2e27..f954c3a4c24 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java @@ -2,10 +2,10 @@ import static org.opentripplanner.netex.mapping.support.NetexObjectDecorator.withOptional; -import org.opentripplanner.framework.lang.StringUtils; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; import org.opentripplanner.transit.model.organization.Agency; import org.opentripplanner.transit.model.organization.AgencyBuilder; +import org.opentripplanner.utils.lang.StringUtils; import org.rutebanken.netex.model.Authority; /** diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/MultilingualStringMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/MultilingualStringMapper.java index 0f0e2336bc7..668c9feea46 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/MultilingualStringMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/MultilingualStringMapper.java @@ -1,7 +1,7 @@ package org.opentripplanner.netex.mapping; import javax.annotation.Nullable; -import org.opentripplanner.framework.lang.StringUtils; +import org.opentripplanner.utils.lang.StringUtils; import org.rutebanken.netex.model.MultilingualString; public class MultilingualStringMapper { diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/OperatorToAgencyMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/OperatorToAgencyMapper.java index f7bd2643769..b4cf9f3e4de 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/OperatorToAgencyMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/OperatorToAgencyMapper.java @@ -1,10 +1,10 @@ package org.opentripplanner.netex.mapping; -import org.opentripplanner.framework.lang.StringUtils; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; import org.opentripplanner.transit.model.organization.Operator; import org.opentripplanner.transit.model.organization.OperatorBuilder; +import org.opentripplanner.utils.lang.StringUtils; import org.rutebanken.netex.model.ContactStructure; /** diff --git a/application/src/main/java/org/opentripplanner/osm/OsmProvider.java b/application/src/main/java/org/opentripplanner/osm/OsmProvider.java index 2569f666281..597fd516b0e 100644 --- a/application/src/main/java/org/opentripplanner/osm/OsmProvider.java +++ b/application/src/main/java/org/opentripplanner/osm/OsmProvider.java @@ -10,13 +10,13 @@ import org.opentripplanner.datastore.api.FileType; import org.opentripplanner.datastore.file.FileDataSource; import org.opentripplanner.framework.application.OtpFileNames; -import org.opentripplanner.framework.logging.ProgressTracker; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.module.osm.OsmDatabase; import org.opentripplanner.osm.tagmapping.OsmTagMapper; import org.opentripplanner.osm.tagmapping.OsmTagMapperSource; import org.opentripplanner.osm.wayproperty.WayPropertySet; +import org.opentripplanner.utils.logging.ProgressTracker; +import org.opentripplanner.utils.tostring.ToStringBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/osm/model/OsmWithTags.java b/application/src/main/java/org/opentripplanner/osm/model/OsmWithTags.java index 1cd08d9fcd5..00d275ec36a 100644 --- a/application/src/main/java/org/opentripplanner/osm/model/OsmWithTags.java +++ b/application/src/main/java/org/opentripplanner/osm/model/OsmWithTags.java @@ -15,11 +15,11 @@ import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.framework.i18n.TranslatedString; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.graph_builder.module.osm.OsmModule; import org.opentripplanner.osm.OsmProvider; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.transit.model.basic.Accessibility; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * A base class for OSM entities containing common methods. diff --git a/application/src/main/java/org/opentripplanner/osm/wayproperty/specifier/BestMatchSpecifier.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/specifier/BestMatchSpecifier.java index 1d03d74956e..94dbab99b26 100644 --- a/application/src/main/java/org/opentripplanner/osm/wayproperty/specifier/BestMatchSpecifier.java +++ b/application/src/main/java/org/opentripplanner/osm/wayproperty/specifier/BestMatchSpecifier.java @@ -2,8 +2,8 @@ import java.util.Arrays; import java.util.stream.Collectors; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.osm.model.OsmWithTags; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Specifies a class of OSM tagged entities (e.g. ways) by a list of tags and their values (which diff --git a/application/src/main/java/org/opentripplanner/raptor/api/debug/DebugEvent.java b/application/src/main/java/org/opentripplanner/raptor/api/debug/DebugEvent.java index 7162a4a6641..a69e977efe3 100644 --- a/application/src/main/java/org/opentripplanner/raptor/api/debug/DebugEvent.java +++ b/application/src/main/java/org/opentripplanner/raptor/api/debug/DebugEvent.java @@ -1,6 +1,6 @@ package org.opentripplanner.raptor.api.debug; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Debug events hold information about an internal event in the Raptor Algorithm. The element may be diff --git a/application/src/main/java/org/opentripplanner/raptor/api/model/GeneralizedCostRelaxFunction.java b/application/src/main/java/org/opentripplanner/raptor/api/model/GeneralizedCostRelaxFunction.java index 0335e962d98..0038a8e2681 100644 --- a/application/src/main/java/org/opentripplanner/raptor/api/model/GeneralizedCostRelaxFunction.java +++ b/application/src/main/java/org/opentripplanner/raptor/api/model/GeneralizedCostRelaxFunction.java @@ -3,8 +3,8 @@ import java.time.Duration; import java.util.Locale; import java.util.Objects; -import org.opentripplanner.framework.lang.IntUtils; -import org.opentripplanner.framework.lang.OtpNumberFormat; +import org.opentripplanner.utils.lang.IntUtils; +import org.opentripplanner.utils.lang.OtpNumberFormat; /** * This relax-function is used to relax increasing values by: diff --git a/application/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java b/application/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java index 3a7f48cf743..f970254dcc8 100644 --- a/application/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java +++ b/application/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java @@ -4,8 +4,8 @@ import java.time.temporal.ChronoUnit; import javax.annotation.Nullable; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.time.TimeUtils; +import org.opentripplanner.utils.time.DurationUtils; +import org.opentripplanner.utils.time.TimeUtils; /** * Encapsulate information about an access or egress path. We do not distinguish between diff --git a/application/src/main/java/org/opentripplanner/raptor/api/model/RaptorTransfer.java b/application/src/main/java/org/opentripplanner/raptor/api/model/RaptorTransfer.java index 856d6828b30..477c785eaa4 100644 --- a/application/src/main/java/org/opentripplanner/raptor/api/model/RaptorTransfer.java +++ b/application/src/main/java/org/opentripplanner/raptor/api/model/RaptorTransfer.java @@ -1,6 +1,6 @@ package org.opentripplanner.raptor.api.model; -import org.opentripplanner.framework.time.DurationUtils; +import org.opentripplanner.utils.time.DurationUtils; /** * Encapsulate information about a transfer path. diff --git a/application/src/main/java/org/opentripplanner/raptor/api/path/PathLeg.java b/application/src/main/java/org/opentripplanner/raptor/api/path/PathLeg.java index 35a351a4d77..20ffdbae34a 100644 --- a/application/src/main/java/org/opentripplanner/raptor/api/path/PathLeg.java +++ b/application/src/main/java/org/opentripplanner/raptor/api/path/PathLeg.java @@ -4,9 +4,9 @@ import java.util.stream.Stream; import java.util.stream.StreamSupport; import javax.annotation.Nullable; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; +import org.opentripplanner.utils.time.DurationUtils; +import org.opentripplanner.utils.time.TimeUtils; /** * A leg in a Raptor path. The legs are linked together from the first leg {@link AccessPathLeg}, to diff --git a/application/src/main/java/org/opentripplanner/raptor/api/path/PathStringBuilder.java b/application/src/main/java/org/opentripplanner/raptor/api/path/PathStringBuilder.java index da56474ae02..cefba73f41f 100644 --- a/application/src/main/java/org/opentripplanner/raptor/api/path/PathStringBuilder.java +++ b/application/src/main/java/org/opentripplanner/raptor/api/path/PathStringBuilder.java @@ -3,13 +3,13 @@ import java.time.ZonedDateTime; import java.util.function.Consumer; import javax.annotation.Nullable; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.raptor.api.model.RaptorStopNameResolver; import org.opentripplanner.raptor.api.model.RaptorValueFormatter; import org.opentripplanner.raptor.spi.RaptorCostCalculator; +import org.opentripplanner.utils.time.DurationUtils; +import org.opentripplanner.utils.time.TimeUtils; /** * Create a path like: {@code Walk 5m - 101 - Transit 10:07 10:35 - 2111 - Walk 4m } diff --git a/application/src/main/java/org/opentripplanner/raptor/api/request/DebugRequest.java b/application/src/main/java/org/opentripplanner/raptor/api/request/DebugRequest.java index 876175bae6e..91144d86917 100644 --- a/application/src/main/java/org/opentripplanner/raptor/api/request/DebugRequest.java +++ b/application/src/main/java/org/opentripplanner/raptor/api/request/DebugRequest.java @@ -3,12 +3,12 @@ import java.util.List; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.api.debug.DebugEvent; import org.opentripplanner.raptor.api.debug.DebugLogger; import org.opentripplanner.raptor.api.path.RaptorPath; import org.opentripplanner.raptor.api.view.ArrivalView; import org.opentripplanner.raptor.api.view.PatternRideView; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * This class configure the amount of debugging you want for your request. Debugging is supported by diff --git a/application/src/main/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequest.java b/application/src/main/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequest.java index 683c9807af5..7f0da11b558 100644 --- a/application/src/main/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequest.java +++ b/application/src/main/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequest.java @@ -4,9 +4,9 @@ import java.util.Objects; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; import org.opentripplanner.raptor.api.model.RelaxFunction; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Parameters to configure the multi-criteria search. diff --git a/application/src/main/java/org/opentripplanner/raptor/api/request/PassThroughPoint.java b/application/src/main/java/org/opentripplanner/raptor/api/request/PassThroughPoint.java index 187436907fe..7c529343b32 100644 --- a/application/src/main/java/org/opentripplanner/raptor/api/request/PassThroughPoint.java +++ b/application/src/main/java/org/opentripplanner/raptor/api/request/PassThroughPoint.java @@ -6,7 +6,7 @@ import java.util.function.IntFunction; import java.util.stream.IntStream; import javax.annotation.Nullable; -import org.opentripplanner.framework.lang.StringUtils; +import org.opentripplanner.utils.lang.StringUtils; /** * A collection of stop indexes used to define a pass through-point. diff --git a/application/src/main/java/org/opentripplanner/raptor/api/request/RaptorRequest.java b/application/src/main/java/org/opentripplanner/raptor/api/request/RaptorRequest.java index 010bff4bc08..3c27f5478c8 100644 --- a/application/src/main/java/org/opentripplanner/raptor/api/request/RaptorRequest.java +++ b/application/src/main/java/org/opentripplanner/raptor/api/request/RaptorRequest.java @@ -4,10 +4,10 @@ import java.util.Collections; import java.util.Objects; import java.util.Set; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.api.debug.RaptorTimers; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; import org.opentripplanner.raptor.api.model.SearchDirection; +import org.opentripplanner.utils.tostring.ToStringBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/raptor/api/request/RaptorViaConnection.java b/application/src/main/java/org/opentripplanner/raptor/api/request/RaptorViaConnection.java index 45dc5394188..a8359e6c5fa 100644 --- a/application/src/main/java/org/opentripplanner/raptor/api/request/RaptorViaConnection.java +++ b/application/src/main/java/org/opentripplanner/raptor/api/request/RaptorViaConnection.java @@ -2,10 +2,10 @@ import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.raptor.api.model.RaptorStopNameResolver; import org.opentripplanner.raptor.api.model.RaptorTransfer; +import org.opentripplanner.utils.time.DurationUtils; /** * A via-connection is used to define one of the physical locations in a via location Raptor must diff --git a/application/src/main/java/org/opentripplanner/raptor/api/request/RaptorViaLocation.java b/application/src/main/java/org/opentripplanner/raptor/api/request/RaptorViaLocation.java index ae7ea19d20d..fbaae6dabdc 100644 --- a/application/src/main/java/org/opentripplanner/raptor/api/request/RaptorViaLocation.java +++ b/application/src/main/java/org/opentripplanner/raptor/api/request/RaptorViaLocation.java @@ -5,11 +5,11 @@ import java.util.List; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.framework.lang.IntUtils; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.raptor.api.model.RaptorStopNameResolver; import org.opentripplanner.raptor.api.model.RaptorTransfer; +import org.opentripplanner.utils.lang.IntUtils; +import org.opentripplanner.utils.time.DurationUtils; /** * Defines a via location which Raptor will force the path through. The concrete location is diff --git a/application/src/main/java/org/opentripplanner/raptor/api/request/SearchParams.java b/application/src/main/java/org/opentripplanner/raptor/api/request/SearchParams.java index 6ba51319a29..d43d0f11ab6 100644 --- a/application/src/main/java/org/opentripplanner/raptor/api/request/SearchParams.java +++ b/application/src/main/java/org/opentripplanner/raptor/api/request/SearchParams.java @@ -5,10 +5,10 @@ import java.util.Collection; import java.util.List; import java.util.Objects; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.raptor.api.model.RaptorTransfer; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * The responsibility of this class is to encapsulate a Range Raptor travel request search diff --git a/application/src/main/java/org/opentripplanner/raptor/api/request/SearchParamsBuilder.java b/application/src/main/java/org/opentripplanner/raptor/api/request/SearchParamsBuilder.java index 7db4ce5d0f7..cdb7146e814 100644 --- a/application/src/main/java/org/opentripplanner/raptor/api/request/SearchParamsBuilder.java +++ b/application/src/main/java/org/opentripplanner/raptor/api/request/SearchParamsBuilder.java @@ -5,10 +5,10 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Mutable version of {@link SearchParams}. diff --git a/application/src/main/java/org/opentripplanner/raptor/api/response/RaptorResponse.java b/application/src/main/java/org/opentripplanner/raptor/api/response/RaptorResponse.java index 82c0c06d0cd..5b0f1885a85 100644 --- a/application/src/main/java/org/opentripplanner/raptor/api/response/RaptorResponse.java +++ b/application/src/main/java/org/opentripplanner/raptor/api/response/RaptorResponse.java @@ -1,11 +1,11 @@ package org.opentripplanner.raptor.api.response; import java.util.Collection; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.RaptorService; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; import org.opentripplanner.raptor.api.path.RaptorPath; import org.opentripplanner.raptor.api.request.RaptorRequest; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * This is the result of a raptor search including the result paths, the original request diff --git a/application/src/main/java/org/opentripplanner/raptor/api/view/ArrivalView.java b/application/src/main/java/org/opentripplanner/raptor/api/view/ArrivalView.java index 2dffbbe5733..83e46f2d78f 100644 --- a/application/src/main/java/org/opentripplanner/raptor/api/view/ArrivalView.java +++ b/application/src/main/java/org/opentripplanner/raptor/api/view/ArrivalView.java @@ -2,7 +2,6 @@ import java.util.function.IntFunction; import javax.annotation.Nullable; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.raptor.api.model.PathLegType; import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.raptor.api.model.RaptorTransfer; @@ -10,6 +9,7 @@ import org.opentripplanner.raptor.api.model.RaptorValueFormatter; import org.opentripplanner.raptor.api.model.TransitArrival; import org.opentripplanner.raptor.spi.RaptorCostCalculator; +import org.opentripplanner.utils.time.TimeUtils; /** * The purpose of the stop-arrival-view is to provide a common interface for stop-arrivals for diff --git a/application/src/main/java/org/opentripplanner/raptor/path/PathBuilderLeg.java b/application/src/main/java/org/opentripplanner/raptor/path/PathBuilderLeg.java index 335d38203b1..eb80b36316b 100644 --- a/application/src/main/java/org/opentripplanner/raptor/path/PathBuilderLeg.java +++ b/application/src/main/java/org/opentripplanner/raptor/path/PathBuilderLeg.java @@ -2,7 +2,6 @@ import java.util.function.Predicate; import javax.annotation.Nullable; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.raptor.api.model.RaptorConstrainedTransfer; @@ -22,6 +21,7 @@ import org.opentripplanner.raptor.spi.BoardAndAlightTime; import org.opentripplanner.raptor.spi.RaptorCostCalculator; import org.opentripplanner.raptor.spi.RaptorSlackProvider; +import org.opentripplanner.utils.time.TimeUtils; /** * This is the leg implementation for the {@link PathBuilder}. It helps to cache and calculate diff --git a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/SystemErrDebugLogger.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/SystemErrDebugLogger.java index 951721f81a7..c80d226afc7 100644 --- a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/SystemErrDebugLogger.java +++ b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/SystemErrDebugLogger.java @@ -1,22 +1,17 @@ package org.opentripplanner.raptor.rangeraptor; -import static org.opentripplanner.framework.text.Table.Align.Center; -import static org.opentripplanner.framework.text.Table.Align.Left; -import static org.opentripplanner.framework.text.Table.Align.Right; -import static org.opentripplanner.framework.time.TimeUtils.timeToStrCompact; -import static org.opentripplanner.framework.time.TimeUtils.timeToStrLong; import static org.opentripplanner.raptor.api.model.PathLegType.ACCESS; import static org.opentripplanner.raptor.api.model.PathLegType.TRANSIT; +import static org.opentripplanner.utils.text.Table.Align.Center; +import static org.opentripplanner.utils.text.Table.Align.Left; +import static org.opentripplanner.utils.text.Table.Align.Right; +import static org.opentripplanner.utils.time.TimeUtils.timeToStrCompact; +import static org.opentripplanner.utils.time.TimeUtils.timeToStrLong; import java.text.NumberFormat; import java.util.Locale; import java.util.function.Consumer; import javax.annotation.Nullable; -import org.opentripplanner.framework.lang.IntUtils; -import org.opentripplanner.framework.lang.OtpNumberFormat; -import org.opentripplanner.framework.lang.StringUtils; -import org.opentripplanner.framework.text.Table; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.raptor.api.debug.DebugEvent; import org.opentripplanner.raptor.api.debug.DebugLogger; import org.opentripplanner.raptor.api.debug.DebugTopic; @@ -26,6 +21,11 @@ import org.opentripplanner.raptor.api.view.ArrivalView; import org.opentripplanner.raptor.api.view.PatternRideView; import org.opentripplanner.raptor.rangeraptor.transit.TripTimesSearch; +import org.opentripplanner.utils.lang.IntUtils; +import org.opentripplanner.utils.lang.OtpNumberFormat; +import org.opentripplanner.utils.lang.StringUtils; +import org.opentripplanner.utils.text.Table; +import org.opentripplanner.utils.time.DurationUtils; /** * A debug logger which can be plugged into Raptor to do debug logging to standard error. This is diff --git a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/HeuristicAtStop.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/HeuristicAtStop.java index b58d773969c..da07c643fb6 100644 --- a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/HeuristicAtStop.java +++ b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/HeuristicAtStop.java @@ -1,8 +1,8 @@ package org.opentripplanner.raptor.rangeraptor.internalapi; -import org.opentripplanner.framework.lang.OtpNumberFormat; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.raptor.api.model.RaptorConstants; +import org.opentripplanner.utils.lang.OtpNumberFormat; +import org.opentripplanner.utils.time.DurationUtils; /** * Heuristic data for a given stop. diff --git a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c1/PatternRideC1.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c1/PatternRideC1.java index cbb3fbfadf3..fd669e40ffc 100644 --- a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c1/PatternRideC1.java +++ b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c1/PatternRideC1.java @@ -1,12 +1,12 @@ package org.opentripplanner.raptor.rangeraptor.multicriteria.ride.c1; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; import org.opentripplanner.raptor.rangeraptor.multicriteria.arrivals.McStopArrival; import org.opentripplanner.raptor.rangeraptor.multicriteria.ride.PatternRide; import org.opentripplanner.raptor.rangeraptor.multicriteria.ride.PatternRideFactory; import org.opentripplanner.raptor.spi.RaptorCostCalculator; import org.opentripplanner.raptor.util.paretoset.ParetoComparator; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * A {@link PatternRide} with support for c1 {@code generalized-cost}. diff --git a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/PassThroughRideFactory.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/PassThroughRideFactory.java index 6120ae9d698..734766666c5 100644 --- a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/PassThroughRideFactory.java +++ b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/PassThroughRideFactory.java @@ -1,10 +1,10 @@ package org.opentripplanner.raptor.rangeraptor.multicriteria.ride.c2; -import org.opentripplanner.framework.lang.IntBox; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; import org.opentripplanner.raptor.rangeraptor.internalapi.PassThroughPointsService; import org.opentripplanner.raptor.rangeraptor.multicriteria.arrivals.McStopArrival; import org.opentripplanner.raptor.rangeraptor.multicriteria.ride.PatternRideFactory; +import org.opentripplanner.utils.lang.IntBox; public class PassThroughRideFactory implements PatternRideFactory> { diff --git a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/PatternRideC2.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/PatternRideC2.java index d02bef207c2..a23999f1813 100644 --- a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/PatternRideC2.java +++ b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/PatternRideC2.java @@ -1,11 +1,11 @@ package org.opentripplanner.raptor.rangeraptor.multicriteria.ride.c2; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.api.model.DominanceFunction; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; import org.opentripplanner.raptor.rangeraptor.multicriteria.arrivals.McStopArrival; import org.opentripplanner.raptor.rangeraptor.multicriteria.ride.PatternRide; import org.opentripplanner.raptor.util.paretoset.ParetoComparator; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * A {@link PatternRide} with support for c1 {@code generalized-cost} and c2 (custom-use-case-cost). diff --git a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalPaths.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalPaths.java index 78dc7da4967..2f257e52645 100644 --- a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalPaths.java +++ b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalPaths.java @@ -5,8 +5,6 @@ import java.util.Optional; import java.util.function.IntPredicate; import javax.annotation.Nullable; -import org.opentripplanner.framework.lang.OtpNumberFormat; -import org.opentripplanner.framework.logging.Throttle; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.raptor.api.model.RaptorStopNameResolver; @@ -22,6 +20,8 @@ import org.opentripplanner.raptor.spi.RaptorCostCalculator; import org.opentripplanner.raptor.util.paretoset.ParetoComparator; import org.opentripplanner.raptor.util.paretoset.ParetoSet; +import org.opentripplanner.utils.lang.OtpNumberFormat; +import org.opentripplanner.utils.logging.Throttle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/MinTravelDurationRoutingStrategy.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/MinTravelDurationRoutingStrategy.java index 0e18729b97e..f68299a0a13 100644 --- a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/MinTravelDurationRoutingStrategy.java +++ b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/MinTravelDurationRoutingStrategy.java @@ -2,7 +2,6 @@ import static org.opentripplanner.raptor.spi.RaptorTripScheduleSearch.UNBOUNDED_TRIP_INDEX; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; import org.opentripplanner.raptor.rangeraptor.internalapi.RoutingStrategy; @@ -12,6 +11,7 @@ import org.opentripplanner.raptor.spi.RaptorBoardOrAlightEvent; import org.opentripplanner.raptor.spi.RaptorConstrainedBoardingSearch; import org.opentripplanner.raptor.spi.RaptorRoute; +import org.opentripplanner.utils.time.TimeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/BestTimes.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/BestTimes.java index 3807b26b6c6..296325e9022 100644 --- a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/BestTimes.java +++ b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/BestTimes.java @@ -1,14 +1,14 @@ package org.opentripplanner.raptor.rangeraptor.standard.besttimes; -import static org.opentripplanner.framework.lang.IntUtils.intArray; +import static org.opentripplanner.utils.lang.IntUtils.intArray; import java.util.BitSet; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.rangeraptor.internalapi.SingleCriteriaStopArrivals; import org.opentripplanner.raptor.rangeraptor.internalapi.WorkerLifeCycle; import org.opentripplanner.raptor.rangeraptor.support.IntArraySingleCriteriaArrivals; import org.opentripplanner.raptor.rangeraptor.transit.TransitCalculator; import org.opentripplanner.raptor.util.BitSetIterator; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * This class is responsible for keeping track of the overall best times and the best "on-board" diff --git a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleBestNumberOfTransfers.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleBestNumberOfTransfers.java index 22b0f44a579..f529ce31e20 100644 --- a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleBestNumberOfTransfers.java +++ b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleBestNumberOfTransfers.java @@ -1,10 +1,10 @@ package org.opentripplanner.raptor.rangeraptor.standard.besttimes; -import org.opentripplanner.framework.lang.IntUtils; import org.opentripplanner.raptor.rangeraptor.internalapi.SingleCriteriaStopArrivals; import org.opentripplanner.raptor.rangeraptor.internalapi.WorkerLifeCycle; import org.opentripplanner.raptor.rangeraptor.standard.internalapi.BestNumberOfTransfers; import org.opentripplanner.raptor.rangeraptor.support.IntArraySingleCriteriaArrivals; +import org.opentripplanner.utils.lang.IntUtils; /** * The responsibility for this class is to keep track of the best (minimun) number of transfers for diff --git a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/heuristics/HeuristicsAdapter.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/heuristics/HeuristicsAdapter.java index 3dbff516347..00cce39622d 100644 --- a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/heuristics/HeuristicsAdapter.java +++ b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/heuristics/HeuristicsAdapter.java @@ -4,9 +4,6 @@ import java.util.Arrays; import java.util.List; import java.util.function.IntUnaryOperator; -import org.opentripplanner.framework.lang.IntUtils; -import org.opentripplanner.framework.time.TimeUtils; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.rangeraptor.internalapi.HeuristicAtStop; import org.opentripplanner.raptor.rangeraptor.internalapi.Heuristics; @@ -15,6 +12,9 @@ import org.opentripplanner.raptor.rangeraptor.transit.RaptorTransitCalculator; import org.opentripplanner.raptor.rangeraptor.transit.TransitCalculator; import org.opentripplanner.raptor.spi.RaptorCostCalculator; +import org.opentripplanner.utils.lang.IntUtils; +import org.opentripplanner.utils.time.TimeUtils; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * The responsibility of this class is to play the {@link Heuristics} role. It wrap the internal diff --git a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/AccessStopArrivalState.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/AccessStopArrivalState.java index 867707be215..62f708d1899 100644 --- a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/AccessStopArrivalState.java +++ b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/AccessStopArrivalState.java @@ -1,9 +1,9 @@ package org.opentripplanner.raptor.rangeraptor.standard.stoparrivals; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.api.model.RaptorTransfer; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * This class is responsible for adding access functionality, which the {@link diff --git a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/DefaultStopArrivalState.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/DefaultStopArrivalState.java index 6df63b37d16..b76b0560791 100644 --- a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/DefaultStopArrivalState.java +++ b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/DefaultStopArrivalState.java @@ -1,9 +1,9 @@ package org.opentripplanner.raptor.rangeraptor.standard.stoparrivals; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.api.model.RaptorTransfer; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * The main purpose of this class is to hold data for a given arrival at a stop and raptor round. It diff --git a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/EgressStopArrivalState.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/EgressStopArrivalState.java index f546e358ad8..c002f57dcba 100644 --- a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/EgressStopArrivalState.java +++ b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/EgressStopArrivalState.java @@ -2,11 +2,11 @@ import java.util.Collection; import java.util.List; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.api.model.RaptorTransfer; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; import org.opentripplanner.raptor.rangeraptor.standard.internalapi.DestinationArrivalListener; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * The egress stop arrival state is responsible for sending arrival notifications. This is used to diff --git a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/path/EgressArrivalToPathAdapter.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/path/EgressArrivalToPathAdapter.java index b52e0d854da..a5d39d2eca9 100644 --- a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/path/EgressArrivalToPathAdapter.java +++ b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/path/EgressArrivalToPathAdapter.java @@ -4,8 +4,6 @@ import java.util.ArrayList; import java.util.List; -import org.opentripplanner.framework.time.TimeUtils; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; import org.opentripplanner.raptor.api.view.ArrivalView; @@ -16,6 +14,8 @@ import org.opentripplanner.raptor.rangeraptor.standard.internalapi.DestinationArrivalListener; import org.opentripplanner.raptor.rangeraptor.standard.stoparrivals.view.StopsCursor; import org.opentripplanner.raptor.rangeraptor.transit.TransitCalculator; +import org.opentripplanner.utils.time.TimeUtils; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * The responsibility of this class is to listen for egress stop arrivals and forward these as diff --git a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculator.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculator.java index 5c50aa030f5..20dda7a3b37 100644 --- a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculator.java +++ b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculator.java @@ -1,7 +1,6 @@ package org.opentripplanner.raptor.rangeraptor.transit; import java.util.Iterator; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.raptor.api.model.RaptorTransfer; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; @@ -14,6 +13,7 @@ import org.opentripplanner.raptor.spi.RaptorTransitDataProvider; import org.opentripplanner.raptor.spi.RaptorTripScheduleSearch; import org.opentripplanner.raptor.util.IntIterators; +import org.opentripplanner.utils.time.TimeUtils; public final class ForwardRaptorTransitCalculator extends ForwardTransitCalculator diff --git a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorTransitCalculator.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorTransitCalculator.java index af9cff110d0..141c71ee86c 100644 --- a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorTransitCalculator.java +++ b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorTransitCalculator.java @@ -1,7 +1,7 @@ package org.opentripplanner.raptor.rangeraptor.transit; -import static org.opentripplanner.framework.time.TimeUtils.hm2time; import static org.opentripplanner.raptor.api.model.RaptorConstants.TIME_NOT_SET; +import static org.opentripplanner.utils.time.TimeUtils.hm2time; import java.util.Iterator; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; diff --git a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculator.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculator.java index 09ded9fb4b7..1229c8d85ff 100644 --- a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculator.java +++ b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculator.java @@ -1,7 +1,6 @@ package org.opentripplanner.raptor.rangeraptor.transit; import java.util.Iterator; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.raptor.api.model.RaptorTransfer; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; @@ -14,6 +13,7 @@ import org.opentripplanner.raptor.spi.RaptorTransitDataProvider; import org.opentripplanner.raptor.spi.RaptorTripScheduleSearch; import org.opentripplanner.raptor.util.IntIterators; +import org.opentripplanner.utils.time.TimeUtils; public final class ReverseRaptorTransitCalculator extends ReverseTransitCalculator diff --git a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripScheduleExactMatchSearch.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripScheduleExactMatchSearch.java index 666cf95f31e..1db6b2de055 100644 --- a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripScheduleExactMatchSearch.java +++ b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripScheduleExactMatchSearch.java @@ -1,9 +1,9 @@ package org.opentripplanner.raptor.rangeraptor.transit; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; import org.opentripplanner.raptor.spi.RaptorBoardOrAlightEvent; import org.opentripplanner.raptor.spi.RaptorTripScheduleSearch; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * This trip search will only match trips that is within the given slack of the timeLimit. diff --git a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearch.java b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearch.java index 83bfbe16481..94dfa83ad80 100644 --- a/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearch.java +++ b/application/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearch.java @@ -1,10 +1,10 @@ package org.opentripplanner.raptor.rangeraptor.transit; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.raptor.api.model.RaptorTripPattern; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; import org.opentripplanner.raptor.api.view.ArrivalView; import org.opentripplanner.raptor.spi.BoardAndAlightTime; +import org.opentripplanner.utils.time.TimeUtils; /** * This class is used to find the board and alight time for a known trip, where you now the diff --git a/application/src/main/java/org/opentripplanner/raptor/service/DebugHeuristics.java b/application/src/main/java/org/opentripplanner/raptor/service/DebugHeuristics.java index bb4241bb2ae..f4c2c141f04 100644 --- a/application/src/main/java/org/opentripplanner/raptor/service/DebugHeuristics.java +++ b/application/src/main/java/org/opentripplanner/raptor/service/DebugHeuristics.java @@ -5,13 +5,13 @@ import static org.opentripplanner.raptor.api.model.RaptorConstants.N_TRANSFERS_UNREACHED; import static org.opentripplanner.raptor.api.model.RaptorConstants.UNREACHED_HIGH; -import org.opentripplanner.framework.lang.IntUtils; import org.opentripplanner.raptor.api.debug.DebugLogger; import org.opentripplanner.raptor.api.model.SearchDirection; import org.opentripplanner.raptor.api.request.DebugRequest; import org.opentripplanner.raptor.api.request.RaptorRequest; import org.opentripplanner.raptor.rangeraptor.internalapi.Heuristics; import org.opentripplanner.raptor.util.CompareIntArrays; +import org.opentripplanner.utils.lang.IntUtils; /** * Utility class to log computed heuristic data. diff --git a/application/src/main/java/org/opentripplanner/raptor/service/HeuristicSearchTask.java b/application/src/main/java/org/opentripplanner/raptor/service/HeuristicSearchTask.java index 7c0158d2192..e31f8852ad6 100644 --- a/application/src/main/java/org/opentripplanner/raptor/service/HeuristicSearchTask.java +++ b/application/src/main/java/org/opentripplanner/raptor/service/HeuristicSearchTask.java @@ -3,7 +3,6 @@ import static org.opentripplanner.raptor.api.request.RaptorProfile.MIN_TRAVEL_DURATION; import javax.annotation.Nullable; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; import org.opentripplanner.raptor.api.model.SearchDirection; import org.opentripplanner.raptor.api.request.RaptorRequest; @@ -12,6 +11,7 @@ import org.opentripplanner.raptor.rangeraptor.internalapi.Heuristics; import org.opentripplanner.raptor.rangeraptor.internalapi.RaptorRouterResult; import org.opentripplanner.raptor.spi.RaptorTransitDataProvider; +import org.opentripplanner.utils.time.DurationUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/raptor/spi/BoardAndAlightTime.java b/application/src/main/java/org/opentripplanner/raptor/spi/BoardAndAlightTime.java index 9c0f8264511..c90e67934a8 100644 --- a/application/src/main/java/org/opentripplanner/raptor/spi/BoardAndAlightTime.java +++ b/application/src/main/java/org/opentripplanner/raptor/spi/BoardAndAlightTime.java @@ -1,9 +1,9 @@ package org.opentripplanner.raptor.spi; import java.util.Objects; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; +import org.opentripplanner.utils.time.DurationUtils; +import org.opentripplanner.utils.time.TimeUtils; /** * Board and alight time tuple value object. diff --git a/application/src/main/java/org/opentripplanner/raptor/util/CompareIntArrays.java b/application/src/main/java/org/opentripplanner/raptor/util/CompareIntArrays.java index 9bff831a670..1f446fe036c 100644 --- a/application/src/main/java/org/opentripplanner/raptor/util/CompareIntArrays.java +++ b/application/src/main/java/org/opentripplanner/raptor/util/CompareIntArrays.java @@ -2,7 +2,7 @@ import java.util.Comparator; import java.util.function.IntFunction; -import org.opentripplanner.framework.time.TimeUtils; +import org.opentripplanner.utils.time.TimeUtils; /** * The responsibility of this class is to compare two int arrays and list all elements that differ. diff --git a/application/src/main/java/org/opentripplanner/routing/TripTimeOnDateHelper.java b/application/src/main/java/org/opentripplanner/routing/TripTimeOnDateHelper.java index 72665edf657..f2806d0a1f2 100644 --- a/application/src/main/java/org/opentripplanner/routing/TripTimeOnDateHelper.java +++ b/application/src/main/java/org/opentripplanner/routing/TripTimeOnDateHelper.java @@ -4,13 +4,13 @@ import java.time.LocalDate; import java.util.ArrayList; import java.util.List; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.model.Timetable; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.transit.service.TransitService; +import org.opentripplanner.utils.time.ServiceDateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/RoutingWorker.java b/application/src/main/java/org/opentripplanner/routing/algorithm/RoutingWorker.java index 1e2dd3f2d4e..e0b06eab561 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/RoutingWorker.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/RoutingWorker.java @@ -14,7 +14,6 @@ import javax.annotation.Nullable; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.framework.application.OTPRequestTimeoutException; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.grouppriority.TransitGroupPriorityItineraryDecorator; import org.opentripplanner.model.plan.paging.cursor.PageCursorInput; @@ -38,6 +37,7 @@ import org.opentripplanner.service.paging.PagingService; import org.opentripplanner.standalone.api.OtpServerRequestContext; import org.opentripplanner.transit.model.network.grouppriority.TransitGroupPriorityService; +import org.opentripplanner.utils.time.ServiceDateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java index 3ff85db467a..65776948cbb 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java @@ -13,8 +13,6 @@ import javax.annotation.Nullable; import org.opentripplanner.ext.accessibilityscore.DecorateWithAccessibilityScore; import org.opentripplanner.framework.application.OTPFeature; -import org.opentripplanner.framework.collection.ListSection; -import org.opentripplanner.framework.lang.Sandbox; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.SortOrder; @@ -58,6 +56,8 @@ import org.opentripplanner.street.search.TraverseMode; import org.opentripplanner.transit.model.site.MultiModalStation; import org.opentripplanner.transit.model.site.Station; +import org.opentripplanner.utils.collection.ListSection; +import org.opentripplanner.utils.lang.Sandbox; /** * Create a filter chain based on the given config. diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/GroupBySimilarity.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/GroupBySimilarity.java index 0f671524a06..5cec3046710 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/GroupBySimilarity.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/GroupBySimilarity.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.algorithm.filterchain.api; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.algorithm.filterchain.ItineraryListFilterChainBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Group itineraries by similarity and reduce the number of itineraries down to an given maximum diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/TransitGeneralizedCostFilterParams.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/TransitGeneralizedCostFilterParams.java index a173f6b454b..da33b6f92a0 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/TransitGeneralizedCostFilterParams.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/TransitGeneralizedCostFilterParams.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.algorithm.filterchain.api; -import org.opentripplanner.framework.lang.DoubleUtils; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; +import org.opentripplanner.utils.lang.DoubleUtils; /** * Input parameters for diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilter.java index aed5eeb4f95..77c297fcfa5 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilter.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilter.java @@ -2,10 +2,10 @@ import java.util.List; import java.util.function.Consumer; -import org.opentripplanner.framework.collection.ListSection; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.paging.cursor.PageCursorInput; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; +import org.opentripplanner.utils.collection.ListSection; /** * Flag all itineraries after the provided limit. This flags the itineraries at the end of the list diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilterResults.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilterResults.java index 8b11be099f7..401dc95026d 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilterResults.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilterResults.java @@ -2,12 +2,12 @@ import java.time.Instant; import java.util.List; -import org.opentripplanner.framework.collection.ListSection; -import org.opentripplanner.framework.collection.ListUtils; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.paging.cursor.PageCursorInput; +import org.opentripplanner.utils.collection.ListSection; +import org.opentripplanner.utils.collection.ListUtils; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * The NumItinerariesFilter removes itineraries from a list of itineraries based on the number to diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/PagingFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/PagingFilter.java index 1ef109525f6..417ffca9d83 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/PagingFilter.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/PagingFilter.java @@ -3,12 +3,12 @@ import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; -import org.opentripplanner.framework.collection.ListSection; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.SortOrder; import org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; +import org.opentripplanner.utils.collection.ListSection; /** * This class is used to enforce the cut/limit between two pages. It removes potential duplicates diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilter.java index 430f00372d0..4af0acd00cb 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilter.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilter.java @@ -4,11 +4,11 @@ import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; -import org.opentripplanner.framework.lang.IntUtils; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; +import org.opentripplanner.utils.lang.IntUtils; /** * This filter removes all transit results which have a generalized-cost higher than the max-limit diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByDistance.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByDistance.java index ee67e4f76d0..eb25cf9275c 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByDistance.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByDistance.java @@ -2,12 +2,12 @@ import java.util.Comparator; import java.util.List; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.model.plan.StreetLeg; import org.opentripplanner.model.plan.TransitLeg; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.GroupId; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * This class creates a group identifier for an itinerary based on the longest legs which together diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOrderComparator.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOrderComparator.java index f11caf5ceaa..a904a6990ca 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOrderComparator.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOrderComparator.java @@ -4,9 +4,9 @@ import static java.util.Comparator.comparingInt; import java.util.Comparator; -import org.opentripplanner.framework.collection.CompositeComparator; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.SortOrder; +import org.opentripplanner.utils.collection.CompositeComparator; /** * This comparator implements the itinerary sort order defined by the {@link SortOrder}. diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/path/PathDiff.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/path/PathDiff.java index 18f1fa4f64a..d595c8abcff 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/path/PathDiff.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/path/PathDiff.java @@ -1,8 +1,8 @@ package org.opentripplanner.routing.algorithm.raptoradapter.path; -import static org.opentripplanner.framework.text.Table.Align.Center; -import static org.opentripplanner.framework.text.Table.Align.Left; -import static org.opentripplanner.framework.text.Table.Align.Right; +import static org.opentripplanner.utils.text.Table.Align.Center; +import static org.opentripplanner.utils.text.Table.Align.Left; +import static org.opentripplanner.utils.text.Table.Align.Right; import java.util.ArrayList; import java.util.Collection; @@ -10,16 +10,16 @@ import java.util.List; import java.util.function.Consumer; import java.util.stream.Collectors; -import org.opentripplanner.framework.collection.CompositeComparator; -import org.opentripplanner.framework.text.Table; -import org.opentripplanner.framework.text.TableBuilder; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; import org.opentripplanner.raptor.api.path.PathLeg; import org.opentripplanner.raptor.api.path.RaptorPath; import org.opentripplanner.routing.util.DiffEntry; import org.opentripplanner.routing.util.DiffTool; +import org.opentripplanner.utils.collection.CompositeComparator; +import org.opentripplanner.utils.text.Table; +import org.opentripplanner.utils.text.TableBuilder; +import org.opentripplanner.utils.time.DurationUtils; +import org.opentripplanner.utils.time.TimeUtils; /** * This class is used to diff two set of paths. You may ask for the diff result or pass in a logger diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouter.java index 9b592fad3aa..0ae2df4e105 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouter.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouter.java @@ -7,12 +7,12 @@ import javax.annotation.Nullable; import org.opentripplanner.ext.dataoverlay.routing.DataOverlayContext; import org.opentripplanner.framework.application.OTPRequestTimeoutException; -import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.graph_builder.module.nearbystops.StreetNearbyStopFinder; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.request.StreetRequest; import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.street.search.TemporaryVerticesContainer; +import org.opentripplanner.utils.collection.ListUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/Transfer.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/Transfer.java index c6086100f5d..175c782ab22 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/Transfer.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/Transfer.java @@ -5,8 +5,6 @@ import java.util.List; import java.util.Optional; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.framework.logging.Throttle; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.api.model.RaptorTransfer; import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.RaptorCostConverter; import org.opentripplanner.routing.api.request.preference.WalkPreferences; @@ -14,6 +12,8 @@ import org.opentripplanner.street.search.request.StreetSearchRequest; import org.opentripplanner.street.search.state.EdgeTraverser; import org.opentripplanner.street.search.state.StateEditor; +import org.opentripplanner.utils.logging.Throttle; +import org.opentripplanner.utils.tostring.ToStringBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitTuningParameters.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitTuningParameters.java index b62459db679..c2e518a9ec1 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitTuningParameters.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitTuningParameters.java @@ -2,9 +2,9 @@ import java.time.Duration; import java.util.List; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.transit.model.site.StopTransferPriority; +import org.opentripplanner.utils.time.DurationUtils; public interface TransitTuningParameters { List PAGING_SEARCH_WINDOW_ADJUSTMENTS = DurationUtils.durations("4h 2h 1h 30m 20m 10m"); diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDate.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDate.java index 1411424dfc6..eeaf1312677 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDate.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDate.java @@ -8,10 +8,10 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.transit.model.network.RoutingTripPattern; import org.opentripplanner.transit.model.timetable.FrequencyEntry; import org.opentripplanner.transit.model.timetable.TripTimes; +import org.opentripplanner.utils.time.ServiceDateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedTransfersForPatterns.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedTransfersForPatterns.java index f3b8eac0dd2..670c223e87d 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedTransfersForPatterns.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/constrainedtransfer/ConstrainedTransfersForPatterns.java @@ -2,7 +2,7 @@ import java.util.List; import java.util.Objects; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * This is a container for returning transfers from and to stop-positions indexed by diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/GeneralizedCostParameters.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/GeneralizedCostParameters.java index e1271aca199..eee0fbf36c0 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/GeneralizedCostParameters.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/GeneralizedCostParameters.java @@ -3,9 +3,9 @@ import java.util.BitSet; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.preference.AccessibilityPreferences; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * This class define how to calculate the cost when cost is part of the multi-criteria pareto diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRequestTransferCache.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRequestTransferCache.java index 5e274c4120f..d778f491142 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRequestTransferCache.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRequestTransferCache.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.Objects; import java.util.concurrent.ExecutionException; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransferIndex; import org.opentripplanner.routing.algorithm.raptoradapter.transit.Transfer; import org.opentripplanner.routing.api.request.RouteRequest; @@ -17,6 +16,7 @@ import org.opentripplanner.routing.api.request.preference.WheelchairPreferences; import org.opentripplanner.street.search.request.StreetSearchRequest; import org.opentripplanner.street.search.request.StreetSearchRequestMapper; +import org.opentripplanner.utils.tostring.ToStringBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java index 0182598ca35..784f24af1bc 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java @@ -6,7 +6,6 @@ import java.util.List; import javax.annotation.Nullable; import org.opentripplanner.framework.application.OTPFeature; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.model.transfer.TransferService; import org.opentripplanner.raptor.api.model.RaptorConstrainedTransfer; import org.opentripplanner.raptor.api.model.RaptorStopNameResolver; @@ -30,6 +29,7 @@ import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.transit.model.network.RoutingTripPattern; import org.opentripplanner.transit.model.network.grouppriority.TransitGroupPriorityService; +import org.opentripplanner.utils.time.ServiceDateUtils; /** * This is the data provider for the Range Raptor search engine. It uses data from the TransitLayer, diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java index 815bf839e31..bde424f8269 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java @@ -1,6 +1,6 @@ package org.opentripplanner.routing.algorithm.raptoradapter.transit.request; -import static org.opentripplanner.framework.time.ServiceDateUtils.secondsSinceStartOfTime; +import static org.opentripplanner.utils.time.ServiceDateUtils.secondsSinceStartOfTime; import gnu.trove.list.array.TIntArrayList; import gnu.trove.map.TObjectIntMap; @@ -14,13 +14,13 @@ import java.util.List; import java.util.Map; import java.util.function.Predicate; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TransitLayer; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripPatternForDate; import org.opentripplanner.transit.model.network.RoutingTripPattern; import org.opentripplanner.transit.model.network.grouppriority.TransitGroupPriorityService; import org.opentripplanner.transit.model.timetable.TripTimes; +import org.opentripplanner.utils.time.DurationUtils; +import org.opentripplanner.utils.time.ServiceDateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripPatternForDates.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripPatternForDates.java index 0fb39b227ea..a94aa0850ba 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripPatternForDates.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripPatternForDates.java @@ -2,7 +2,6 @@ import java.util.BitSet; import java.util.function.IntUnaryOperator; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.api.model.RaptorTripPattern; import org.opentripplanner.raptor.api.model.SearchDirection; import org.opentripplanner.raptor.spi.IntIterator; @@ -18,6 +17,7 @@ import org.opentripplanner.transit.model.basic.Accessibility; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.network.RoutingTripPattern; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * A collection of all the TripSchedules active on a range of consecutive days. The outer list of diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleAlightSearch.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleAlightSearch.java index 5ece76aedb5..628a16511ce 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleAlightSearch.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleAlightSearch.java @@ -2,13 +2,13 @@ import java.util.function.IntUnaryOperator; import javax.annotation.Nullable; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.raptor.api.model.RaptorTransferConstraint; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; import org.opentripplanner.raptor.api.model.SearchDirection; import org.opentripplanner.raptor.spi.RaptorBoardOrAlightEvent; import org.opentripplanner.raptor.spi.RaptorTripScheduleSearch; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * The purpose of this class is to optimize the search for a trip schedule for a given pattern and diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleBoardSearch.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleBoardSearch.java index 4ec306f84b3..7bd5062d8dc 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleBoardSearch.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleBoardSearch.java @@ -1,13 +1,13 @@ package org.opentripplanner.routing.algorithm.raptoradapter.transit.request; import java.util.function.IntUnaryOperator; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.raptor.api.model.RaptorTransferConstraint; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; import org.opentripplanner.raptor.api.model.SearchDirection; import org.opentripplanner.raptor.spi.RaptorBoardOrAlightEvent; import org.opentripplanner.raptor.spi.RaptorTripScheduleSearch; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * The purpose of this class is to optimize the search for a trip schedule for a given pattern and diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleWithOffset.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleWithOffset.java index aca998b24ca..d692f0079f6 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleWithOffset.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleWithOffset.java @@ -2,7 +2,6 @@ import java.time.LocalDate; import java.util.function.IntUnaryOperator; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.api.model.RaptorTripPattern; import org.opentripplanner.raptor.spi.IntIterator; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripPatternForDate; @@ -10,6 +9,7 @@ import org.opentripplanner.transit.model.basic.Accessibility; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.TripTimes; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * This represents a single trip within a TripPattern, but with a time offset in seconds. This is diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/OptimizeTransferService.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/OptimizeTransferService.java index 8a4f25d8910..4d8a79b3f4f 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/OptimizeTransferService.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/OptimizeTransferService.java @@ -3,7 +3,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.opentripplanner.framework.logging.Throttle; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; import org.opentripplanner.raptor.api.path.RaptorPath; import org.opentripplanner.routing.algorithm.raptoradapter.path.PathDiff; @@ -11,6 +10,7 @@ import org.opentripplanner.routing.algorithm.transferoptimization.model.MinSafeTransferTimeCalculator; import org.opentripplanner.routing.algorithm.transferoptimization.model.TransferWaitTimeCostCalculator; import org.opentripplanner.routing.algorithm.transferoptimization.services.OptimizePathDomainService; +import org.opentripplanner.utils.logging.Throttle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/BasicStopTime.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/BasicStopTime.java index 9d073b2ae64..5fd9e73e398 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/BasicStopTime.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/BasicStopTime.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.algorithm.transferoptimization.model; import java.util.Objects; -import org.opentripplanner.framework.tostring.ValueObjectToStringBuilder; +import org.opentripplanner.utils.tostring.ValueObjectToStringBuilder; /** Basic stop and time value object. */ final class BasicStopTime implements StopTime { diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/MinSafeTransferTimeCalculator.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/MinSafeTransferTimeCalculator.java index 49b3c29559e..fde6b3d4a64 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/MinSafeTransferTimeCalculator.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/MinSafeTransferTimeCalculator.java @@ -1,14 +1,14 @@ package org.opentripplanner.routing.algorithm.transferoptimization.model; -import static org.opentripplanner.framework.time.DurationUtils.durationInSeconds; +import static org.opentripplanner.utils.time.DurationUtils.durationInSeconds; import java.util.Collection; import java.util.function.ToIntFunction; -import org.opentripplanner.framework.lang.IntUtils; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; import org.opentripplanner.raptor.api.path.RaptorPath; import org.opentripplanner.raptor.api.path.TransitPathLeg; import org.opentripplanner.raptor.spi.RaptorSlackProvider; +import org.opentripplanner.utils.lang.IntUtils; /** * This is a calculator to calculate a min-safe-transfer-time. The min-safe-transfer-time is used to diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/OptimizedPathTail.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/OptimizedPathTail.java index b36a7d6ebfd..efe53d8e090 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/OptimizedPathTail.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/OptimizedPathTail.java @@ -1,7 +1,6 @@ package org.opentripplanner.routing.algorithm.transferoptimization.model; import javax.annotation.Nullable; -import org.opentripplanner.framework.tostring.ValueObjectToStringBuilder; import org.opentripplanner.model.transfer.TransferConstraint; import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.raptor.api.model.RaptorStopNameResolver; @@ -16,6 +15,7 @@ import org.opentripplanner.raptor.spi.RaptorSlackProvider; import org.opentripplanner.routing.algorithm.transferoptimization.api.OptimizedPath; import org.opentripplanner.routing.algorithm.transferoptimization.api.TransferOptimized; +import org.opentripplanner.utils.tostring.ValueObjectToStringBuilder; /** * This class is used to decorate a {@link TransitPathLeg} with information about transfers diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/StopPriorityCostCalculator.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/StopPriorityCostCalculator.java index 48a4b733b58..6ea660e654f 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/StopPriorityCostCalculator.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/StopPriorityCostCalculator.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.algorithm.transferoptimization.model; -import org.opentripplanner.framework.lang.IntUtils; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TransitLayer; +import org.opentripplanner.utils.lang.IntUtils; /** * This class calculates an extra stop priority cost by using the stop-board-alight-transfer-cost diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TripStopTime.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TripStopTime.java index 75fd589a45b..27299e407f4 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TripStopTime.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TripStopTime.java @@ -1,8 +1,8 @@ package org.opentripplanner.routing.algorithm.transferoptimization.model; import java.util.Objects; -import org.opentripplanner.framework.tostring.ValueObjectToStringBuilder; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; +import org.opentripplanner.utils.tostring.ValueObjectToStringBuilder; /** * @param The TripSchedule type defined by the user of the raptor API. diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TripToTripTransfer.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TripToTripTransfer.java index 0dce8933e3f..2aa13d0cd16 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TripToTripTransfer.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TripToTripTransfer.java @@ -1,10 +1,10 @@ package org.opentripplanner.routing.algorithm.transferoptimization.model; import javax.annotation.Nullable; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.transfer.ConstrainedTransfer; import org.opentripplanner.raptor.api.model.RaptorTransfer; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * @param The TripSchedule type defined by the user of the raptor API. diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/costfilter/MinCostPathTailFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/costfilter/MinCostPathTailFilter.java index 8de4c8fa847..6b8dbef7f4e 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/costfilter/MinCostPathTailFilter.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/costfilter/MinCostPathTailFilter.java @@ -4,10 +4,10 @@ import java.util.List; import java.util.Set; import java.util.function.ToIntFunction; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; import org.opentripplanner.routing.algorithm.transferoptimization.model.OptimizedPathTail; import org.opentripplanner.routing.algorithm.transferoptimization.model.PathTailFilter; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * This class takes a list of "cost functions" and creates a filter chain for them. The precedence diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughPathTailFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughPathTailFilter.java index 46b1a9020b0..bff656bb940 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughPathTailFilter.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughPathTailFilter.java @@ -7,11 +7,11 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; import org.opentripplanner.raptor.api.request.PassThroughPoint; import org.opentripplanner.routing.algorithm.transferoptimization.model.OptimizedPathTail; import org.opentripplanner.routing.algorithm.transferoptimization.model.PathTailFilter; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Create a filter chain function and find the best combination of transfers for the journey diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransitPathLegSelector.java b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransitPathLegSelector.java index 9e0a4257f57..646939a9ac5 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransitPathLegSelector.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransitPathLegSelector.java @@ -2,10 +2,10 @@ import java.util.HashSet; import java.util.Set; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; import org.opentripplanner.routing.algorithm.transferoptimization.model.OptimizedPathTail; import org.opentripplanner.routing.algorithm.transferoptimization.model.PathTailFilter; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * This class takes a list of transit legs and returns the best leg based on the {@link diff --git a/application/src/main/java/org/opentripplanner/routing/alternativelegs/AlternativeLegs.java b/application/src/main/java/org/opentripplanner/routing/alternativelegs/AlternativeLegs.java index 465ed230884..14dc7ade982 100644 --- a/application/src/main/java/org/opentripplanner/routing/alternativelegs/AlternativeLegs.java +++ b/application/src/main/java/org/opentripplanner/routing/alternativelegs/AlternativeLegs.java @@ -16,7 +16,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.Stream; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.model.Timetable; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.model.plan.Leg; @@ -29,6 +28,7 @@ import org.opentripplanner.transit.model.timetable.TripOnServiceDate; import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.transit.service.TransitService; +import org.opentripplanner.utils.time.ServiceDateUtils; /** * A helper class to fetch previous/next alternative legs for a scheduled transit leg. diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/DebugRaptor.java b/application/src/main/java/org/opentripplanner/routing/api/request/DebugRaptor.java index 0b9ff4f0c30..a0d7bd6de2e 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/DebugRaptor.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/DebugRaptor.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Set; import java.util.regex.Pattern; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/RequestModes.java b/application/src/main/java/org/opentripplanner/routing/api/request/RequestModes.java index 8afb3082e1b..f10686216a8 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/RequestModes.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/RequestModes.java @@ -3,7 +3,7 @@ import static org.opentripplanner.routing.api.request.StreetMode.NOT_SET; import java.util.Objects; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; public class RequestModes { diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java b/application/src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java index 27ecc777050..8e649b3be49 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java @@ -1,6 +1,6 @@ package org.opentripplanner.routing.api.request; -import static org.opentripplanner.framework.time.DurationUtils.durationInSeconds; +import static org.opentripplanner.utils.time.DurationUtils.durationInSeconds; import java.io.Serializable; import java.time.Duration; @@ -14,10 +14,6 @@ import java.util.Objects; import java.util.function.Consumer; import javax.annotation.Nullable; -import org.opentripplanner.framework.collection.ListSection; -import org.opentripplanner.framework.lang.ObjectUtils; -import org.opentripplanner.framework.time.DateUtils; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.model.plan.SortOrder; import org.opentripplanner.model.plan.paging.cursor.PageCursor; @@ -29,6 +25,10 @@ import org.opentripplanner.routing.api.response.RoutingErrorCode; import org.opentripplanner.routing.error.RoutingValidationException; import org.opentripplanner.standalone.config.routerconfig.TransitRoutingConfig; +import org.opentripplanner.utils.collection.ListSection; +import org.opentripplanner.utils.lang.ObjectUtils; +import org.opentripplanner.utils.time.DateUtils; +import org.opentripplanner.utils.tostring.ToStringBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/framework/DurationForEnum.java b/application/src/main/java/org/opentripplanner/routing/api/request/framework/DurationForEnum.java index e6dacaac19d..c6586aa8b0f 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/framework/DurationForEnum.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/framework/DurationForEnum.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.framework.tostring.ValueObjectToStringBuilder; +import org.opentripplanner.utils.tostring.ValueObjectToStringBuilder; /** * This class is used to store a {@link Duration} value for each of the enum type values. diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerialization.java b/application/src/main/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerialization.java index cb9dfb5c4cc..a6c846ccb35 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerialization.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerialization.java @@ -7,10 +7,10 @@ import java.util.function.BiFunction; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.opentripplanner.framework.lang.IntUtils; -import org.opentripplanner.framework.lang.StringUtils; import org.opentripplanner.framework.model.Units; -import org.opentripplanner.framework.time.DurationUtils; +import org.opentripplanner.utils.lang.IntUtils; +import org.opentripplanner.utils.lang.StringUtils; +import org.opentripplanner.utils.time.DurationUtils; /** * This class can serialize and parse a linear function of time/duration/cost on the form diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyForEnum.java b/application/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyForEnum.java index 2f439801cb5..ace9b813937 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyForEnum.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyForEnum.java @@ -7,7 +7,7 @@ import java.util.Objects; import java.util.function.Consumer; import org.opentripplanner.framework.model.TimeAndCost; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * A map of {@link TimeAndCost} indexed by enum type {@code T}. diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/framework/TimePenalty.java b/application/src/main/java/org/opentripplanner/routing/api/request/framework/TimePenalty.java index 3ee07034135..99643b69d02 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/framework/TimePenalty.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/framework/TimePenalty.java @@ -1,8 +1,8 @@ package org.opentripplanner.routing.api.request.framework; import java.time.Duration; -import org.opentripplanner.framework.lang.StringUtils; -import org.opentripplanner.framework.time.DurationUtils; +import org.opentripplanner.utils.lang.StringUtils; +import org.opentripplanner.utils.time.DurationUtils; public final class TimePenalty extends AbstractLinearFunction { diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/AccessEgressPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/AccessEgressPreferences.java index 9998f0a3b1c..42925339fd1 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/AccessEgressPreferences.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/AccessEgressPreferences.java @@ -7,12 +7,12 @@ import java.util.Map; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.routing.api.request.framework.DurationForEnum; import org.opentripplanner.routing.api.request.framework.TimeAndCostPenalty; import org.opentripplanner.routing.api.request.framework.TimeAndCostPenaltyForEnum; import org.opentripplanner.routing.api.request.framework.TimePenalty; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Preferences for access/egress routing on street network diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/AccessibilityPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/AccessibilityPreferences.java index 303bda51858..d4d232ab3f6 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/AccessibilityPreferences.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/AccessibilityPreferences.java @@ -3,7 +3,7 @@ import java.util.Objects; import java.util.function.Consumer; import org.opentripplanner.framework.model.Cost; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Preferences for how to treat trips or stops with accessibility restrictions, like wheelchair diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/BikePreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/BikePreferences.java index 5767b74eaa8..038d6c140da 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/BikePreferences.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/BikePreferences.java @@ -1,17 +1,17 @@ package org.opentripplanner.routing.api.request.preference; -import static org.opentripplanner.framework.lang.DoubleUtils.doubleEquals; -import static org.opentripplanner.framework.lang.ObjectUtils.ifNotNull; import static org.opentripplanner.routing.core.VehicleRoutingOptimizeType.SAFE_STREETS; import static org.opentripplanner.routing.core.VehicleRoutingOptimizeType.TRIANGLE; +import static org.opentripplanner.utils.lang.DoubleUtils.doubleEquals; +import static org.opentripplanner.utils.lang.ObjectUtils.ifNotNull; import java.io.Serializable; import java.util.Objects; import java.util.function.Consumer; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.framework.model.Units; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.core.VehicleRoutingOptimizeType; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * The bike preferences contain all speed, reluctance, cost and factor preferences for biking diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/CarPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/CarPreferences.java index cc9b7ba62d8..3ea3634c623 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/CarPreferences.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/CarPreferences.java @@ -1,15 +1,15 @@ package org.opentripplanner.routing.api.request.preference; -import static org.opentripplanner.framework.lang.ObjectUtils.ifNotNull; +import static org.opentripplanner.utils.lang.ObjectUtils.ifNotNull; import java.io.Serializable; import java.time.Duration; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.framework.lang.DoubleUtils; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.framework.model.Units; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.lang.DoubleUtils; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * The car preferences contain all speed, reluctance, cost and factor preferences for driving diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/ElevatorPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/ElevatorPreferences.java index 7ee6409d7b7..7e5e55d6263 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/ElevatorPreferences.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/ElevatorPreferences.java @@ -5,7 +5,7 @@ import java.util.function.Consumer; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.framework.model.Units; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * TODO: how long does it /really/ take to an elevator? diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterPreferences.java index 31fa7edd139..f18cf5ce9c1 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterPreferences.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterPreferences.java @@ -4,9 +4,9 @@ import java.util.Objects; import java.util.function.Consumer; import org.opentripplanner.framework.model.Units; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.algorithm.filterchain.api.TransitGeneralizedCostFilterParams; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Group by Similarity filter parameters. See the configuration for documentation of each field. diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/RaptorPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/RaptorPreferences.java index 03ed9482ff8..e9318bc8dc3 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/RaptorPreferences.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/RaptorPreferences.java @@ -11,10 +11,10 @@ import java.util.function.Consumer; import javax.annotation.Nullable; import org.opentripplanner.framework.model.Units; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.api.model.SearchDirection; import org.opentripplanner.raptor.api.request.Optimization; import org.opentripplanner.raptor.api.request.RaptorProfile; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Set of optimizations to use with Raptor. These are available here for testing purposes. diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/Relax.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/Relax.java index 8f10ffd1525..a5e61325483 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/Relax.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/Relax.java @@ -1,8 +1,8 @@ package org.opentripplanner.routing.api.request.preference; import java.util.Locale; -import org.opentripplanner.framework.lang.DoubleUtils; -import org.opentripplanner.framework.lang.IntUtils; +import org.opentripplanner.utils.lang.DoubleUtils; +import org.opentripplanner.utils.lang.IntUtils; /** * Relax a value by the given ratio and slack. The relaxed value diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/RoutingPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/RoutingPreferences.java index 5e5475d12ac..5eccc970101 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/RoutingPreferences.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/RoutingPreferences.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.api.request.preference; import static java.util.Objects.requireNonNull; -import static org.opentripplanner.framework.lang.ObjectUtils.ifNotNull; +import static org.opentripplanner.utils.lang.ObjectUtils.ifNotNull; import java.io.Serializable; import java.util.Objects; diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/ScooterPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/ScooterPreferences.java index 1d5cf83a54b..6a20cbcd293 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/ScooterPreferences.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/ScooterPreferences.java @@ -1,16 +1,16 @@ package org.opentripplanner.routing.api.request.preference; -import static org.opentripplanner.framework.lang.DoubleUtils.doubleEquals; -import static org.opentripplanner.framework.lang.ObjectUtils.ifNotNull; import static org.opentripplanner.routing.core.VehicleRoutingOptimizeType.SAFE_STREETS; import static org.opentripplanner.routing.core.VehicleRoutingOptimizeType.TRIANGLE; +import static org.opentripplanner.utils.lang.DoubleUtils.doubleEquals; +import static org.opentripplanner.utils.lang.ObjectUtils.ifNotNull; import java.io.Serializable; import java.util.Objects; import java.util.function.Consumer; import org.opentripplanner.framework.model.Units; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.core.VehicleRoutingOptimizeType; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * The scooter preferences contain all speed, reluctance, cost and factor preferences for scooter diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/StreetPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/StreetPreferences.java index 166c950a0e7..bb526ceaa31 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/StreetPreferences.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/StreetPreferences.java @@ -1,7 +1,6 @@ package org.opentripplanner.routing.api.request.preference; import static java.time.Duration.ofHours; -import static java.time.Duration.ofMinutes; import static java.util.Objects.requireNonNull; import java.io.Serializable; @@ -9,14 +8,13 @@ import java.util.Map; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.framework.lang.DoubleUtils; import org.opentripplanner.framework.model.Units; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.routing.api.request.framework.DurationForEnum; -import org.opentripplanner.routing.api.request.framework.TimeAndCostPenalty; import org.opentripplanner.street.search.intersection_model.DrivingDirection; import org.opentripplanner.street.search.intersection_model.IntersectionTraversalModel; +import org.opentripplanner.utils.lang.DoubleUtils; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * This class holds preferences for street routing in general, not mode specific. diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/SystemPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/SystemPreferences.java index 442ab33434a..f35a65c2f03 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/SystemPreferences.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/SystemPreferences.java @@ -9,8 +9,8 @@ import java.util.Set; import java.util.function.Consumer; import org.opentripplanner.ext.dataoverlay.api.DataOverlayParameters; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.api.request.RoutingTag; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Configure system related features - a system feature is a non-functional feature. It diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/TimeSlopeSafetyTriangle.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/TimeSlopeSafetyTriangle.java index ae4f1039f32..cca9105f112 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/TimeSlopeSafetyTriangle.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/TimeSlopeSafetyTriangle.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.api.request.preference; -import static org.opentripplanner.framework.lang.DoubleUtils.doubleEquals; -import static org.opentripplanner.framework.lang.DoubleUtils.roundTo2Decimals; +import static org.opentripplanner.utils.lang.DoubleUtils.doubleEquals; +import static org.opentripplanner.utils.lang.DoubleUtils.roundTo2Decimals; /** * Sets the (bicycle or scooter) triangle routing parameters -- the relative importance of safety, diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/TransferOptimizationPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/TransferOptimizationPreferences.java index 41a1954603b..7ba6e609ce9 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/TransferOptimizationPreferences.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/TransferOptimizationPreferences.java @@ -1,13 +1,13 @@ package org.opentripplanner.routing.api.request.preference; -import static org.opentripplanner.framework.lang.DoubleUtils.doubleEquals; +import static org.opentripplanner.utils.lang.DoubleUtils.doubleEquals; import java.io.Serializable; import java.util.Objects; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.framework.model.Units; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.algorithm.transferoptimization.api.TransferOptimizationParameters; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * See {@link TransferOptimizationParameters} for documentation on this class. diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/TransferPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/TransferPreferences.java index 464b9872bdd..f996dd5e6f4 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/TransferPreferences.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/TransferPreferences.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.api.request.preference; import static java.util.Objects.requireNonNull; -import static org.opentripplanner.framework.lang.DoubleUtils.doubleEquals; +import static org.opentripplanner.utils.lang.DoubleUtils.doubleEquals; import java.io.Serializable; import java.time.Duration; @@ -9,9 +9,9 @@ import java.util.function.Consumer; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.framework.model.Units; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.algorithm.transferoptimization.api.TransferOptimizationParameters; +import org.opentripplanner.utils.time.DurationUtils; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Parameters for doing transfers between transit legs. diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/TransitPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/TransitPreferences.java index 78f30277e72..f15b47216e5 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/TransitPreferences.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/TransitPreferences.java @@ -7,10 +7,10 @@ import java.util.Objects; import java.util.function.Consumer; import org.opentripplanner.framework.model.Cost; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.routing.api.request.framework.DurationForEnum; import org.opentripplanner.transit.model.basic.TransitMode; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Preferences for transit routing. diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferences.java index f7183812c3a..732171c7b80 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferences.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferences.java @@ -7,9 +7,9 @@ import java.util.Set; import java.util.function.Consumer; import org.opentripplanner.framework.model.Cost; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.api.request.preference.filter.VehicleParkingFilter; import org.opentripplanner.routing.api.request.preference.filter.VehicleParkingSelect; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * The parking preferences contain preferences for car and bicycle parking. These preferences diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferences.java index 6c9bbfea875..4c00014f30d 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferences.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferences.java @@ -7,7 +7,7 @@ import java.util.function.Consumer; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.framework.model.Units; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Preferences for renting a Bike, Car or other type of vehicle. diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferences.java index b7adc04df1c..50b3735a85d 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferences.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferences.java @@ -6,7 +6,7 @@ import java.util.function.Consumer; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.framework.model.Units; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Preferences for walking a vehicle. diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/WalkPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/WalkPreferences.java index 8e5061d752b..4a5969049ba 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/WalkPreferences.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/WalkPreferences.java @@ -1,13 +1,13 @@ package org.opentripplanner.routing.api.request.preference; -import static org.opentripplanner.framework.lang.DoubleUtils.doubleEquals; +import static org.opentripplanner.utils.lang.DoubleUtils.doubleEquals; import java.io.Serializable; import java.util.Objects; import java.util.function.Consumer; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.framework.model.Units; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * The walk preferences contain all speed, reluctance, cost and factor preferences for walking diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/WheelchairPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/WheelchairPreferences.java index 737c5057943..d8a53d8e098 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/WheelchairPreferences.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/WheelchairPreferences.java @@ -6,7 +6,7 @@ import java.util.Objects; import java.util.function.Consumer; import org.opentripplanner.framework.model.Units; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * See the configuration for documentation of each field. diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/filter/VehicleParkingFilter.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/filter/VehicleParkingFilter.java index 3fb6d6b0a62..5f34dc4e1a7 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/filter/VehicleParkingFilter.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/filter/VehicleParkingFilter.java @@ -4,8 +4,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.vehicle_parking.VehicleParking; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * A filter class that checks if parking faclities match certain conditions for diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/request/filter/SelectRequest.java b/application/src/main/java/org/opentripplanner/routing/api/request/request/filter/SelectRequest.java index a1610ed8947..8ae98b8dfc9 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/request/filter/SelectRequest.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/request/filter/SelectRequest.java @@ -4,12 +4,12 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.modes.AllowTransitModeFilter; import org.opentripplanner.transit.model.basic.MainAndSubMode; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.TripTimes; +import org.opentripplanner.utils.tostring.ToStringBuilder; public class SelectRequest implements Serializable { diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitFilterRequest.java b/application/src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitFilterRequest.java index 38f79b82baa..6380ace7c83 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitFilterRequest.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitFilterRequest.java @@ -5,9 +5,9 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.TripTimes; +import org.opentripplanner.utils.tostring.ToStringBuilder; public class TransitFilterRequest implements Serializable, TransitFilter { diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitGroupSelect.java b/application/src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitGroupSelect.java index dfa5daa0e31..caa8c9e0d65 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitGroupSelect.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitGroupSelect.java @@ -5,9 +5,9 @@ import java.util.Comparator; import java.util.List; import java.util.Objects; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Select a given set of transit routes base on the list of diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/via/PassThroughViaLocation.java b/application/src/main/java/org/opentripplanner/routing/api/request/via/PassThroughViaLocation.java index aa75a634004..9da6ae5cd23 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/via/PassThroughViaLocation.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/via/PassThroughViaLocation.java @@ -2,8 +2,8 @@ import java.util.Collection; import javax.annotation.Nullable; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * One of the listed stop locations or one of its children must be visited. An on-board diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/via/VisitViaLocation.java b/application/src/main/java/org/opentripplanner/routing/api/request/via/VisitViaLocation.java index 096fbfabc0b..550b1646aeb 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/via/VisitViaLocation.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/via/VisitViaLocation.java @@ -5,9 +5,9 @@ import java.util.Objects; import javax.annotation.Nullable; import org.opentripplanner.framework.geometry.WgsCoordinate; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.utils.time.DurationUtils; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * A visit-via-location is a physical visit to one of the stops or coordinates listed. An on-board diff --git a/application/src/main/java/org/opentripplanner/routing/api/response/RoutingError.java b/application/src/main/java/org/opentripplanner/routing/api/response/RoutingError.java index 2c948e1777c..d5c8173f09e 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/response/RoutingError.java +++ b/application/src/main/java/org/opentripplanner/routing/api/response/RoutingError.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.api.response; import java.util.Objects; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; public class RoutingError { diff --git a/application/src/main/java/org/opentripplanner/routing/api/response/RoutingResponse.java b/application/src/main/java/org/opentripplanner/routing/api/response/RoutingResponse.java index f7bcaca72e2..fe9f6457cf4 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/response/RoutingResponse.java +++ b/application/src/main/java/org/opentripplanner/routing/api/response/RoutingResponse.java @@ -1,10 +1,10 @@ package org.opentripplanner.routing.api.response; import java.util.List; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.plan.TripPlan; import org.opentripplanner.model.plan.paging.cursor.PageCursor; import org.opentripplanner.routing.framework.DebugTimingAggregator; +import org.opentripplanner.utils.tostring.ToStringBuilder; public class RoutingResponse { diff --git a/application/src/main/java/org/opentripplanner/routing/api/response/TripSearchMetadata.java b/application/src/main/java/org/opentripplanner/routing/api/response/TripSearchMetadata.java index a5eb5842f23..704a1cb8e18 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/response/TripSearchMetadata.java +++ b/application/src/main/java/org/opentripplanner/routing/api/response/TripSearchMetadata.java @@ -4,7 +4,7 @@ import java.time.Instant; import java.time.temporal.ChronoUnit; import javax.annotation.Nullable; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Meta-data about the trip search performed. diff --git a/application/src/main/java/org/opentripplanner/routing/graph/SerializedGraphObject.java b/application/src/main/java/org/opentripplanner/routing/graph/SerializedGraphObject.java index e7e0c3248e8..0843124131b 100644 --- a/application/src/main/java/org/opentripplanner/routing/graph/SerializedGraphObject.java +++ b/application/src/main/java/org/opentripplanner/routing/graph/SerializedGraphObject.java @@ -21,8 +21,6 @@ import org.opentripplanner.ext.stopconsolidation.StopConsolidationRepository; import org.opentripplanner.framework.application.OtpAppException; import org.opentripplanner.framework.geometry.CompactElevationProfile; -import org.opentripplanner.framework.lang.OtpNumberFormat; -import org.opentripplanner.framework.logging.ProgressTracker; import org.opentripplanner.graph_builder.issue.api.DataImportIssueSummary; import org.opentripplanner.model.projectinfo.GraphFileHeader; import org.opentripplanner.model.projectinfo.OtpProjectInfo; @@ -36,6 +34,8 @@ import org.opentripplanner.transit.model.basic.SubMode; import org.opentripplanner.transit.model.network.RoutingTripPattern; import org.opentripplanner.transit.service.TimetableRepository; +import org.opentripplanner.utils.lang.OtpNumberFormat; +import org.opentripplanner.utils.logging.ProgressTracker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/routing/graph/index/StreetIndex.java b/application/src/main/java/org/opentripplanner/routing/graph/index/StreetIndex.java index 90294d554cc..b632cd5c3e9 100644 --- a/application/src/main/java/org/opentripplanner/routing/graph/index/StreetIndex.java +++ b/application/src/main/java/org/opentripplanner/routing/graph/index/StreetIndex.java @@ -19,7 +19,6 @@ import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.LocalizedString; import org.opentripplanner.framework.i18n.NonLocalizedString; -import org.opentripplanner.framework.logging.ProgressTracker; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.routing.graph.Graph; @@ -42,6 +41,7 @@ import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.service.SiteRepository; +import org.opentripplanner.utils.logging.ProgressTracker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/routing/graphfinder/PatternAtStop.java b/application/src/main/java/org/opentripplanner/routing/graphfinder/PatternAtStop.java index a8602a77737..c06e8bbcf91 100644 --- a/application/src/main/java/org/opentripplanner/routing/graphfinder/PatternAtStop.java +++ b/application/src/main/java/org/opentripplanner/routing/graphfinder/PatternAtStop.java @@ -6,13 +6,13 @@ import java.util.Base64; import java.util.List; import java.util.Objects; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.routing.stoptimes.ArrivalDeparture; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.service.TransitService; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * A reference to a pattern at a specific stop. diff --git a/application/src/main/java/org/opentripplanner/routing/graphfinder/StopFinderTraverseVisitor.java b/application/src/main/java/org/opentripplanner/routing/graphfinder/StopFinderTraverseVisitor.java index 5c75e8c9322..854e33831ae 100644 --- a/application/src/main/java/org/opentripplanner/routing/graphfinder/StopFinderTraverseVisitor.java +++ b/application/src/main/java/org/opentripplanner/routing/graphfinder/StopFinderTraverseVisitor.java @@ -4,11 +4,11 @@ import java.util.List; import org.opentripplanner.astar.spi.SkipEdgeStrategy; import org.opentripplanner.astar.spi.TraverseVisitor; -import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.vertex.TransitStopVertex; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.state.State; +import org.opentripplanner.utils.collection.ListUtils; /** * A TraverseVisitor used in finding stops while walking the street graph. diff --git a/application/src/main/java/org/opentripplanner/routing/service/DefaultRoutingService.java b/application/src/main/java/org/opentripplanner/routing/service/DefaultRoutingService.java index 01736aac80e..5f654d39deb 100644 --- a/application/src/main/java/org/opentripplanner/routing/service/DefaultRoutingService.java +++ b/application/src/main/java/org/opentripplanner/routing/service/DefaultRoutingService.java @@ -3,7 +3,6 @@ import java.time.ZoneId; import org.opentripplanner.framework.application.OTPRequestTimeoutException; import org.opentripplanner.framework.time.ZoneIdFallback; -import org.opentripplanner.framework.tostring.MultiLineToStringBuilder; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.routing.algorithm.RoutingWorker; import org.opentripplanner.routing.algorithm.via.ViaRoutingWorker; @@ -13,6 +12,7 @@ import org.opentripplanner.routing.api.response.RoutingResponse; import org.opentripplanner.routing.api.response.ViaRoutingResponse; import org.opentripplanner.standalone.api.OtpServerRequestContext; +import org.opentripplanner.utils.tostring.MultiLineToStringBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/routing/stoptimes/StopTimesHelper.java b/application/src/main/java/org/opentripplanner/routing/stoptimes/StopTimesHelper.java index f11d92465a7..863e2fc6569 100644 --- a/application/src/main/java/org/opentripplanner/routing/stoptimes/StopTimesHelper.java +++ b/application/src/main/java/org/opentripplanner/routing/stoptimes/StopTimesHelper.java @@ -14,7 +14,6 @@ import java.util.Comparator; import java.util.List; import java.util.Queue; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTimesInPattern; import org.opentripplanner.model.Timetable; @@ -24,6 +23,7 @@ import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.transit.service.TransitService; +import org.opentripplanner.utils.time.ServiceDateUtils; public class StopTimesHelper { diff --git a/application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParking.java b/application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParking.java index 098af909296..4e71ecd1c68 100644 --- a/application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParking.java +++ b/application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParking.java @@ -9,10 +9,10 @@ import javax.annotation.Nullable; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.calendar.openinghours.OHCalendar; import org.opentripplanner.street.search.TraverseMode; import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Vehicle parking locations, which may allow bicycle and/or car parking. diff --git a/application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingEntrance.java b/application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingEntrance.java index b91776b0265..f6bc584fb18 100644 --- a/application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingEntrance.java +++ b/application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingEntrance.java @@ -5,9 +5,9 @@ import javax.annotation.Nullable; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.street.model.vertex.StreetVertex; import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.utils.tostring.ToStringBuilder; public class VehicleParkingEntrance implements Serializable { diff --git a/application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingGroup.java b/application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingGroup.java index 535f201a0de..74ffedc0dcb 100644 --- a/application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingGroup.java +++ b/application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingGroup.java @@ -4,8 +4,8 @@ import javax.annotation.Nullable; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Group of vehicle parking locations. diff --git a/application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingSpaces.java b/application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingSpaces.java index 8b21cc21f2c..eb50440651b 100644 --- a/application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingSpaces.java +++ b/application/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingSpaces.java @@ -2,7 +2,7 @@ import java.io.Serializable; import java.util.Objects; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * The number of spaces by type. {@code null} if unknown. diff --git a/application/src/main/java/org/opentripplanner/service/paging/PagingService.java b/application/src/main/java/org/opentripplanner/service/paging/PagingService.java index 3aa8033105a..b9a11ab5ffa 100644 --- a/application/src/main/java/org/opentripplanner/service/paging/PagingService.java +++ b/application/src/main/java/org/opentripplanner/service/paging/PagingService.java @@ -5,7 +5,6 @@ import java.util.List; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.SortOrder; import org.opentripplanner.model.plan.paging.PagingSearchWindowAdjuster; @@ -14,6 +13,7 @@ import org.opentripplanner.model.plan.paging.cursor.PageCursorInput; import org.opentripplanner.model.plan.paging.cursor.PageType; import org.opentripplanner.routing.api.response.TripSearchMetadata; +import org.opentripplanner.utils.tostring.ToStringBuilder; public class PagingService { diff --git a/application/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStation.java b/application/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStation.java index d6e72023a31..ff17ee00593 100644 --- a/application/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStation.java +++ b/application/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStation.java @@ -9,10 +9,10 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.framework.collection.SetUtils; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.street.model.RentalFormFactor; import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.utils.collection.SetUtils; /** * Implements the {@link VehicleRentalPlace} class which contains Javadoc. diff --git a/application/src/main/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelope.java b/application/src/main/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelope.java index 27a1fb4d30f..55024b63982 100644 --- a/application/src/main/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelope.java +++ b/application/src/main/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelope.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.Optional; import org.opentripplanner.framework.geometry.WgsCoordinate; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * This class calculates borders of envelopes that can be also on 180th meridian. diff --git a/application/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java index ef2931b987e..16c6f1e722c 100644 --- a/application/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java +++ b/application/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java @@ -23,7 +23,6 @@ import org.opentripplanner.ext.emissions.EmissionsConfig; import org.opentripplanner.ext.fares.FaresConfiguration; import org.opentripplanner.framework.geometry.CompactElevationProfile; -import org.opentripplanner.framework.lang.ObjectUtils; import org.opentripplanner.graph_builder.module.ned.parameter.DemExtractParameters; import org.opentripplanner.graph_builder.module.ned.parameter.DemExtractParametersList; import org.opentripplanner.graph_builder.module.osm.parameters.OsmExtractParameters; @@ -46,6 +45,7 @@ import org.opentripplanner.standalone.config.framework.json.NodeAdapter; import org.opentripplanner.standalone.config.sandbox.DataOverlayConfigMapper; import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.utils.lang.ObjectUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/standalone/config/framework/json/ConfigType.java b/application/src/main/java/org/opentripplanner/standalone/config/framework/json/ConfigType.java index fec5cb05a51..3796fcac645 100644 --- a/application/src/main/java/org/opentripplanner/standalone/config/framework/json/ConfigType.java +++ b/application/src/main/java/org/opentripplanner/standalone/config/framework/json/ConfigType.java @@ -6,9 +6,9 @@ import java.util.EnumSet; import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.opentripplanner.framework.lang.StringUtils; -import org.opentripplanner.framework.text.MarkdownFormatter; -import org.opentripplanner.framework.time.DurationUtils; +import org.opentripplanner.utils.lang.StringUtils; +import org.opentripplanner.utils.text.MarkdownFormatter; +import org.opentripplanner.utils.time.DurationUtils; /** * These are the types we support in the NodeAdaptor diff --git a/application/src/main/java/org/opentripplanner/standalone/config/framework/json/EnumMapper.java b/application/src/main/java/org/opentripplanner/standalone/config/framework/json/EnumMapper.java index c57220c41d5..c39c2ef7377 100644 --- a/application/src/main/java/org/opentripplanner/standalone/config/framework/json/EnumMapper.java +++ b/application/src/main/java/org/opentripplanner/standalone/config/framework/json/EnumMapper.java @@ -3,7 +3,7 @@ import java.util.Arrays; import java.util.Optional; import org.opentripplanner.framework.doc.DocumentedEnum; -import org.opentripplanner.framework.lang.StringUtils; +import org.opentripplanner.utils.lang.StringUtils; /** * This converts strings appearing in configuration files into enum values. diff --git a/application/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeInfo.java b/application/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeInfo.java index ce29639b924..b9db7fb75c8 100644 --- a/application/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeInfo.java +++ b/application/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeInfo.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.framework.lang.StringUtils; -import org.opentripplanner.framework.tostring.ValueObjectToStringBuilder; +import org.opentripplanner.utils.lang.StringUtils; +import org.opentripplanner.utils.tostring.ValueObjectToStringBuilder; /** * Information about a configuration parameter. diff --git a/application/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java b/application/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java index 0afca602872..784d381a2e6 100644 --- a/application/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java +++ b/application/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java @@ -36,11 +36,11 @@ import java.util.function.Function; import java.util.regex.Pattern; import org.opentripplanner.framework.application.OtpAppException; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.time.LocalDateUtils; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.routing.api.request.framework.TimePenalty; import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.utils.time.DurationUtils; +import org.opentripplanner.utils.time.LocalDateUtils; /** * TODO RT_AB: add Javadoc to clarify whether this is building a declarative representation of the diff --git a/application/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/application/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java index dc91388458a..d05aee96ccf 100644 --- a/application/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java +++ b/application/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java @@ -18,7 +18,6 @@ import java.util.stream.Collectors; import org.opentripplanner.api.parameter.QualifiedModeSet; import org.opentripplanner.framework.application.OTPFeature; -import org.opentripplanner.framework.lang.StringUtils; import org.opentripplanner.routing.api.request.RequestModes; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.StreetMode; @@ -35,6 +34,7 @@ import org.opentripplanner.standalone.config.framework.json.NodeAdapter; import org.opentripplanner.standalone.config.sandbox.DataOverlayParametersMapper; import org.opentripplanner.transit.model.basic.TransitMode; +import org.opentripplanner.utils.lang.StringUtils; public class RouteRequestConfig { diff --git a/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java b/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java index 979467299cd..279c3c48368 100644 --- a/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java +++ b/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java @@ -8,7 +8,6 @@ import org.opentripplanner.ext.stopconsolidation.StopConsolidationRepository; import org.opentripplanner.framework.application.LogMDCSupport; import org.opentripplanner.framework.application.OTPFeature; -import org.opentripplanner.framework.logging.ProgressTracker; import org.opentripplanner.graph_builder.GraphBuilder; import org.opentripplanner.graph_builder.GraphBuilderDataSources; import org.opentripplanner.graph_builder.issue.api.DataImportIssueSummary; @@ -35,6 +34,7 @@ import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.TimetableRepository; import org.opentripplanner.updater.configure.UpdaterConfigurator; +import org.opentripplanner.utils.logging.ProgressTracker; import org.opentripplanner.visualizer.GraphVisualizer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/standalone/server/EtagRequestFilter.java b/application/src/main/java/org/opentripplanner/standalone/server/EtagRequestFilter.java index 65cdec32a7d..b53739084ae 100644 --- a/application/src/main/java/org/opentripplanner/standalone/server/EtagRequestFilter.java +++ b/application/src/main/java/org/opentripplanner/standalone/server/EtagRequestFilter.java @@ -10,7 +10,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import org.apache.hc.core5.http.HttpStatus; -import org.opentripplanner.framework.text.HexString; +import org.opentripplanner.utils.text.HexString; public class EtagRequestFilter implements ContainerResponseFilter { diff --git a/application/src/main/java/org/opentripplanner/standalone/server/RequestTraceFilter.java b/application/src/main/java/org/opentripplanner/standalone/server/RequestTraceFilter.java index 8ee2e6bbd27..31d2745913b 100644 --- a/application/src/main/java/org/opentripplanner/standalone/server/RequestTraceFilter.java +++ b/application/src/main/java/org/opentripplanner/standalone/server/RequestTraceFilter.java @@ -12,7 +12,7 @@ import java.util.Random; import java.util.regex.Pattern; import org.opentripplanner.framework.application.LogMDCSupport; -import org.opentripplanner.framework.lang.StringUtils; +import org.opentripplanner.utils.lang.StringUtils; /** * This filter manages OTP request trace parameters. A trace parameter can be read from the diff --git a/application/src/main/java/org/opentripplanner/standalone/server/RequestTraceParameter.java b/application/src/main/java/org/opentripplanner/standalone/server/RequestTraceParameter.java index 98abe8c8091..6e1b3286dcc 100644 --- a/application/src/main/java/org/opentripplanner/standalone/server/RequestTraceParameter.java +++ b/application/src/main/java/org/opentripplanner/standalone/server/RequestTraceParameter.java @@ -1,6 +1,6 @@ package org.opentripplanner.standalone.server; -import org.opentripplanner.framework.lang.StringUtils; +import org.opentripplanner.utils.lang.StringUtils; /** * OTP supports tracing user requests across log events and "outside" services. It does so by diff --git a/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorBoardEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorBoardEdge.java index 81856476f2e..9bf0d67afa5 100644 --- a/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorBoardEdge.java +++ b/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorBoardEdge.java @@ -6,7 +6,6 @@ import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.NonLocalizedString; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.street.model.vertex.ElevatorOffboardVertex; import org.opentripplanner.street.model.vertex.ElevatorOnboardVertex; import org.opentripplanner.street.search.state.State; diff --git a/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorHopEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorHopEdge.java index 4acecd05a64..75eddb53777 100644 --- a/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorHopEdge.java +++ b/application/src/main/java/org/opentripplanner/street/model/edge/ElevatorHopEdge.java @@ -1,7 +1,6 @@ package org.opentripplanner.street.model.edge; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.api.request.preference.RoutingPreferences; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.vertex.Vertex; diff --git a/application/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java b/application/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java index 505d2a95a3a..fbd4173b68c 100644 --- a/application/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java +++ b/application/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java @@ -17,8 +17,6 @@ import org.opentripplanner.framework.geometry.SphericalDistanceLibrary; import org.opentripplanner.framework.geometry.SplitLineString; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.framework.lang.BitSetUtils; -import org.opentripplanner.framework.lang.IntUtils; import org.opentripplanner.routing.api.request.preference.RoutingPreferences; import org.opentripplanner.routing.linking.DisposableEdgeCollection; import org.opentripplanner.routing.linking.LinkingDirection; @@ -36,6 +34,8 @@ import org.opentripplanner.street.search.state.State; import org.opentripplanner.street.search.state.StateEditor; import org.opentripplanner.street.search.state.VehicleRentalState; +import org.opentripplanner.utils.lang.BitSetUtils; +import org.opentripplanner.utils.lang.IntUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeBuilder.java b/application/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeBuilder.java index b3173b7bed5..99a02205eb6 100644 --- a/application/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeBuilder.java +++ b/application/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeBuilder.java @@ -14,10 +14,10 @@ import org.locationtech.jts.geom.LineString; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.NonLocalizedString; -import org.opentripplanner.framework.lang.BitSetUtils; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.vertex.StreetVertex; import org.opentripplanner.street.search.TraverseMode; +import org.opentripplanner.utils.lang.BitSetUtils; public class StreetEdgeBuilder> { diff --git a/application/src/main/java/org/opentripplanner/street/model/edge/StreetElevationExtension.java b/application/src/main/java/org/opentripplanner/street/model/edge/StreetElevationExtension.java index 65ab72093ef..d741fb0a763 100644 --- a/application/src/main/java/org/opentripplanner/street/model/edge/StreetElevationExtension.java +++ b/application/src/main/java/org/opentripplanner/street/model/edge/StreetElevationExtension.java @@ -3,7 +3,7 @@ import java.io.Serializable; import org.locationtech.jts.geom.impl.PackedCoordinateSequence; import org.opentripplanner.framework.geometry.CompactElevationProfile; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; public class StreetElevationExtension implements Serializable { diff --git a/application/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java b/application/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java index 92897232700..5a62eda0f90 100644 --- a/application/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java +++ b/application/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java @@ -4,7 +4,6 @@ import org.locationtech.jts.geom.LineString; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.api.request.preference.RoutingPreferences; import org.opentripplanner.street.model.vertex.StreetVertex; import org.opentripplanner.street.model.vertex.Vertex; diff --git a/application/src/main/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLink.java b/application/src/main/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLink.java index e8fbae31b5f..682aeca0b3e 100644 --- a/application/src/main/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLink.java +++ b/application/src/main/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLink.java @@ -3,7 +3,6 @@ import org.locationtech.jts.geom.LineString; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.api.request.preference.VehicleParkingPreferences; import org.opentripplanner.routing.vehicle_parking.VehicleParking; import org.opentripplanner.street.model.vertex.StreetVertex; diff --git a/application/src/main/java/org/opentripplanner/street/model/note/StreetNoteAndMatcher.java b/application/src/main/java/org/opentripplanner/street/model/note/StreetNoteAndMatcher.java index 84d775aca3b..953645c46bc 100644 --- a/application/src/main/java/org/opentripplanner/street/model/note/StreetNoteAndMatcher.java +++ b/application/src/main/java/org/opentripplanner/street/model/note/StreetNoteAndMatcher.java @@ -2,7 +2,7 @@ import java.io.Serializable; import java.util.Objects; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * A container for a pair (note and note matcher). diff --git a/application/src/main/java/org/opentripplanner/street/model/vertex/IntersectionVertex.java b/application/src/main/java/org/opentripplanner/street/model/vertex/IntersectionVertex.java index baea576a85f..2a8582cbaab 100644 --- a/application/src/main/java/org/opentripplanner/street/model/vertex/IntersectionVertex.java +++ b/application/src/main/java/org/opentripplanner/street/model/vertex/IntersectionVertex.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.framework.lang.BitSetUtils; +import org.opentripplanner.utils.lang.BitSetUtils; /** * Represents an ordinary location in space, typically an intersection. diff --git a/application/src/main/java/org/opentripplanner/street/model/vertex/OsmBoardingLocationVertex.java b/application/src/main/java/org/opentripplanner/street/model/vertex/OsmBoardingLocationVertex.java index 8ba8b25c2b2..8d89ebbe8e0 100644 --- a/application/src/main/java/org/opentripplanner/street/model/vertex/OsmBoardingLocationVertex.java +++ b/application/src/main/java/org/opentripplanner/street/model/vertex/OsmBoardingLocationVertex.java @@ -5,7 +5,7 @@ import java.util.Set; import javax.annotation.Nullable; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * A vertex for an OSM node that represents a transit stop and has a tag to cross-reference this to diff --git a/application/src/main/java/org/opentripplanner/street/search/state/State.java b/application/src/main/java/org/opentripplanner/street/search/state/State.java index 6c7f342cad6..9413cbcbd57 100644 --- a/application/src/main/java/org/opentripplanner/street/search/state/State.java +++ b/application/src/main/java/org/opentripplanner/street/search/state/State.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.search.state; -import static org.opentripplanner.framework.lang.ObjectUtils.requireNotInitialized; +import static org.opentripplanner.utils.lang.ObjectUtils.requireNotInitialized; import java.time.Instant; import java.util.ArrayList; @@ -11,7 +11,6 @@ import javax.annotation.Nullable; import org.opentripplanner.astar.spi.AStarState; import org.opentripplanner.ext.dataoverlay.routing.DataOverlayContext; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.api.request.preference.RoutingPreferences; import org.opentripplanner.service.vehiclerental.street.VehicleRentalEdge; import org.opentripplanner.service.vehiclerental.street.VehicleRentalPlaceVertex; @@ -21,6 +20,7 @@ import org.opentripplanner.street.search.TraverseMode; import org.opentripplanner.street.search.intersection_model.IntersectionTraversalCalculator; import org.opentripplanner.street.search.request.StreetSearchRequest; +import org.opentripplanner.utils.tostring.ToStringBuilder; public class State implements AStarState, Cloneable { diff --git a/application/src/main/java/org/opentripplanner/transit/api/request/TripOnServiceDateRequest.java b/application/src/main/java/org/opentripplanner/transit/api/request/TripOnServiceDateRequest.java index 6735dc1db29..adc7283ee4d 100644 --- a/application/src/main/java/org/opentripplanner/transit/api/request/TripOnServiceDateRequest.java +++ b/application/src/main/java/org/opentripplanner/transit/api/request/TripOnServiceDateRequest.java @@ -2,9 +2,9 @@ import java.time.LocalDate; import java.util.List; -import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.timetable.TripAlteration; +import org.opentripplanner.utils.collection.ListUtils; /* * A request for trips on a specific service date. diff --git a/application/src/main/java/org/opentripplanner/transit/model/basic/Money.java b/application/src/main/java/org/opentripplanner/transit/model/basic/Money.java index de1c6647b6b..97d6f91be5a 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/basic/Money.java +++ b/application/src/main/java/org/opentripplanner/transit/model/basic/Money.java @@ -8,7 +8,7 @@ import java.util.Locale; import java.util.Objects; import java.util.function.Function; -import org.opentripplanner.framework.lang.IntUtils; +import org.opentripplanner.utils.lang.IntUtils; /** * Represents an amount of money. diff --git a/application/src/main/java/org/opentripplanner/transit/model/framework/Deduplicator.java b/application/src/main/java/org/opentripplanner/transit/model/framework/Deduplicator.java index 587ad2871cd..69b5385ad86 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/framework/Deduplicator.java +++ b/application/src/main/java/org/opentripplanner/transit/model/framework/Deduplicator.java @@ -14,7 +14,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Nullable; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Does the same thing as String.intern, but for several different types. Java's String.intern uses diff --git a/application/src/main/java/org/opentripplanner/transit/model/framework/FeedScopedId.java b/application/src/main/java/org/opentripplanner/transit/model/framework/FeedScopedId.java index bdb09cb0db8..be12be83548 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/framework/FeedScopedId.java +++ b/application/src/main/java/org/opentripplanner/transit/model/framework/FeedScopedId.java @@ -1,12 +1,12 @@ package org.opentripplanner.transit.model.framework; -import static org.opentripplanner.framework.lang.StringUtils.assertHasValue; +import static org.opentripplanner.utils.lang.StringUtils.assertHasValue; import java.io.Serializable; import java.util.Arrays; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.framework.lang.StringUtils; +import org.opentripplanner.utils.lang.StringUtils; public final class FeedScopedId implements Serializable, Comparable { diff --git a/application/src/main/java/org/opentripplanner/transit/model/network/Route.java b/application/src/main/java/org/opentripplanner/transit/model/network/Route.java index bd868fba10d..1daae1e6209 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/network/Route.java +++ b/application/src/main/java/org/opentripplanner/transit/model/network/Route.java @@ -9,7 +9,6 @@ import java.util.Objects; import javax.annotation.Nullable; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.framework.lang.IntUtils; import org.opentripplanner.transit.model.basic.SubMode; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; @@ -18,6 +17,7 @@ import org.opentripplanner.transit.model.organization.Agency; import org.opentripplanner.transit.model.organization.Branding; import org.opentripplanner.transit.model.organization.Operator; +import org.opentripplanner.utils.lang.IntUtils; public final class Route extends AbstractTransitEntity implements LogInfo { diff --git a/application/src/main/java/org/opentripplanner/transit/model/network/StopPattern.java b/application/src/main/java/org/opentripplanner/transit/model/network/StopPattern.java index 7395d28419f..9df095d5170 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/network/StopPattern.java +++ b/application/src/main/java/org/opentripplanner/transit/model/network/StopPattern.java @@ -9,13 +9,13 @@ import java.util.Optional; import java.util.function.Predicate; import javax.annotation.Nullable; -import org.opentripplanner.framework.lang.MemEfficientArrayBuilder; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.Station; import org.opentripplanner.transit.model.site.StopLocation; +import org.opentripplanner.utils.lang.MemEfficientArrayBuilder; /** * This class represents what is called a JourneyPattern in Transmodel: the sequence of stops at diff --git a/application/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java b/application/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java index becf1686733..88d48d741f3 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java +++ b/application/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java @@ -1,7 +1,7 @@ package org.opentripplanner.transit.model.network; import static java.util.Objects.requireNonNull; -import static org.opentripplanner.framework.lang.ObjectUtils.requireNotInitialized; +import static org.opentripplanner.utils.lang.ObjectUtils.requireNotInitialized; import java.util.ArrayList; import java.util.Collection; diff --git a/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java index 048b2279a88..e8172cdf546 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java +++ b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java @@ -7,12 +7,12 @@ import java.util.Collection; import java.util.List; import java.util.stream.Stream; -import org.opentripplanner.framework.lang.ArrayUtils; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.routing.api.request.request.filter.TransitGroupSelect; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.Trip; +import org.opentripplanner.utils.lang.ArrayUtils; /** * This class dynamically builds an index of transit-group-ids from the provided diff --git a/application/src/main/java/org/opentripplanner/transit/model/organization/Agency.java b/application/src/main/java/org/opentripplanner/transit/model/organization/Agency.java index 4d82ab05e57..dc684511ca1 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/organization/Agency.java +++ b/application/src/main/java/org/opentripplanner/transit/model/organization/Agency.java @@ -1,7 +1,7 @@ /* This file is based on code copied from project OneBusAway, see the LICENSE file for further information. */ package org.opentripplanner.transit.model.organization; -import static org.opentripplanner.framework.lang.StringUtils.assertHasValue; +import static org.opentripplanner.utils.lang.StringUtils.assertHasValue; import java.time.ZoneId; import java.util.Objects; diff --git a/application/src/main/java/org/opentripplanner/transit/model/organization/ContactInfo.java b/application/src/main/java/org/opentripplanner/transit/model/organization/ContactInfo.java index 01ad5047510..d54b38dba24 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/organization/ContactInfo.java +++ b/application/src/main/java/org/opentripplanner/transit/model/organization/ContactInfo.java @@ -2,8 +2,8 @@ import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.transit.model.framework.TransitObject; +import org.opentripplanner.utils.tostring.ToStringBuilder; public class ContactInfo implements TransitObject { diff --git a/application/src/main/java/org/opentripplanner/transit/model/organization/Operator.java b/application/src/main/java/org/opentripplanner/transit/model/organization/Operator.java index 399b726602f..35461fd7498 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/organization/Operator.java +++ b/application/src/main/java/org/opentripplanner/transit/model/organization/Operator.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.organization; -import static org.opentripplanner.framework.lang.StringUtils.assertHasValue; +import static org.opentripplanner.utils.lang.StringUtils.assertHasValue; import java.util.Objects; import javax.annotation.Nullable; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java b/application/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java index d9c79732970..ecd0cf440b6 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java @@ -8,12 +8,12 @@ import org.locationtech.jts.geom.Geometry; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.framework.lang.ObjectUtils; import org.opentripplanner.transit.model.basic.Accessibility; import org.opentripplanner.transit.model.basic.SubMode; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.framework.LogInfo; +import org.opentripplanner.utils.lang.ObjectUtils; /** * A StopLocation describes a place where a vehicle can be boarded or alighted, which is not diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/StopLocationsGroup.java b/application/src/main/java/org/opentripplanner/transit/model/site/StopLocationsGroup.java index 3536f59e9b6..4158828e9a4 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/StopLocationsGroup.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/StopLocationsGroup.java @@ -3,9 +3,9 @@ import java.util.Collection; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.framework.lang.ObjectUtils; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.framework.LogInfo; +import org.opentripplanner.utils.lang.ObjectUtils; /** * A grouping of Stops referred to by the same name. No actual boarding or alighting happens at this diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimes.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimes.java index 3cae0c1678b..9a7298cd15e 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimes.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimes.java @@ -13,14 +13,14 @@ import javax.annotation.Nullable; import org.opentripplanner.framework.error.OtpError; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.framework.lang.IntUtils; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.time.TimeUtils; 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; +import org.opentripplanner.utils.lang.IntUtils; +import org.opentripplanner.utils.time.DurationUtils; +import org.opentripplanner.utils.time.TimeUtils; /** * Regular/planed/scheduled read-only version of {@link TripTimes}. The set of static diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesBuilder.java index 200afc27e8d..acca4a6a526 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesBuilder.java @@ -4,9 +4,9 @@ import java.util.List; import javax.annotation.Nullable; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.transit.model.framework.DeduplicatorService; import org.opentripplanner.transit.model.timetable.booking.BookingInfo; +import org.opentripplanner.utils.time.TimeUtils; public class ScheduledTripTimesBuilder { diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/Trip.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/Trip.java index 6e829e15866..c9bacc3a298 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/Trip.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/Trip.java @@ -3,12 +3,11 @@ import static java.util.Objects.requireNonNull; import static java.util.Objects.requireNonNullElse; -import static org.opentripplanner.framework.lang.ObjectUtils.ifNotNull; +import static org.opentripplanner.utils.lang.ObjectUtils.ifNotNull; import java.util.Objects; import javax.annotation.Nullable; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.framework.lang.StringUtils; import org.opentripplanner.transit.model.basic.Accessibility; import org.opentripplanner.transit.model.basic.SubMode; import org.opentripplanner.transit.model.basic.TransitMode; @@ -18,6 +17,7 @@ import org.opentripplanner.transit.model.network.BikeAccess; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.organization.Operator; +import org.opentripplanner.utils.lang.StringUtils; /** * A Trip represents the movement of a public transport vehicle on a given {@link Route}, using a diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimesStringBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimesStringBuilder.java index a5e77037dea..143cb59ff31 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimesStringBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimesStringBuilder.java @@ -1,8 +1,8 @@ package org.opentripplanner.transit.model.timetable; import java.util.ArrayList; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.transit.model.network.TripPattern; +import org.opentripplanner.utils.time.TimeUtils; public class TripTimesStringBuilder { diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfo.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfo.java index 3e23696b65a..b21543b717c 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfo.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfo.java @@ -4,8 +4,8 @@ import java.time.Duration; import java.util.EnumSet; import javax.annotation.Nullable; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.transit.model.organization.ContactInfo; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * Info about how a trip might be booked at a particular stop. All of this is pass-through diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingTime.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingTime.java index 8034fe07388..d0f1558e0d4 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingTime.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingTime.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.time.LocalTime; import java.util.Objects; -import org.opentripplanner.framework.time.TimeUtils; +import org.opentripplanner.utils.time.TimeUtils; /** * Represents either the earliest or latest time a trip can be booked relative to the departure day diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java index 8dad53a0bde..471cff394e2 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java @@ -3,7 +3,7 @@ import java.time.Duration; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * This is the contract between booking info and the router. The router will enforce diff --git a/application/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java b/application/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java index 2ce99e7809b..5f7cfa95524 100644 --- a/application/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java +++ b/application/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java @@ -22,7 +22,6 @@ import org.locationtech.jts.geom.Envelope; import org.opentripplanner.ext.flex.FlexIndex; import org.opentripplanner.framework.application.OTPRequestTimeoutException; -import org.opentripplanner.framework.collection.CollectionsView; import org.opentripplanner.model.FeedInfo; import org.opentripplanner.model.PathTransfer; import org.opentripplanner.model.StopTimesInPattern; @@ -59,6 +58,7 @@ import org.opentripplanner.transit.model.timetable.TripIdAndServiceDate; import org.opentripplanner.transit.model.timetable.TripOnServiceDate; import org.opentripplanner.updater.GraphUpdaterStatus; +import org.opentripplanner.utils.collection.CollectionsView; /** * Default implementation of the Transit Service and Transit Editor Service. diff --git a/application/src/main/java/org/opentripplanner/transit/service/SiteRepository.java b/application/src/main/java/org/opentripplanner/transit/service/SiteRepository.java index 6c9d591933a..a2a4adea931 100644 --- a/application/src/main/java/org/opentripplanner/transit/service/SiteRepository.java +++ b/application/src/main/java/org/opentripplanner/transit/service/SiteRepository.java @@ -8,8 +8,6 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.Nullable; import org.locationtech.jts.geom.Envelope; -import org.opentripplanner.framework.collection.CollectionsView; -import org.opentripplanner.framework.collection.MapUtils; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.site.AreaStop; @@ -20,6 +18,8 @@ import org.opentripplanner.transit.model.site.Station; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.site.StopLocationsGroup; +import org.opentripplanner.utils.collection.CollectionsView; +import org.opentripplanner.utils.collection.MapUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/transit/service/StopModelIndex.java b/application/src/main/java/org/opentripplanner/transit/service/StopModelIndex.java index 48048101b3d..13a8c0d278d 100644 --- a/application/src/main/java/org/opentripplanner/transit/service/StopModelIndex.java +++ b/application/src/main/java/org/opentripplanner/transit/service/StopModelIndex.java @@ -7,7 +7,6 @@ import java.util.Objects; import javax.annotation.Nullable; import org.locationtech.jts.geom.Envelope; -import org.opentripplanner.framework.collection.CollectionsView; import org.opentripplanner.framework.geometry.HashGridSpatialIndex; import org.opentripplanner.transit.model.site.AreaStop; import org.opentripplanner.transit.model.site.GroupStop; @@ -15,6 +14,7 @@ import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.Station; import org.opentripplanner.transit.model.site.StopLocation; +import org.opentripplanner.utils.collection.CollectionsView; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.event.Level; diff --git a/application/src/main/java/org/opentripplanner/transit/service/TimetableRepository.java b/application/src/main/java/org/opentripplanner/transit/service/TimetableRepository.java index 6dec0c09eb6..532bc2e6e8f 100644 --- a/application/src/main/java/org/opentripplanner/transit/service/TimetableRepository.java +++ b/application/src/main/java/org/opentripplanner/transit/service/TimetableRepository.java @@ -22,8 +22,6 @@ import java.util.Set; import javax.annotation.Nullable; import org.opentripplanner.ext.flex.trip.FlexTrip; -import org.opentripplanner.framework.lang.ObjectUtils; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issues.NoFutureDates; import org.opentripplanner.model.FeedInfo; @@ -51,6 +49,8 @@ import org.opentripplanner.transit.model.timetable.TripOnServiceDate; import org.opentripplanner.updater.GraphUpdaterManager; import org.opentripplanner.updater.configure.UpdaterConfigurator; +import org.opentripplanner.utils.lang.ObjectUtils; +import org.opentripplanner.utils.time.ServiceDateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/updater/GtfsRealtimeFuzzyTripMatcher.java b/application/src/main/java/org/opentripplanner/updater/GtfsRealtimeFuzzyTripMatcher.java index 6972bfb6208..96e2d25bbd8 100644 --- a/application/src/main/java/org/opentripplanner/updater/GtfsRealtimeFuzzyTripMatcher.java +++ b/application/src/main/java/org/opentripplanner/updater/GtfsRealtimeFuzzyTripMatcher.java @@ -4,8 +4,6 @@ import gnu.trove.set.TIntSet; import java.text.ParseException; import java.time.LocalDate; -import org.opentripplanner.framework.time.ServiceDateUtils; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.gtfs.mapping.DirectionMapper; import org.opentripplanner.transit.model.framework.FeedScopedId; @@ -15,6 +13,8 @@ import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.transit.service.TransitService; +import org.opentripplanner.utils.time.ServiceDateUtils; +import org.opentripplanner.utils.time.TimeUtils; /** * This class is used for matching TripDescriptors without trip_ids to scheduled GTFS data and to diff --git a/application/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java b/application/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java index 23b6d741e10..b71dad6a656 100644 --- a/application/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java +++ b/application/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java @@ -4,13 +4,13 @@ import java.net.URI; import org.opentripplanner.framework.io.OtpHttpClient; import org.opentripplanner.framework.io.OtpHttpClientFactory; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.impl.TransitAlertServiceImpl; import org.opentripplanner.routing.services.TransitAlertService; import org.opentripplanner.transit.service.TimetableRepository; import org.opentripplanner.updater.spi.HttpHeaders; import org.opentripplanner.updater.spi.PollingGraphUpdater; import org.opentripplanner.updater.spi.WriteToGraphCallback; +import org.opentripplanner.utils.tostring.ToStringBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/updater/siri/AddedTripBuilder.java b/application/src/main/java/org/opentripplanner/updater/siri/AddedTripBuilder.java index 3be1bcbc4a2..a1ca89f5c83 100644 --- a/application/src/main/java/org/opentripplanner/updater/siri/AddedTripBuilder.java +++ b/application/src/main/java/org/opentripplanner/updater/siri/AddedTripBuilder.java @@ -16,7 +16,6 @@ import java.util.function.Function; import javax.annotation.Nullable; import org.opentripplanner.framework.i18n.NonLocalizedString; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.model.StopTime; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.DataValidationException; @@ -37,6 +36,7 @@ import org.opentripplanner.updater.siri.mapper.PickDropMapper; import org.opentripplanner.updater.spi.DataValidationExceptionMapper; import org.opentripplanner.updater.spi.UpdateError; +import org.opentripplanner.utils.time.ServiceDateUtils; import org.rutebanken.netex.model.BusSubmodeEnumeration; import org.rutebanken.netex.model.RailSubmodeEnumeration; import org.slf4j.Logger; diff --git a/application/src/main/java/org/opentripplanner/updater/siri/DebugString.java b/application/src/main/java/org/opentripplanner/updater/siri/DebugString.java index e8265856245..fa5d45544e0 100644 --- a/application/src/main/java/org/opentripplanner/updater/siri/DebugString.java +++ b/application/src/main/java/org/opentripplanner/updater/siri/DebugString.java @@ -1,6 +1,6 @@ package org.opentripplanner.updater.siri; -import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.utils.tostring.ToStringBuilder; import uk.org.siri.siri20.DataFrameRefStructure; import uk.org.siri.siri20.DatedVehicleJourneyRef; import uk.org.siri.siri20.EstimatedVehicleJourney; diff --git a/application/src/main/java/org/opentripplanner/updater/siri/ModifiedTripBuilder.java b/application/src/main/java/org/opentripplanner/updater/siri/ModifiedTripBuilder.java index 68435290d1b..0f1475f7b50 100644 --- a/application/src/main/java/org/opentripplanner/updater/siri/ModifiedTripBuilder.java +++ b/application/src/main/java/org/opentripplanner/updater/siri/ModifiedTripBuilder.java @@ -10,7 +10,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.transit.model.framework.DataValidationException; import org.opentripplanner.transit.model.framework.Result; import org.opentripplanner.transit.model.network.StopPattern; @@ -23,6 +22,7 @@ import org.opentripplanner.updater.siri.mapper.PickDropMapper; import org.opentripplanner.updater.spi.DataValidationExceptionMapper; import org.opentripplanner.updater.spi.UpdateError; +import org.opentripplanner.utils.time.ServiceDateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import uk.org.siri.siri20.EstimatedVehicleJourney; diff --git a/application/src/main/java/org/opentripplanner/updater/siri/SiriFuzzyTripMatcher.java b/application/src/main/java/org/opentripplanner/updater/siri/SiriFuzzyTripMatcher.java index db3fa50e94c..604dceed408 100644 --- a/application/src/main/java/org/opentripplanner/updater/siri/SiriFuzzyTripMatcher.java +++ b/application/src/main/java/org/opentripplanner/updater/siri/SiriFuzzyTripMatcher.java @@ -11,7 +11,6 @@ import java.util.function.BiFunction; import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.model.Timetable; import org.opentripplanner.model.calendar.CalendarService; import org.opentripplanner.transit.model.basic.TransitMode; @@ -21,6 +20,7 @@ import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.transit.service.TransitService; +import org.opentripplanner.utils.time.ServiceDateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import uk.org.siri.siri20.EstimatedVehicleJourney; diff --git a/application/src/main/java/org/opentripplanner/updater/siri/TimetableHelper.java b/application/src/main/java/org/opentripplanner/updater/siri/TimetableHelper.java index 870316403f6..dad1bc9a243 100644 --- a/application/src/main/java/org/opentripplanner/updater/siri/TimetableHelper.java +++ b/application/src/main/java/org/opentripplanner/updater/siri/TimetableHelper.java @@ -5,9 +5,9 @@ import java.time.ZonedDateTime; import java.util.function.Supplier; import org.opentripplanner.framework.i18n.NonLocalizedString; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.transit.model.timetable.RealTimeTripTimes; import org.opentripplanner.updater.siri.mapper.OccupancyMapper; +import org.opentripplanner.utils.time.ServiceDateUtils; import uk.org.siri.siri20.NaturalLanguageStringStructure; import uk.org.siri.siri20.OccupancyEnumeration; diff --git a/application/src/main/java/org/opentripplanner/updater/siri/updater/google/GooglePubsubEstimatedTimetableSource.java b/application/src/main/java/org/opentripplanner/updater/siri/updater/google/GooglePubsubEstimatedTimetableSource.java index 4592d102d1d..b9812576fd8 100644 --- a/application/src/main/java/org/opentripplanner/updater/siri/updater/google/GooglePubsubEstimatedTimetableSource.java +++ b/application/src/main/java/org/opentripplanner/updater/siri/updater/google/GooglePubsubEstimatedTimetableSource.java @@ -29,9 +29,9 @@ import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.framework.retry.OtpRetry; import org.opentripplanner.framework.retry.OtpRetryBuilder; -import org.opentripplanner.framework.text.FileSizeToTextConverter; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.updater.siri.updater.AsyncEstimatedTimetableSource; +import org.opentripplanner.utils.text.FileSizeToTextConverter; +import org.opentripplanner.utils.time.DurationUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import uk.org.siri.siri20.ServiceDelivery; diff --git a/application/src/main/java/org/opentripplanner/updater/siri/updater/google/SiriETGooglePubsubUpdaterParameters.java b/application/src/main/java/org/opentripplanner/updater/siri/updater/google/SiriETGooglePubsubUpdaterParameters.java index fc698142adc..2970ac114c0 100644 --- a/application/src/main/java/org/opentripplanner/updater/siri/updater/google/SiriETGooglePubsubUpdaterParameters.java +++ b/application/src/main/java/org/opentripplanner/updater/siri/updater/google/SiriETGooglePubsubUpdaterParameters.java @@ -3,8 +3,8 @@ import java.time.Duration; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.updater.trip.UrlUpdaterParameters; +import org.opentripplanner.utils.tostring.ToStringBuilder; public record SiriETGooglePubsubUpdaterParameters( String configRef, diff --git a/application/src/main/java/org/opentripplanner/updater/spi/ResultLogger.java b/application/src/main/java/org/opentripplanner/updater/spi/ResultLogger.java index 97af8d650bb..9ea737fa0e7 100644 --- a/application/src/main/java/org/opentripplanner/updater/spi/ResultLogger.java +++ b/application/src/main/java/org/opentripplanner/updater/spi/ResultLogger.java @@ -3,7 +3,7 @@ import static net.logstash.logback.argument.StructuredArguments.keyValue; import java.util.stream.Collectors; -import org.opentripplanner.framework.lang.DoubleUtils; +import org.opentripplanner.utils.lang.DoubleUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/updater/spi/UpdateSuccess.java b/application/src/main/java/org/opentripplanner/updater/spi/UpdateSuccess.java index 3e6135d88c0..6d797a9a650 100644 --- a/application/src/main/java/org/opentripplanner/updater/spi/UpdateSuccess.java +++ b/application/src/main/java/org/opentripplanner/updater/spi/UpdateSuccess.java @@ -3,7 +3,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.opentripplanner.framework.collection.ListUtils; +import org.opentripplanner.utils.collection.ListUtils; /** * The result of a successful application of a realtime update, for example for trips or diff --git a/application/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java b/application/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java index 48f2d39ccc4..0b20a4c22c7 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java @@ -14,8 +14,8 @@ import java.util.List; import org.opentripplanner.framework.io.OtpHttpClient; import org.opentripplanner.framework.io.OtpHttpClientFactory; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.updater.spi.HttpHeaders; +import org.opentripplanner.utils.tostring.ToStringBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java b/application/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java index e1c8bf4ea83..20b49ed022f 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java @@ -16,11 +16,11 @@ import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.updater.spi.GraphUpdater; import org.opentripplanner.updater.spi.UpdateResult; import org.opentripplanner.updater.spi.WriteToGraphCallback; import org.opentripplanner.updater.trip.metrics.TripUpdateMetrics; +import org.opentripplanner.utils.tostring.ToStringBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/PollingTripUpdater.java b/application/src/main/java/org/opentripplanner/updater/trip/PollingTripUpdater.java index 71f93235e01..c725c8b1088 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/PollingTripUpdater.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/PollingTripUpdater.java @@ -3,11 +3,11 @@ import com.google.transit.realtime.GtfsRealtime.TripUpdate; import java.util.List; import java.util.function.Consumer; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.updater.spi.PollingGraphUpdater; import org.opentripplanner.updater.spi.UpdateResult; import org.opentripplanner.updater.spi.WriteToGraphCallback; import org.opentripplanner.updater.trip.metrics.BatchTripUpdateMetrics; +import org.opentripplanner.utils.tostring.ToStringBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/application/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index f83fa9d247e..54c3901f3e8 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -37,8 +37,6 @@ import java.util.function.Supplier; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.NonLocalizedString; -import org.opentripplanner.framework.lang.StringUtils; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.gtfs.mapping.TransitModeMapper; import org.opentripplanner.model.RealTimeTripUpdate; import org.opentripplanner.model.StopTime; @@ -70,6 +68,8 @@ import org.opentripplanner.updater.spi.UpdateError; import org.opentripplanner.updater.spi.UpdateResult; import org.opentripplanner.updater.spi.UpdateSuccess; +import org.opentripplanner.utils.lang.StringUtils; +import org.opentripplanner.utils.time.ServiceDateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/updater/vehicle_parking/AvailabiltyUpdate.java b/application/src/main/java/org/opentripplanner/updater/vehicle_parking/AvailabiltyUpdate.java index a9d352cbaf2..414a62938ba 100644 --- a/application/src/main/java/org/opentripplanner/updater/vehicle_parking/AvailabiltyUpdate.java +++ b/application/src/main/java/org/opentripplanner/updater/vehicle_parking/AvailabiltyUpdate.java @@ -1,8 +1,8 @@ package org.opentripplanner.updater.vehicle_parking; import java.util.Objects; -import org.opentripplanner.framework.lang.IntUtils; import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.utils.lang.IntUtils; public record AvailabiltyUpdate(FeedScopedId vehicleParkingId, int spacesAvailable) { public AvailabiltyUpdate { diff --git a/application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingAvailabilityUpdater.java b/application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingAvailabilityUpdater.java index 96544321735..b23f46522c3 100644 --- a/application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingAvailabilityUpdater.java +++ b/application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingAvailabilityUpdater.java @@ -4,7 +4,6 @@ import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.vehicle_parking.VehicleParking; import org.opentripplanner.routing.vehicle_parking.VehicleParkingService; import org.opentripplanner.routing.vehicle_parking.VehicleParkingSpaces; @@ -14,6 +13,7 @@ import org.opentripplanner.updater.spi.DataSource; import org.opentripplanner.updater.spi.PollingGraphUpdater; import org.opentripplanner.updater.spi.WriteToGraphCallback; +import org.opentripplanner.utils.tostring.ToStringBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdater.java b/application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdater.java index 59aea16e928..830429151b4 100644 --- a/application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdater.java +++ b/application/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdater.java @@ -8,7 +8,6 @@ import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.linking.DisposableEdgeCollection; import org.opentripplanner.routing.linking.LinkingDirection; @@ -28,6 +27,7 @@ import org.opentripplanner.updater.spi.DataSource; import org.opentripplanner.updater.spi.PollingGraphUpdater; import org.opentripplanner.updater.spi.WriteToGraphCallback; +import org.opentripplanner.utils.tostring.ToStringBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/updater/vehicle_position/GtfsRealtimeHttpVehiclePositionSource.java b/application/src/main/java/org/opentripplanner/updater/vehicle_position/GtfsRealtimeHttpVehiclePositionSource.java index ec0be6822e7..31ae9a32faf 100644 --- a/application/src/main/java/org/opentripplanner/updater/vehicle_position/GtfsRealtimeHttpVehiclePositionSource.java +++ b/application/src/main/java/org/opentripplanner/updater/vehicle_position/GtfsRealtimeHttpVehiclePositionSource.java @@ -10,8 +10,8 @@ import org.opentripplanner.framework.io.OtpHttpClient; import org.opentripplanner.framework.io.OtpHttpClientException; import org.opentripplanner.framework.io.OtpHttpClientFactory; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.updater.spi.HttpHeaders; +import org.opentripplanner.utils.tostring.ToStringBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/updater/vehicle_position/PollingVehiclePositionUpdater.java b/application/src/main/java/org/opentripplanner/updater/vehicle_position/PollingVehiclePositionUpdater.java index c2860d1d091..4c487ac997b 100644 --- a/application/src/main/java/org/opentripplanner/updater/vehicle_position/PollingVehiclePositionUpdater.java +++ b/application/src/main/java/org/opentripplanner/updater/vehicle_position/PollingVehiclePositionUpdater.java @@ -3,12 +3,12 @@ import com.google.transit.realtime.GtfsRealtime.VehiclePosition; import java.util.List; import java.util.Set; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.service.realtimevehicles.RealtimeVehicleRepository; import org.opentripplanner.service.realtimevehicles.model.RealtimeVehicle; import org.opentripplanner.standalone.config.routerconfig.updaters.VehiclePositionsUpdaterConfig; import org.opentripplanner.updater.spi.PollingGraphUpdater; import org.opentripplanner.updater.spi.WriteToGraphCallback; +import org.opentripplanner.utils.tostring.ToStringBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/updater/vehicle_position/RealtimeVehiclePatternMatcher.java b/application/src/main/java/org/opentripplanner/updater/vehicle_position/RealtimeVehiclePatternMatcher.java index 0723adc91b8..27ee0d479ab 100644 --- a/application/src/main/java/org/opentripplanner/updater/vehicle_position/RealtimeVehiclePatternMatcher.java +++ b/application/src/main/java/org/opentripplanner/updater/vehicle_position/RealtimeVehiclePatternMatcher.java @@ -30,8 +30,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.opentripplanner.framework.geometry.WgsCoordinate; -import org.opentripplanner.framework.lang.StringUtils; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.service.realtimevehicles.RealtimeVehicleRepository; import org.opentripplanner.service.realtimevehicles.model.RealtimeVehicle; import org.opentripplanner.service.realtimevehicles.model.RealtimeVehicle.StopStatus; @@ -48,6 +46,8 @@ import org.opentripplanner.updater.spi.UpdateError; import org.opentripplanner.updater.spi.UpdateResult; import org.opentripplanner.updater.spi.UpdateSuccess; +import org.opentripplanner.utils.lang.StringUtils; +import org.opentripplanner.utils.time.ServiceDateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdater.java b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdater.java index 77c3c8d01c6..24686edce6c 100644 --- a/application/src/main/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdater.java +++ b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/VehicleRentalUpdater.java @@ -10,11 +10,6 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.opentripplanner.framework.lang.ObjectUtils; -import org.opentripplanner.framework.logging.Throttle; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.time.TimeUtils; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.linking.DisposableEdgeCollection; import org.opentripplanner.routing.linking.LinkingDirection; import org.opentripplanner.routing.linking.VertexLinker; @@ -37,6 +32,11 @@ import org.opentripplanner.updater.spi.UpdaterConstructionException; import org.opentripplanner.updater.spi.WriteToGraphCallback; import org.opentripplanner.updater.vehicle_rental.datasources.VehicleRentalDatasource; +import org.opentripplanner.utils.lang.ObjectUtils; +import org.opentripplanner.utils.logging.Throttle; +import org.opentripplanner.utils.time.DurationUtils; +import org.opentripplanner.utils.time.TimeUtils; +import org.opentripplanner.utils.tostring.ToStringBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java index 22a4131f338..934243a1e76 100644 --- a/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java +++ b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java @@ -10,9 +10,9 @@ import org.mobilitydata.gbfs.v2_3.geofencing_zones.GBFSGeofencingZones; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.geometry.UnsupportedGeometryException; -import org.opentripplanner.framework.lang.StringUtils; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.utils.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSource.java b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSource.java index c441efb974a..e3e86981bc8 100644 --- a/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSource.java +++ b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSource.java @@ -17,12 +17,12 @@ import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.framework.io.OtpHttpClient; import org.opentripplanner.framework.io.OtpHttpClientFactory; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem; import org.opentripplanner.updater.vehicle_rental.datasources.params.GbfsVehicleRentalDataSourceParameters; +import org.opentripplanner.utils.tostring.ToStringBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/test/java/org/opentripplanner/DateTimeHelper.java b/application/src/test/java/org/opentripplanner/DateTimeHelper.java index 6a058118d1b..2751af48daf 100644 --- a/application/src/test/java/org/opentripplanner/DateTimeHelper.java +++ b/application/src/test/java/org/opentripplanner/DateTimeHelper.java @@ -3,7 +3,7 @@ import java.time.LocalDate; import java.time.ZoneId; import java.time.ZonedDateTime; -import org.opentripplanner.framework.time.DateUtils; +import org.opentripplanner.utils.time.DateUtils; public class DateTimeHelper { diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java index 406217e6604..3aad9075f73 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java @@ -38,7 +38,6 @@ import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.ext.fares.FaresToItineraryMapper; import org.opentripplanner.ext.fares.impl.DefaultFareService; -import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.NonLocalizedString; @@ -97,6 +96,7 @@ import org.opentripplanner.transit.service.TimetableRepository; import org.opentripplanner.transit.service.TransitEditorService; import org.opentripplanner.transit.service.TransitService; +import org.opentripplanner.utils.collection.ListUtils; class GraphQLIntegrationTest { diff --git a/application/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java index 593fb622adc..84743571cc3 100644 --- a/application/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java +++ b/application/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java @@ -5,8 +5,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; -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 graphql.ExecutionInput; import graphql.execution.ExecutionId; diff --git a/application/src/test/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDtoTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDtoTest.java index 58054a3c778..0548bde0612 100644 --- a/application/src/test/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDtoTest.java +++ b/application/src/test/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDtoTest.java @@ -7,11 +7,11 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.framework.model.TimeAndCost; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.TestItineraryBuilder; import org.opentripplanner.transit.model._data.TimetableRepositoryForTest; +import org.opentripplanner.utils.time.DurationUtils; class TripPlanTimePenaltyDtoTest { diff --git a/application/src/test/java/org/opentripplanner/apis/transmodel/support/ExecutionResultMapperTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/support/ExecutionResultMapperTest.java index b697adc9288..7cc373e5145 100644 --- a/application/src/test/java/org/opentripplanner/apis/transmodel/support/ExecutionResultMapperTest.java +++ b/application/src/test/java/org/opentripplanner/apis/transmodel/support/ExecutionResultMapperTest.java @@ -1,7 +1,7 @@ package org.opentripplanner.apis.transmodel.support; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.framework.lang.StringUtils.quoteReplace; +import static org.opentripplanner.utils.lang.StringUtils.quoteReplace; import graphql.ExecutionResult; import graphql.GraphQLError; diff --git a/application/src/test/java/org/opentripplanner/datastore/OtpDataStoreTest.java b/application/src/test/java/org/opentripplanner/datastore/OtpDataStoreTest.java index 1733a97777b..d7afc55a556 100644 --- a/application/src/test/java/org/opentripplanner/datastore/OtpDataStoreTest.java +++ b/application/src/test/java/org/opentripplanner/datastore/OtpDataStoreTest.java @@ -34,8 +34,8 @@ import org.opentripplanner.datastore.api.FileType; import org.opentripplanner.datastore.api.OtpDataStoreConfig; import org.opentripplanner.datastore.configure.DataStoreModule; -import org.opentripplanner.framework.lang.StringUtils; import org.opentripplanner.standalone.config.OtpConfigLoader; +import org.opentripplanner.utils.lang.StringUtils; public class OtpDataStoreTest { diff --git a/application/src/test/java/org/opentripplanner/framework/model/TimeAndCostTest.java b/application/src/test/java/org/opentripplanner/framework/model/TimeAndCostTest.java index 4660da480b2..5eca02043ef 100644 --- a/application/src/test/java/org/opentripplanner/framework/model/TimeAndCostTest.java +++ b/application/src/test/java/org/opentripplanner/framework/model/TimeAndCostTest.java @@ -6,7 +6,7 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.time.DurationUtils; +import org.opentripplanner.utils.time.DurationUtils; class TimeAndCostTest { diff --git a/application/src/test/java/org/opentripplanner/framework/token/TestTokenSchemaConstants.java b/application/src/test/java/org/opentripplanner/framework/token/TestTokenSchemaConstants.java index 09ac58a0d2d..94303a28e14 100644 --- a/application/src/test/java/org/opentripplanner/framework/token/TestTokenSchemaConstants.java +++ b/application/src/test/java/org/opentripplanner/framework/token/TestTokenSchemaConstants.java @@ -3,7 +3,7 @@ import java.time.Duration; import java.time.Instant; import java.time.Month; -import org.opentripplanner.framework.time.DurationUtils; +import org.opentripplanner.utils.time.DurationUtils; public interface TestTokenSchemaConstants { // Token field names. These are used to reference a specific field value in theString BYTE_FIELD = "AByte"; diff --git a/application/src/test/java/org/opentripplanner/generate/doc/BuildConfigurationDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/BuildConfigurationDocTest.java index 8189f18f20e..a44d013fd03 100644 --- a/application/src/test/java/org/opentripplanner/generate/doc/BuildConfigurationDocTest.java +++ b/application/src/test/java/org/opentripplanner/generate/doc/BuildConfigurationDocTest.java @@ -3,13 +3,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_3; 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_3; import java.io.File; import org.junit.jupiter.api.Test; diff --git a/application/src/test/java/org/opentripplanner/generate/doc/EmissionsConfigurationDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/EmissionsConfigurationDocTest.java index 5010c78d527..94f0679cdfc 100644 --- a/application/src/test/java/org/opentripplanner/generate/doc/EmissionsConfigurationDocTest.java +++ b/application/src/test/java/org/opentripplanner/generate/doc/EmissionsConfigurationDocTest.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.jsonNodeFromResource; +import static org.opentripplanner.utils.text.MarkdownFormatter.HEADER_4; import java.io.File; import org.junit.jupiter.api.Test; diff --git a/application/src/test/java/org/opentripplanner/generate/doc/FlexConfigurationDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/FlexConfigurationDocTest.java index e18090466b9..1958d200ca3 100644 --- a/application/src/test/java/org/opentripplanner/generate/doc/FlexConfigurationDocTest.java +++ b/application/src/test/java/org/opentripplanner/generate/doc/FlexConfigurationDocTest.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.jsonNodeFromResource; +import static org.opentripplanner.utils.text.MarkdownFormatter.HEADER_4; import java.io.File; import org.junit.jupiter.api.Test; diff --git a/application/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java index 91c6f5c530a..e2844437ca5 100644 --- a/application/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java +++ b/application/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java @@ -18,13 +18,13 @@ import java.util.Set; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.framework.text.Table; -import org.opentripplanner.framework.text.TableBuilder; import org.opentripplanner.generate.doc.framework.GeneratesDocumentation; import org.opentripplanner.osm.tagmapping.OsmTagMapper; import org.opentripplanner.osm.tagmapping.OsmTagMapperSource; import org.opentripplanner.osm.wayproperty.SafetyFeatures; import org.opentripplanner.osm.wayproperty.WayPropertySet; +import org.opentripplanner.utils.text.Table; +import org.opentripplanner.utils.text.TableBuilder; @GeneratesDocumentation public class OsmMapperDocTest { diff --git a/application/src/test/java/org/opentripplanner/generate/doc/RideHailingDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/RideHailingDocTest.java index 2d04e002413..fe959d9138d 100644 --- a/application/src/test/java/org/opentripplanner/generate/doc/RideHailingDocTest.java +++ b/application/src/test/java/org/opentripplanner/generate/doc/RideHailingDocTest.java @@ -4,11 +4,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.jsonNodeFromResource; +import static org.opentripplanner.utils.text.MarkdownFormatter.HEADER_4; import java.io.File; import org.junit.jupiter.api.Test; diff --git a/application/src/test/java/org/opentripplanner/generate/doc/RouteRequestDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/RouteRequestDocTest.java index b4725c5e2a1..c51660a9a60 100644 --- a/application/src/test/java/org/opentripplanner/generate/doc/RouteRequestDocTest.java +++ b/application/src/test/java/org/opentripplanner/generate/doc/RouteRequestDocTest.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_3; 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_3; import java.io.File; import org.junit.jupiter.api.Test; diff --git a/application/src/test/java/org/opentripplanner/generate/doc/RouterConfigurationDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/RouterConfigurationDocTest.java index 77490c506fd..cdb10e28c6a 100644 --- a/application/src/test/java/org/opentripplanner/generate/doc/RouterConfigurationDocTest.java +++ b/application/src/test/java/org/opentripplanner/generate/doc/RouterConfigurationDocTest.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_3; 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_3; import java.io.File; import org.junit.jupiter.api.Test; diff --git a/application/src/test/java/org/opentripplanner/generate/doc/SiriAzureConfigDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/SiriAzureConfigDocTest.java index fcf93770f38..003b29ebcbb 100644 --- a/application/src/test/java/org/opentripplanner/generate/doc/SiriAzureConfigDocTest.java +++ b/application/src/test/java/org/opentripplanner/generate/doc/SiriAzureConfigDocTest.java @@ -4,11 +4,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.jsonNodeFromResource; +import static org.opentripplanner.utils.text.MarkdownFormatter.HEADER_4; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.File; diff --git a/application/src/test/java/org/opentripplanner/generate/doc/SiriConfigDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/SiriConfigDocTest.java index 71df3027c7d..b53c5370b53 100644 --- a/application/src/test/java/org/opentripplanner/generate/doc/SiriConfigDocTest.java +++ b/application/src/test/java/org/opentripplanner/generate/doc/SiriConfigDocTest.java @@ -4,11 +4,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.jsonNodeFromResource; +import static org.opentripplanner.utils.text.MarkdownFormatter.HEADER_4; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.File; diff --git a/application/src/test/java/org/opentripplanner/generate/doc/SiriGooglePubSubConfigDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/SiriGooglePubSubConfigDocTest.java index ce414b298d0..c6daed2e4b0 100644 --- a/application/src/test/java/org/opentripplanner/generate/doc/SiriGooglePubSubConfigDocTest.java +++ b/application/src/test/java/org/opentripplanner/generate/doc/SiriGooglePubSubConfigDocTest.java @@ -4,11 +4,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.jsonNodeFromResource; +import static org.opentripplanner.utils.text.MarkdownFormatter.HEADER_4; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.File; diff --git a/application/src/test/java/org/opentripplanner/generate/doc/UpdaterConfigDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/UpdaterConfigDocTest.java index 7a3f2969c4d..234d4c68b33 100644 --- a/application/src/test/java/org/opentripplanner/generate/doc/UpdaterConfigDocTest.java +++ b/application/src/test/java/org/opentripplanner/generate/doc/UpdaterConfigDocTest.java @@ -4,11 +4,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.jsonNodeFromResource; +import static org.opentripplanner.utils.text.MarkdownFormatter.HEADER_4; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.File; diff --git a/application/src/test/java/org/opentripplanner/generate/doc/VehicleParkingDocTest.java b/application/src/test/java/org/opentripplanner/generate/doc/VehicleParkingDocTest.java index caffafdf72b..cca0d45d0f5 100644 --- a/application/src/test/java/org/opentripplanner/generate/doc/VehicleParkingDocTest.java +++ b/application/src/test/java/org/opentripplanner/generate/doc/VehicleParkingDocTest.java @@ -4,11 +4,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.jsonNodeFromResource; +import static org.opentripplanner.utils.text.MarkdownFormatter.HEADER_4; import java.io.File; import org.junit.jupiter.api.Test; diff --git a/application/src/test/java/org/opentripplanner/generate/doc/framework/AbstractTable.java b/application/src/test/java/org/opentripplanner/generate/doc/framework/AbstractTable.java index 1805b8e6dde..0af3cc938cf 100644 --- a/application/src/test/java/org/opentripplanner/generate/doc/framework/AbstractTable.java +++ b/application/src/test/java/org/opentripplanner/generate/doc/framework/AbstractTable.java @@ -1,18 +1,18 @@ package org.opentripplanner.generate.doc.framework; -import static org.opentripplanner.framework.text.MarkdownFormatter.code; -import static org.opentripplanner.framework.text.MarkdownFormatter.escapeInTable; import static org.opentripplanner.generate.doc.framework.NodeAdapterHelper.anchor; import static org.opentripplanner.standalone.config.framework.json.ConfigType.ENUM_MAP; import static org.opentripplanner.standalone.config.framework.json.ConfigType.ENUM_SET; +import static org.opentripplanner.utils.text.MarkdownFormatter.code; +import static org.opentripplanner.utils.text.MarkdownFormatter.escapeInTable; import java.util.List; -import org.opentripplanner.framework.text.MarkdownFormatter; -import org.opentripplanner.framework.text.Table; -import org.opentripplanner.framework.text.TableBuilder; import org.opentripplanner.standalone.config.framework.json.ConfigType; import org.opentripplanner.standalone.config.framework.json.NodeAdapter; import org.opentripplanner.standalone.config.framework.json.NodeInfo; +import org.opentripplanner.utils.text.MarkdownFormatter; +import org.opentripplanner.utils.text.Table; +import org.opentripplanner.utils.text.TableBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/test/java/org/opentripplanner/generate/doc/framework/DocBuilder.java b/application/src/test/java/org/opentripplanner/generate/doc/framework/DocBuilder.java index 16579075077..ea62f3a052c 100644 --- a/application/src/test/java/org/opentripplanner/generate/doc/framework/DocBuilder.java +++ b/application/src/test/java/org/opentripplanner/generate/doc/framework/DocBuilder.java @@ -1,12 +1,12 @@ package org.opentripplanner.generate.doc.framework; -import static org.opentripplanner.framework.text.MarkdownFormatter.NEW_LINE; +import static org.opentripplanner.utils.text.MarkdownFormatter.NEW_LINE; import com.fasterxml.jackson.databind.JsonNode; import java.util.List; import java.util.stream.Collectors; -import org.opentripplanner.framework.text.MarkdownFormatter; import org.opentripplanner.standalone.config.framework.json.EnumMapper; +import org.opentripplanner.utils.text.MarkdownFormatter; /** * Builder for creating a new document diff --git a/application/src/test/java/org/opentripplanner/generate/doc/framework/DocBuilderTest.java b/application/src/test/java/org/opentripplanner/generate/doc/framework/DocBuilderTest.java index 8885a400af8..1a9796e9aac 100644 --- a/application/src/test/java/org/opentripplanner/generate/doc/framework/DocBuilderTest.java +++ b/application/src/test/java/org/opentripplanner/generate/doc/framework/DocBuilderTest.java @@ -1,7 +1,7 @@ package org.opentripplanner.generate.doc.framework; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.framework.text.MarkdownFormatter.HEADER_1; +import static org.opentripplanner.utils.text.MarkdownFormatter.HEADER_1; import java.util.Arrays; import org.junit.jupiter.api.Test; diff --git a/application/src/test/java/org/opentripplanner/generate/doc/framework/ParameterDetailsList.java b/application/src/test/java/org/opentripplanner/generate/doc/framework/ParameterDetailsList.java index 6593c7c0359..ea165d3dc16 100644 --- a/application/src/test/java/org/opentripplanner/generate/doc/framework/ParameterDetailsList.java +++ b/application/src/test/java/org/opentripplanner/generate/doc/framework/ParameterDetailsList.java @@ -5,11 +5,11 @@ import static org.opentripplanner.standalone.config.framework.json.ConfigType.ENUM_SET; import java.util.EnumSet; -import org.opentripplanner.framework.text.MarkdownFormatter; import org.opentripplanner.standalone.config.framework.json.ConfigType; import org.opentripplanner.standalone.config.framework.json.EnumMapper; import org.opentripplanner.standalone.config.framework.json.NodeAdapter; import org.opentripplanner.standalone.config.framework.json.NodeInfo; +import org.opentripplanner.utils.text.MarkdownFormatter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/test/java/org/opentripplanner/generate/doc/framework/ParameterSummaryTable.java b/application/src/test/java/org/opentripplanner/generate/doc/framework/ParameterSummaryTable.java index f95b76b8a0f..8712c0fe47d 100644 --- a/application/src/test/java/org/opentripplanner/generate/doc/framework/ParameterSummaryTable.java +++ b/application/src/test/java/org/opentripplanner/generate/doc/framework/ParameterSummaryTable.java @@ -1,14 +1,14 @@ package org.opentripplanner.generate.doc.framework; -import static org.opentripplanner.framework.text.Table.Align.Center; -import static org.opentripplanner.framework.text.Table.Align.Left; +import static org.opentripplanner.utils.text.Table.Align.Center; +import static org.opentripplanner.utils.text.Table.Align.Left; import java.util.List; -import org.opentripplanner.framework.text.MarkdownFormatter; -import org.opentripplanner.framework.text.Table; -import org.opentripplanner.framework.text.TableBuilder; import org.opentripplanner.standalone.config.framework.json.NodeAdapter; import org.opentripplanner.standalone.config.framework.json.NodeInfo; +import org.opentripplanner.utils.text.MarkdownFormatter; +import org.opentripplanner.utils.text.Table; +import org.opentripplanner.utils.text.TableBuilder; public class ParameterSummaryTable extends AbstractTable { diff --git a/application/src/test/java/org/opentripplanner/generate/doc/support/ConfigTypeTable.java b/application/src/test/java/org/opentripplanner/generate/doc/support/ConfigTypeTable.java index 85c9476549c..e85eee9eedb 100644 --- a/application/src/test/java/org/opentripplanner/generate/doc/support/ConfigTypeTable.java +++ b/application/src/test/java/org/opentripplanner/generate/doc/support/ConfigTypeTable.java @@ -1,8 +1,8 @@ package org.opentripplanner.generate.doc.support; -import org.opentripplanner.framework.text.MarkdownFormatter; -import org.opentripplanner.framework.text.Table; import org.opentripplanner.standalone.config.framework.json.ConfigType; +import org.opentripplanner.utils.text.MarkdownFormatter; +import org.opentripplanner.utils.text.Table; @SuppressWarnings("NewClassNamingConvention") public class ConfigTypeTable { diff --git a/application/src/test/java/org/opentripplanner/generate/doc/support/OTPFeatureTable.java b/application/src/test/java/org/opentripplanner/generate/doc/support/OTPFeatureTable.java index 22966028192..ccdc1337b87 100644 --- a/application/src/test/java/org/opentripplanner/generate/doc/support/OTPFeatureTable.java +++ b/application/src/test/java/org/opentripplanner/generate/doc/support/OTPFeatureTable.java @@ -1,12 +1,12 @@ package org.opentripplanner.generate.doc.support; -import static org.opentripplanner.framework.text.MarkdownFormatter.checkMark; -import static org.opentripplanner.framework.text.Table.Align.Center; -import static org.opentripplanner.framework.text.Table.Align.Left; +import static org.opentripplanner.utils.text.MarkdownFormatter.checkMark; +import static org.opentripplanner.utils.text.Table.Align.Center; +import static org.opentripplanner.utils.text.Table.Align.Left; import org.opentripplanner.framework.application.OTPFeature; -import org.opentripplanner.framework.text.MarkdownFormatter; -import org.opentripplanner.framework.text.Table; +import org.opentripplanner.utils.text.MarkdownFormatter; +import org.opentripplanner.utils.text.Table; @SuppressWarnings("NewClassNamingConvention") public class OTPFeatureTable { diff --git a/application/src/test/java/org/opentripplanner/graph_builder/issue/api/DataImportIssueSummaryTest.java b/application/src/test/java/org/opentripplanner/graph_builder/issue/api/DataImportIssueSummaryTest.java index 6524d53547e..989e2ca2016 100644 --- a/application/src/test/java/org/opentripplanner/graph_builder/issue/api/DataImportIssueSummaryTest.java +++ b/application/src/test/java/org/opentripplanner/graph_builder/issue/api/DataImportIssueSummaryTest.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.collection.ListUtils; +import org.opentripplanner.utils.collection.ListUtils; class DataImportIssueSummaryTest { diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/DirectTransferGeneratorTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/DirectTransferGeneratorTest.java index bb3144aa904..8a17e5258d8 100644 --- a/application/src/test/java/org/opentripplanner/graph_builder/module/DirectTransferGeneratorTest.java +++ b/application/src/test/java/org/opentripplanner/graph_builder/module/DirectTransferGeneratorTest.java @@ -16,7 +16,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.function.Executable; import org.opentripplanner.TestOtpModel; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.PathTransfer; import org.opentripplanner.routing.algorithm.GraphRoutingTest; @@ -31,6 +30,7 @@ import org.opentripplanner.transit.model.network.StopPattern; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.site.StopLocation; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * This creates a graph with trip patterns diff --git a/application/src/test/java/org/opentripplanner/gtfs/mapping/ServiceCalendarDateMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/ServiceCalendarDateMapperTest.java index 320ef4ba555..f363b1c1cb1 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/mapping/ServiceCalendarDateMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/mapping/ServiceCalendarDateMapperTest.java @@ -11,7 +11,7 @@ import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.ServiceCalendarDate; import org.onebusaway.gtfs.model.calendar.ServiceDate; -import org.opentripplanner.framework.time.ServiceDateUtils; +import org.opentripplanner.utils.time.ServiceDateUtils; public class ServiceCalendarDateMapperTest { diff --git a/application/src/test/java/org/opentripplanner/gtfs/mapping/ServiceCalendarMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/ServiceCalendarMapperTest.java index 41d3c4c64cc..8a9265376f3 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/mapping/ServiceCalendarMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/mapping/ServiceCalendarMapperTest.java @@ -12,7 +12,7 @@ import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.ServiceCalendar; import org.onebusaway.gtfs.model.calendar.ServiceDate; -import org.opentripplanner.framework.time.ServiceDateUtils; +import org.opentripplanner.utils.time.ServiceDateUtils; public class ServiceCalendarMapperTest { diff --git a/application/src/test/java/org/opentripplanner/model/calendar/impl/CalendarServiceDataFactoryImplTest.java b/application/src/test/java/org/opentripplanner/model/calendar/impl/CalendarServiceDataFactoryImplTest.java index 9516ce03a32..1a322fde916 100644 --- a/application/src/test/java/org/opentripplanner/model/calendar/impl/CalendarServiceDataFactoryImplTest.java +++ b/application/src/test/java/org/opentripplanner/model/calendar/impl/CalendarServiceDataFactoryImplTest.java @@ -19,7 +19,6 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.opentripplanner.ConstantsForTests; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.gtfs.GtfsContext; import org.opentripplanner.gtfs.GtfsContextBuilder; @@ -30,6 +29,7 @@ import org.opentripplanner.model.impl.OtpTransitServiceBuilder; import org.opentripplanner.transit.model._data.TimetableRepositoryForTest; import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.utils.time.ServiceDateUtils; /** * @author Thomas Gran (Capra) - tgr@capraconsulting.no (08.11.2017) diff --git a/application/src/test/java/org/opentripplanner/model/plan/PlanTestConstants.java b/application/src/test/java/org/opentripplanner/model/plan/PlanTestConstants.java index e5ec76af8af..adebe4f111c 100644 --- a/application/src/test/java/org/opentripplanner/model/plan/PlanTestConstants.java +++ b/application/src/test/java/org/opentripplanner/model/plan/PlanTestConstants.java @@ -1,9 +1,9 @@ package org.opentripplanner.model.plan; -import static org.opentripplanner.framework.time.TimeUtils.time; +import static org.opentripplanner.utils.time.TimeUtils.time; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.transit.model._data.TimetableRepositoryForTest; +import org.opentripplanner.utils.time.DurationUtils; public interface PlanTestConstants { int NOT_SET = -999_999; diff --git a/application/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java b/application/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java index d23759907c2..33eeae0a553 100644 --- a/application/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java +++ b/application/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java @@ -22,8 +22,6 @@ import org.opentripplanner.ext.ridehailing.model.RideHailingLeg; import org.opentripplanner.ext.ridehailing.model.RideHailingProvider; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.framework.lang.IntUtils; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.transfer.ConstrainedTransfer; import org.opentripplanner.model.transfer.TransferConstraint; @@ -41,6 +39,8 @@ import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.transit.model.timetable.TripTimesFactory; +import org.opentripplanner.utils.lang.IntUtils; +import org.opentripplanner.utils.time.TimeUtils; /** * This is a helper class to allow unit-testing on Itineraries. The builder does not necessarily diff --git a/application/src/test/java/org/opentripplanner/model/plan/paging/PagingSearchWindowAdjusterTest.java b/application/src/test/java/org/opentripplanner/model/plan/paging/PagingSearchWindowAdjusterTest.java index 22dcd49e63f..784fa4b5f99 100644 --- a/application/src/test/java/org/opentripplanner/model/plan/paging/PagingSearchWindowAdjusterTest.java +++ b/application/src/test/java/org/opentripplanner/model/plan/paging/PagingSearchWindowAdjusterTest.java @@ -1,7 +1,7 @@ package org.opentripplanner.model.plan.paging; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.framework.time.DurationUtils.duration; +import static org.opentripplanner.utils.time.DurationUtils.duration; import java.time.Duration; import java.time.Instant; diff --git a/application/src/test/java/org/opentripplanner/model/plan/paging/cursor/PageCursorFactoryTest.java b/application/src/test/java/org/opentripplanner/model/plan/paging/cursor/PageCursorFactoryTest.java index 7bf54d05bc2..910620872f3 100644 --- a/application/src/test/java/org/opentripplanner/model/plan/paging/cursor/PageCursorFactoryTest.java +++ b/application/src/test/java/org/opentripplanner/model/plan/paging/cursor/PageCursorFactoryTest.java @@ -10,10 +10,10 @@ import java.time.Duration; import java.time.Instant; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.PlanTestConstants; +import org.opentripplanner.utils.time.TimeUtils; @SuppressWarnings("ConstantConditions") class PageCursorFactoryTest implements PlanTestConstants { diff --git a/application/src/test/java/org/opentripplanner/model/plan/paging/cursor/PageCursorSerializerTest.java b/application/src/test/java/org/opentripplanner/model/plan/paging/cursor/PageCursorSerializerTest.java index 20c0230f309..e60c2aa1a5b 100644 --- a/application/src/test/java/org/opentripplanner/model/plan/paging/cursor/PageCursorSerializerTest.java +++ b/application/src/test/java/org/opentripplanner/model/plan/paging/cursor/PageCursorSerializerTest.java @@ -8,8 +8,8 @@ import java.time.Duration; import java.time.Instant; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.model.plan.ItinerarySortKey; +import org.opentripplanner.utils.time.DurationUtils; class PageCursorSerializerTest { diff --git a/application/src/test/java/org/opentripplanner/model/plan/paging/cursor/PageCursorTest.java b/application/src/test/java/org/opentripplanner/model/plan/paging/cursor/PageCursorTest.java index f9896c66d6a..bd6037ef4a1 100644 --- a/application/src/test/java/org/opentripplanner/model/plan/paging/cursor/PageCursorTest.java +++ b/application/src/test/java/org/opentripplanner/model/plan/paging/cursor/PageCursorTest.java @@ -2,12 +2,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; -import static org.opentripplanner.framework.collection.ListSection.HEAD; -import static org.opentripplanner.framework.collection.ListSection.TAIL; import static org.opentripplanner.model.plan.SortOrder.STREET_AND_ARRIVAL_TIME; import static org.opentripplanner.model.plan.SortOrder.STREET_AND_DEPARTURE_TIME; import static org.opentripplanner.model.plan.paging.cursor.PageType.NEXT_PAGE; import static org.opentripplanner.model.plan.paging.cursor.PageType.PREVIOUS_PAGE; +import static org.opentripplanner.utils.collection.ListSection.HEAD; +import static org.opentripplanner.utils.collection.ListSection.TAIL; import java.time.Duration; import java.time.Instant; @@ -21,13 +21,13 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.framework.collection.ListSection; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.model.plan.SortOrder; import org.opentripplanner.model.plan.TestItineraryBuilder; import org.opentripplanner.transit.model._data.TimetableRepositoryForTest; +import org.opentripplanner.utils.collection.ListSection; class PageCursorTest implements PlanTestConstants { diff --git a/application/src/test/java/org/opentripplanner/model/transfer/TransferConstraintTest.java b/application/src/test/java/org/opentripplanner/model/transfer/TransferConstraintTest.java index 100e3137f49..47ff414790e 100644 --- a/application/src/test/java/org/opentripplanner/model/transfer/TransferConstraintTest.java +++ b/application/src/test/java/org/opentripplanner/model/transfer/TransferConstraintTest.java @@ -10,7 +10,7 @@ import java.util.function.IntSupplier; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.time.DurationUtils; +import org.opentripplanner.utils.time.DurationUtils; public class TransferConstraintTest { diff --git a/application/src/test/java/org/opentripplanner/raptor/_data/RaptorTestConstants.java b/application/src/test/java/org/opentripplanner/raptor/_data/RaptorTestConstants.java index 78489508dc4..0b5e47c977a 100644 --- a/application/src/test/java/org/opentripplanner/raptor/_data/RaptorTestConstants.java +++ b/application/src/test/java/org/opentripplanner/raptor/_data/RaptorTestConstants.java @@ -1,7 +1,7 @@ package org.opentripplanner.raptor._data; -import static org.opentripplanner.framework.time.DurationUtils.durationInSeconds; -import static org.opentripplanner.framework.time.TimeUtils.hm2time; +import static org.opentripplanner.utils.time.DurationUtils.durationInSeconds; +import static org.opentripplanner.utils.time.TimeUtils.hm2time; import org.opentripplanner.raptor.spi.DefaultSlackProvider; import org.opentripplanner.raptor.spi.RaptorSlackProvider; diff --git a/application/src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilderTestRaptor.java b/application/src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilderTestRaptor.java index de40c29d583..9b37057cdc6 100644 --- a/application/src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilderTestRaptor.java +++ b/application/src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilderTestRaptor.java @@ -2,13 +2,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.opentripplanner.framework.time.DurationUtils.durationInSeconds; -import static org.opentripplanner.framework.time.TimeUtils.time; import static org.opentripplanner.model.transfer.TransferConstraint.REGULAR_TRANSFER; import static org.opentripplanner.raptor._data.stoparrival.BasicPathTestCase.C1_CALCULATOR; import static org.opentripplanner.raptor._data.transit.TestAccessEgress.walk; +import static org.opentripplanner.utils.time.DurationUtils.durationInSeconds; +import static org.opentripplanner.utils.time.TimeUtils.time; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.opentripplanner.raptor._data.RaptorTestConstants; import org.opentripplanner.raptor._data.stoparrival.BasicPathTestCase; diff --git a/application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/BasicPathTestCase.java b/application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/BasicPathTestCase.java index 4a92264e87c..88aa857f76a 100644 --- a/application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/BasicPathTestCase.java +++ b/application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/BasicPathTestCase.java @@ -1,8 +1,6 @@ package org.opentripplanner.raptor._data.stoparrival; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.framework.time.DurationUtils.durationToStr; -import static org.opentripplanner.framework.time.TimeUtils.time; import static org.opentripplanner.model.transfer.TransferConstraint.REGULAR_TRANSFER; import static org.opentripplanner.raptor._data.stoparrival.TestArrivals.access; import static org.opentripplanner.raptor._data.stoparrival.TestArrivals.bus; @@ -11,6 +9,8 @@ import static org.opentripplanner.raptor._data.transit.TestAccessEgress.flexWithOnBoard; import static org.opentripplanner.raptor._data.transit.TestTripPattern.pattern; import static org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.RaptorCostConverter.toRaptorCost; +import static org.opentripplanner.utils.time.DurationUtils.durationToStr; +import static org.opentripplanner.utils.time.TimeUtils.time; import java.util.Arrays; import java.util.List; diff --git a/application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Egress.java b/application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Egress.java index a244acdf720..302de528d9f 100644 --- a/application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Egress.java +++ b/application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Egress.java @@ -1,11 +1,11 @@ package org.opentripplanner.raptor._data.stoparrival; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.raptor._data.transit.TestTripSchedule; import org.opentripplanner.raptor.api.model.PathLegType; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.api.view.ArrivalView; import org.opentripplanner.raptor.api.view.EgressPathView; +import org.opentripplanner.utils.time.TimeUtils; public class Egress extends AbstractStopArrival { diff --git a/application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/FlexAccessAndEgressPathTestCase.java b/application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/FlexAccessAndEgressPathTestCase.java index 1e694e3d771..51639ecc72d 100644 --- a/application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/FlexAccessAndEgressPathTestCase.java +++ b/application/src/test/java/org/opentripplanner/raptor/_data/stoparrival/FlexAccessAndEgressPathTestCase.java @@ -1,15 +1,14 @@ package org.opentripplanner.raptor._data.stoparrival; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.framework.time.DurationUtils.durationInSeconds; -import static org.opentripplanner.framework.time.TimeUtils.time; import static org.opentripplanner.raptor._data.stoparrival.TestArrivals.access; import static org.opentripplanner.raptor._data.stoparrival.TestArrivals.bus; import static org.opentripplanner.raptor.api.model.RaptorValueFormatter.formatC1; import static org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.RaptorCostConverter.toRaptorCost; +import static org.opentripplanner.utils.time.DurationUtils.durationInSeconds; +import static org.opentripplanner.utils.time.TimeUtils.time; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.raptor._data.RaptorTestConstants; import org.opentripplanner.raptor._data.transit.TestAccessEgress; import org.opentripplanner.raptor._data.transit.TestTransfer; @@ -24,6 +23,7 @@ import org.opentripplanner.raptor.spi.RaptorSlackProvider; import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.DefaultCostCalculator; import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.RaptorCostConverter; +import org.opentripplanner.utils.time.TimeUtils; /** * This test case construct two Raptor paths for forward and reverse search, with and without diff --git a/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java b/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java index 8047ec0d4cb..c58240126de 100644 --- a/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java +++ b/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java @@ -9,9 +9,9 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.api.model.RaptorConstants; +import org.opentripplanner.utils.time.TimeUtils; /** * Simple implementation for {@link RaptorAccessEgress} for use in unit-tests. diff --git a/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedBoardingSearch.java b/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedBoardingSearch.java index 7812b9d2fce..5e8980dc50a 100644 --- a/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedBoardingSearch.java +++ b/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedBoardingSearch.java @@ -9,11 +9,11 @@ import java.util.function.BiPredicate; import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.transfer.TransferConstraint; import org.opentripplanner.raptor.spi.RaptorBoardOrAlightEvent; import org.opentripplanner.raptor.spi.RaptorConstrainedBoardingSearch; import org.opentripplanner.raptor.spi.RaptorTimeTable; +import org.opentripplanner.utils.tostring.ToStringBuilder; public class TestConstrainedBoardingSearch implements RaptorConstrainedBoardingSearch { diff --git a/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedTransfer.java b/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedTransfer.java index 66233e4eb74..643585f8c5b 100644 --- a/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedTransfer.java +++ b/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedTransfer.java @@ -1,12 +1,12 @@ package org.opentripplanner.raptor._data.transit; import javax.annotation.Nullable; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.transfer.TransferConstraint; import org.opentripplanner.raptor.api.model.RaptorConstrainedTransfer; import org.opentripplanner.raptor.api.model.RaptorTransferConstraint; import org.opentripplanner.raptor.spi.RaptorBoardOrAlightEvent; import org.opentripplanner.routing.algorithm.raptoradapter.transit.constrainedtransfer.ConstrainedTransferBoarding; +import org.opentripplanner.utils.tostring.ToStringBuilder; class TestConstrainedTransfer implements RaptorConstrainedTransfer { diff --git a/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestRoute.java b/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestRoute.java index c3029b9ebfd..6a606876e0e 100644 --- a/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestRoute.java +++ b/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestRoute.java @@ -3,7 +3,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.transfer.TransferConstraint; import org.opentripplanner.raptor.api.model.SearchDirection; import org.opentripplanner.raptor.spi.RaptorConstrainedBoardingSearch; @@ -12,6 +11,7 @@ import org.opentripplanner.raptor.spi.RaptorTripScheduleSearch; import org.opentripplanner.routing.algorithm.raptoradapter.api.DefaultTripPattern; import org.opentripplanner.routing.algorithm.raptoradapter.transit.request.TripScheduleSearchFactory; +import org.opentripplanner.utils.tostring.ToStringBuilder; public class TestRoute implements RaptorRoute, RaptorTimeTable { diff --git a/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransferPoint.java b/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransferPoint.java index d3a0e4c3d4e..ef2271e51ae 100644 --- a/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransferPoint.java +++ b/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransferPoint.java @@ -1,7 +1,7 @@ package org.opentripplanner.raptor._data.transit; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.transfer.TransferPoint; +import org.opentripplanner.utils.tostring.ToStringBuilder; public class TestTransferPoint implements TransferPoint { diff --git a/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripPattern.java b/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripPattern.java index 63dcbeb5863..811c17cc568 100644 --- a/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripPattern.java +++ b/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripPattern.java @@ -1,8 +1,8 @@ package org.opentripplanner.raptor._data.transit; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.algorithm.raptoradapter.api.DefaultTripPattern; import org.opentripplanner.transit.model.network.Route; +import org.opentripplanner.utils.tostring.ToStringBuilder; public class TestTripPattern implements DefaultTripPattern { diff --git a/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripSchedule.java b/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripSchedule.java index ab8d26406ee..75062d9a61e 100644 --- a/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripSchedule.java +++ b/application/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripSchedule.java @@ -5,15 +5,15 @@ import java.time.LocalDate; import java.util.Arrays; import java.util.stream.IntStream; -import org.opentripplanner.framework.lang.IntUtils; -import org.opentripplanner.framework.time.TimeUtils; -import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; import org.opentripplanner.routing.algorithm.raptoradapter.api.DefaultTripPattern; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripSchedule; import org.opentripplanner.transit.model.basic.Accessibility; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.TripTimes; +import org.opentripplanner.utils.lang.IntUtils; +import org.opentripplanner.utils.time.TimeUtils; +import org.opentripplanner.utils.tostring.ToStringBuilder; /** * An implementation of the {@link RaptorTripSchedule} for unit-testing. diff --git a/application/src/test/java/org/opentripplanner/raptor/api/path/PathTest.java b/application/src/test/java/org/opentripplanner/raptor/api/path/PathTest.java index de71574a952..7ea3c9805f5 100644 --- a/application/src/test/java/org/opentripplanner/raptor/api/path/PathTest.java +++ b/application/src/test/java/org/opentripplanner/raptor/api/path/PathTest.java @@ -3,8 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -import static org.opentripplanner.framework.time.TimeUtils.time; -import static org.opentripplanner.framework.time.TimeUtils.timeToStrCompact; import static org.opentripplanner.raptor._data.stoparrival.BasicPathTestCase.ACCESS_START; import static org.opentripplanner.raptor._data.stoparrival.BasicPathTestCase.BASIC_PATH_AS_DETAILED_STRING; import static org.opentripplanner.raptor._data.stoparrival.BasicPathTestCase.BASIC_PATH_AS_STRING; @@ -13,6 +11,8 @@ import static org.opentripplanner.raptor._data.stoparrival.BasicPathTestCase.TOTAL_C1; import static org.opentripplanner.raptor._data.stoparrival.BasicPathTestCase.basicTripStops; import static org.opentripplanner.raptor._data.transit.TestTripPattern.pattern; +import static org.opentripplanner.utils.time.TimeUtils.time; +import static org.opentripplanner.utils.time.TimeUtils.timeToStrCompact; import java.util.List; import java.util.stream.Collectors; diff --git a/application/src/test/java/org/opentripplanner/raptor/moduletests/B01_AccessTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/B01_AccessTest.java index 37814d6c6dc..76583a38649 100644 --- a/application/src/test/java/org/opentripplanner/raptor/moduletests/B01_AccessTest.java +++ b/application/src/test/java/org/opentripplanner/raptor/moduletests/B01_AccessTest.java @@ -12,7 +12,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.raptor.RaptorService; import org.opentripplanner.raptor._data.RaptorTestConstants; import org.opentripplanner.raptor._data.transit.TestAccessEgress; @@ -22,6 +21,7 @@ import org.opentripplanner.raptor.configure.RaptorConfig; import org.opentripplanner.raptor.moduletests.support.ModuleTestDebugLogging; import org.opentripplanner.raptor.moduletests.support.RaptorModuleTestCase; +import org.opentripplanner.utils.time.DurationUtils; /** * FEATURE UNDER TEST diff --git a/application/src/test/java/org/opentripplanner/raptor/moduletests/F02_EgressWithRidesTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/F02_EgressWithRidesTest.java index 87b2237fac8..1b5164c79a4 100644 --- a/application/src/test/java/org/opentripplanner/raptor/moduletests/F02_EgressWithRidesTest.java +++ b/application/src/test/java/org/opentripplanner/raptor/moduletests/F02_EgressWithRidesTest.java @@ -17,7 +17,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.raptor.RaptorService; import org.opentripplanner.raptor._data.RaptorTestConstants; import org.opentripplanner.raptor._data.transit.TestTransitData; @@ -27,6 +26,7 @@ import org.opentripplanner.raptor.moduletests.support.ModuleTestDebugLogging; import org.opentripplanner.raptor.moduletests.support.RaptorModuleTestCase; import org.opentripplanner.raptor.spi.DefaultSlackProvider; +import org.opentripplanner.utils.time.DurationUtils; /** * FEATURE UNDER TEST diff --git a/application/src/test/java/org/opentripplanner/raptor/moduletests/G01_AccessWithOpeningHoursTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/G01_AccessWithOpeningHoursTest.java index 7f5e5421e79..bf3bf359001 100644 --- a/application/src/test/java/org/opentripplanner/raptor/moduletests/G01_AccessWithOpeningHoursTest.java +++ b/application/src/test/java/org/opentripplanner/raptor/moduletests/G01_AccessWithOpeningHoursTest.java @@ -19,7 +19,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.raptor.RaptorService; import org.opentripplanner.raptor._data.RaptorTestConstants; import org.opentripplanner.raptor._data.transit.TestTransitData; @@ -30,6 +29,7 @@ import org.opentripplanner.raptor.moduletests.support.ModuleTestDebugLogging; import org.opentripplanner.raptor.moduletests.support.RaptorModuleTestCase; import org.opentripplanner.raptor.moduletests.support.RaptorModuleTestCaseFactory; +import org.opentripplanner.utils.time.TimeUtils; /* * FEATURE UNDER TEST diff --git a/application/src/test/java/org/opentripplanner/raptor/moduletests/G02_EgressWithOpeningHoursTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/G02_EgressWithOpeningHoursTest.java index 9498f0b0080..994305cb0d5 100644 --- a/application/src/test/java/org/opentripplanner/raptor/moduletests/G02_EgressWithOpeningHoursTest.java +++ b/application/src/test/java/org/opentripplanner/raptor/moduletests/G02_EgressWithOpeningHoursTest.java @@ -1,7 +1,6 @@ package org.opentripplanner.raptor.moduletests; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.framework.time.TimeUtils.hm2time; import static org.opentripplanner.raptor._data.api.PathUtils.withoutCost; import static org.opentripplanner.raptor._data.transit.TestAccessEgress.walk; import static org.opentripplanner.raptor._data.transit.TestRoute.route; @@ -13,6 +12,7 @@ import static org.opentripplanner.raptor.moduletests.support.RaptorModuleTestConfig.minDuration; import static org.opentripplanner.raptor.moduletests.support.RaptorModuleTestConfig.multiCriteria; import static org.opentripplanner.raptor.moduletests.support.RaptorModuleTestConfig.standard; +import static org.opentripplanner.utils.time.TimeUtils.hm2time; import java.time.Duration; import java.util.List; diff --git a/application/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyAccessTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyAccessTest.java index 778dd36a227..a4753cc2c17 100644 --- a/application/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyAccessTest.java +++ b/application/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyAccessTest.java @@ -1,7 +1,6 @@ package org.opentripplanner.raptor.moduletests; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.framework.time.TimeUtils.time; import static org.opentripplanner.raptor._data.api.PathUtils.withoutCost; import static org.opentripplanner.raptor._data.transit.TestAccessEgress.walk; import static org.opentripplanner.raptor._data.transit.TestRoute.route; @@ -11,6 +10,7 @@ import static org.opentripplanner.raptor.moduletests.support.RaptorModuleTestConfig.TC_STANDARD_REV; import static org.opentripplanner.raptor.moduletests.support.RaptorModuleTestConfig.TC_STANDARD_REV_ONE; import static org.opentripplanner.raptor.moduletests.support.RaptorModuleTestConfig.multiCriteria; +import static org.opentripplanner.utils.time.TimeUtils.time; import java.time.Duration; import java.util.List; diff --git a/application/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyEgressTest.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyEgressTest.java index 1e6897475f4..d75b91c7aee 100644 --- a/application/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyEgressTest.java +++ b/application/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyEgressTest.java @@ -1,7 +1,6 @@ package org.opentripplanner.raptor.moduletests; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.framework.time.TimeUtils.time; import static org.opentripplanner.raptor._data.api.PathUtils.withoutCost; import static org.opentripplanner.raptor._data.transit.TestAccessEgress.walk; import static org.opentripplanner.raptor._data.transit.TestRoute.route; @@ -11,6 +10,7 @@ import static org.opentripplanner.raptor.moduletests.support.RaptorModuleTestConfig.TC_STANDARD_REV; import static org.opentripplanner.raptor.moduletests.support.RaptorModuleTestConfig.TC_STANDARD_REV_ONE; import static org.opentripplanner.raptor.moduletests.support.RaptorModuleTestConfig.multiCriteria; +import static org.opentripplanner.utils.time.TimeUtils.time; import java.time.Duration; import java.util.List; diff --git a/application/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestCaseFactory.java b/application/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestCaseFactory.java index 0f7554dccab..937acd7fcc4 100644 --- a/application/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestCaseFactory.java +++ b/application/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestCaseFactory.java @@ -7,10 +7,10 @@ import java.util.Arrays; import java.util.List; import java.util.function.Consumer; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.raptor._data.transit.TestTripSchedule; import org.opentripplanner.raptor.api.request.RaptorRequestBuilder; import org.opentripplanner.raptor.spi.UnknownPath; +import org.opentripplanner.utils.time.DurationUtils; /** * Factory for {@link RaptorModuleTestConfig}, create a list of test-cases. diff --git a/application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/StopArrivalFactoryC1Test.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/StopArrivalFactoryC1Test.java index d47edf1c58f..4d18cde5232 100644 --- a/application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/StopArrivalFactoryC1Test.java +++ b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c1/StopArrivalFactoryC1Test.java @@ -3,8 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.raptor._data.transit.TestAccessEgress; import org.opentripplanner.raptor._data.transit.TestTransfer; import org.opentripplanner.raptor._data.transit.TestTripPattern; @@ -13,6 +11,8 @@ import org.opentripplanner.raptor.api.view.PatternRideView; import org.opentripplanner.raptor.rangeraptor.multicriteria.arrivals.McStopArrival; import org.opentripplanner.raptor.rangeraptor.multicriteria.ride.c1.PatternRideC1; +import org.opentripplanner.utils.time.DurationUtils; +import org.opentripplanner.utils.time.TimeUtils; public class StopArrivalFactoryC1Test { diff --git a/application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/StopArrivalFactoryC2Test.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/StopArrivalFactoryC2Test.java index 4c78461b016..c71ca7fee11 100644 --- a/application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/StopArrivalFactoryC2Test.java +++ b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/c2/StopArrivalFactoryC2Test.java @@ -3,8 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.raptor._data.transit.TestAccessEgress; import org.opentripplanner.raptor._data.transit.TestTransfer; import org.opentripplanner.raptor._data.transit.TestTripPattern; @@ -13,6 +11,8 @@ import org.opentripplanner.raptor.rangeraptor.multicriteria.arrivals.McStopArrival; import org.opentripplanner.raptor.rangeraptor.multicriteria.ride.c2.PatternRideC2; import org.opentripplanner.raptor.spi.RaptorCostCalculator; +import org.opentripplanner.utils.time.DurationUtils; +import org.opentripplanner.utils.time.TimeUtils; public class StopArrivalFactoryC2Test { diff --git a/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPathsTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPathsTest.java index 144904fa3e6..3939bbb865f 100644 --- a/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPathsTest.java +++ b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPathsTest.java @@ -10,9 +10,9 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.api.request.RaptorProfile; +import org.opentripplanner.utils.time.DurationUtils; class EgressPathsTest { diff --git a/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculatorTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculatorTest.java index ad7a269b856..bf1999d88fc 100644 --- a/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculatorTest.java +++ b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculatorTest.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.opentripplanner.framework.time.TimeUtils.hm2time; import static org.opentripplanner.raptor._data.RaptorTestConstants.D1m; import static org.opentripplanner.raptor._data.RaptorTestConstants.STOP_A; import static org.opentripplanner.raptor._data.RaptorTestConstants.STOP_B; +import static org.opentripplanner.utils.time.TimeUtils.hm2time; import org.junit.jupiter.api.Test; import org.opentripplanner.raptor._data.transit.TestAccessEgress; diff --git a/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTransitCalculatorTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTransitCalculatorTest.java index 10f5e18875b..5fb1cb5fade 100644 --- a/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTransitCalculatorTest.java +++ b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTransitCalculatorTest.java @@ -1,11 +1,11 @@ package org.opentripplanner.raptor.rangeraptor.transit; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.framework.time.TimeUtils.hm2time; import static org.opentripplanner.raptor._data.transit.TestAccessEgress.flex; import static org.opentripplanner.raptor._data.transit.TestAccessEgress.flexAndWalk; import static org.opentripplanner.raptor._data.transit.TestAccessEgress.free; import static org.opentripplanner.raptor._data.transit.TestAccessEgress.walk; +import static org.opentripplanner.utils.time.TimeUtils.hm2time; import org.junit.jupiter.api.Test; import org.opentripplanner.raptor._data.RaptorTestConstants; diff --git a/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculatorTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculatorTest.java index 3afecaf3e81..981fb058f9b 100644 --- a/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculatorTest.java +++ b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculatorTest.java @@ -3,10 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.opentripplanner.framework.time.TimeUtils.hm2time; import static org.opentripplanner.raptor._data.RaptorTestConstants.D1m; import static org.opentripplanner.raptor._data.RaptorTestConstants.STOP_A; import static org.opentripplanner.raptor._data.RaptorTestConstants.STOP_B; +import static org.opentripplanner.utils.time.TimeUtils.hm2time; import org.junit.jupiter.api.Test; import org.opentripplanner.raptor._data.transit.TestTransfer; diff --git a/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearchTest.java b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearchTest.java index 50295b0341e..d70f58fd1c5 100644 --- a/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearchTest.java +++ b/application/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearchTest.java @@ -2,7 +2,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.opentripplanner.framework.time.TimeUtils.timeToStrLong; import static org.opentripplanner.raptor._data.stoparrival.TestArrivals.access; import static org.opentripplanner.raptor._data.stoparrival.TestArrivals.bus; import static org.opentripplanner.raptor._data.transit.TestAccessEgress.free; @@ -11,13 +10,14 @@ import static org.opentripplanner.raptor.rangeraptor.transit.TripTimesSearch.findTripForwardSearchApproximateTime; import static org.opentripplanner.raptor.rangeraptor.transit.TripTimesSearch.findTripReverseSearch; import static org.opentripplanner.raptor.rangeraptor.transit.TripTimesSearch.findTripReverseSearchApproximateTime; +import static org.opentripplanner.utils.time.TimeUtils.timeToStrLong; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.raptor._data.RaptorTestConstants; import org.opentripplanner.raptor._data.transit.TestTripSchedule; import org.opentripplanner.raptor.api.view.ArrivalView; import org.opentripplanner.raptor.spi.BoardAndAlightTime; +import org.opentripplanner.utils.time.TimeUtils; public class TripTimesSearchTest implements RaptorTestConstants { diff --git a/application/src/test/java/org/opentripplanner/raptor/spi/RaptorTripScheduleTest.java b/application/src/test/java/org/opentripplanner/raptor/spi/RaptorTripScheduleTest.java index 6b4392a13a9..9188617016a 100644 --- a/application/src/test/java/org/opentripplanner/raptor/spi/RaptorTripScheduleTest.java +++ b/application/src/test/java/org/opentripplanner/raptor/spi/RaptorTripScheduleTest.java @@ -1,7 +1,7 @@ package org.opentripplanner.raptor.spi; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.framework.time.TimeUtils.timeToStrLong; +import static org.opentripplanner.utils.time.TimeUtils.timeToStrLong; import org.junit.jupiter.api.Test; import org.opentripplanner.raptor._data.transit.TestTripPattern; diff --git a/application/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetTest.java b/application/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetTest.java index 1c410c13e1c..5f2d56cfcdd 100644 --- a/application/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetTest.java +++ b/application/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetTest.java @@ -12,7 +12,7 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.lang.IntUtils; +import org.opentripplanner.utils.lang.IntUtils; public class ParetoSetTest { diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveBikeRentalWithMostlyWalkingTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveBikeRentalWithMostlyWalkingTest.java index 4e47306601c..c1dc34413cd 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveBikeRentalWithMostlyWalkingTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveBikeRentalWithMostlyWalkingTest.java @@ -8,9 +8,9 @@ import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.utils.time.DurationUtils; +import org.opentripplanner.utils.time.TimeUtils; public class RemoveBikeRentalWithMostlyWalkingTest { diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveParkAndRideWithMostlyWalkingTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveParkAndRideWithMostlyWalkingTest.java index a4c90d1346f..88baabb1e2a 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveParkAndRideWithMostlyWalkingTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveParkAndRideWithMostlyWalkingTest.java @@ -8,9 +8,9 @@ import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.utils.time.DurationUtils; +import org.opentripplanner.utils.time.TimeUtils; public class RemoveParkAndRideWithMostlyWalkingTest { diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveWalkOnlyFilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveWalkOnlyFilterTest.java index 359423a842b..6281c4f744c 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveWalkOnlyFilterTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveWalkOnlyFilterTest.java @@ -8,9 +8,9 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.utils.time.DurationUtils; +import org.opentripplanner.utils.time.TimeUtils; public class RemoveWalkOnlyFilterTest { diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/FlexSearchWindowFilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/FlexSearchWindowFilterTest.java index 30c8872b859..dd51ccbcd19 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/FlexSearchWindowFilterTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/FlexSearchWindowFilterTest.java @@ -2,8 +2,8 @@ import static com.google.common.truth.Truth.assertThat; 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.Duration; import java.time.Instant; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilterTest.java index 622482fe4b3..1943104e1d0 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilterTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilterTest.java @@ -8,9 +8,9 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.collection.ListSection; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.paging.cursor.PageCursorInput; +import org.opentripplanner.utils.collection.ListSection; public class NumItinerariesFilterTest { diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/OutsideSearchWindowFilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/OutsideSearchWindowFilterTest.java index 6e475ac5893..0e61d146d17 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/OutsideSearchWindowFilterTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/OutsideSearchWindowFilterTest.java @@ -4,8 +4,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; 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.Duration; import java.util.List; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/PagingFilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/PagingFilterTest.java index 713e72e344c..165cddd31f3 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/PagingFilterTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/PagingFilterTest.java @@ -1,10 +1,10 @@ package org.opentripplanner.routing.algorithm.filterchain.filters.system; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.framework.collection.ListUtils.first; -import static org.opentripplanner.framework.collection.ListUtils.last; import static org.opentripplanner.model.plan.Itinerary.toStr; import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; +import static org.opentripplanner.utils.collection.ListUtils.first; +import static org.opentripplanner.utils.collection.ListUtils.last; import java.util.ArrayList; import java.util.List; @@ -13,14 +13,14 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.opentripplanner._support.debug.TestDebug; -import org.opentripplanner.framework.collection.ListSection; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.model.plan.SortOrder; import org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator; import org.opentripplanner.transit.model._data.TimetableRepositoryForTest; +import org.opentripplanner.utils.collection.ListSection; +import org.opentripplanner.utils.time.TimeUtils; public class PagingFilterTest implements PlanTestConstants { diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/PagingServiceFactoryTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/PagingServiceFactoryTest.java index 369f58d6ef1..64797b9c5a1 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/PagingServiceFactoryTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/PagingServiceFactoryTest.java @@ -7,14 +7,14 @@ import java.time.Instant; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.raptor._data.transit.TestAccessEgress; import org.opentripplanner.raptor.api.request.RaptorRequestBuilder; import org.opentripplanner.raptor.api.request.RaptorTuningParameters; import org.opentripplanner.raptor.api.request.SearchParams; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TransitTuningParameters; import org.opentripplanner.routing.api.request.RouteRequest; +import org.opentripplanner.utils.time.DurationUtils; +import org.opentripplanner.utils.time.TimeUtils; class PagingServiceFactoryTest { diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java index 4887b1e6f03..ede3166e22b 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java @@ -24,7 +24,6 @@ import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.framework.model.TimeAndCost; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.plan.Leg; @@ -67,6 +66,7 @@ import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.TimetableRepository; +import org.opentripplanner.utils.time.TimeUtils; public class RaptorPathToItineraryMapperTest { diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/SnapshotTestBase.java b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/SnapshotTestBase.java index 98acfeeb7af..cab308c092b 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/SnapshotTestBase.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/SnapshotTestBase.java @@ -41,7 +41,6 @@ import org.opentripplanner.api.parameter.Qualifier; import org.opentripplanner.ext.restapi.mapping.ItineraryMapper; import org.opentripplanner.ext.restapi.model.ApiLeg; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; @@ -54,6 +53,7 @@ import org.opentripplanner.standalone.api.OtpServerRequestContext; import org.opentripplanner.transit.model.basic.MainAndSubMode; import org.opentripplanner.transit.model.basic.TransitMode; +import org.opentripplanner.utils.time.TimeUtils; /** * A base class for creating snapshots test of itinerary generation using the Portland graph. diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressPenaltyDecoratorTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressPenaltyDecoratorTest.java index 78b12a97b82..a1b58ce76fa 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressPenaltyDecoratorTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressPenaltyDecoratorTest.java @@ -10,7 +10,6 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; import org.opentripplanner.routing.api.request.StreetMode; @@ -19,6 +18,7 @@ import org.opentripplanner.routing.api.request.framework.TimePenalty; import org.opentripplanner.street.search.state.State; import org.opentripplanner.street.search.state.TestStateBuilder; +import org.opentripplanner.utils.time.DurationUtils; class AccessEgressPenaltyDecoratorTest { diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreatorTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreatorTest.java index b81792877ae..7df9677082d 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreatorTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreatorTest.java @@ -10,7 +10,6 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.model.StopTime; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripPatternForDate; import org.opentripplanner.transit.model._data.TimetableRepositoryForTest; @@ -22,6 +21,7 @@ import org.opentripplanner.transit.model.network.grouppriority.TransitGroupPriorityService; import org.opentripplanner.transit.model.timetable.ScheduledTripTimes; import org.opentripplanner.transit.model.timetable.TripTimes; +import org.opentripplanner.utils.time.ServiceDateUtils; public class RaptorRoutingRequestTransitDataCreatorTest { diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TestRouteData.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TestRouteData.java index 1d266ce9953..5c345e55931 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TestRouteData.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TestRouteData.java @@ -12,7 +12,6 @@ import java.util.Map; import java.util.stream.Collectors; import org.opentripplanner.framework.i18n.NonLocalizedString; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.model.StopTime; import org.opentripplanner.raptor.spi.RaptorTimeTable; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripPatternForDate; @@ -29,6 +28,7 @@ import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.transit.model.timetable.TripTimesFactory; +import org.opentripplanner.utils.time.TimeUtils; public class TestRouteData { diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/MinSafeTransferTimeCalculatorTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/MinSafeTransferTimeCalculatorTest.java index ae10dd0d03e..9b0cf342c0b 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/MinSafeTransferTimeCalculatorTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/MinSafeTransferTimeCalculatorTest.java @@ -1,18 +1,18 @@ package org.opentripplanner.routing.algorithm.transferoptimization.model; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.framework.time.TimeUtils.time; import static org.opentripplanner.raptor._data.stoparrival.BasicPathTestCase.C1_CALCULATOR; import static org.opentripplanner.routing.algorithm.transferoptimization.model.MinSafeTransferTimeCalculator.bound; +import static org.opentripplanner.utils.time.TimeUtils.time; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.raptor._data.RaptorTestConstants; import org.opentripplanner.raptor._data.api.TestPathBuilder; import org.opentripplanner.raptor._data.stoparrival.BasicPathTestCase; import org.opentripplanner.raptor._data.transit.TestTripSchedule; import org.opentripplanner.raptor.api.path.RaptorPath; +import org.opentripplanner.utils.time.DurationUtils; public class MinSafeTransferTimeCalculatorTest implements RaptorTestConstants { diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TransferWaitTimeCostCalculatorTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TransferWaitTimeCostCalculatorTest.java index 3d5ae037428..3a375f7968a 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TransferWaitTimeCostCalculatorTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TransferWaitTimeCostCalculatorTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.opentripplanner.framework.time.DurationUtils.durationInSeconds; +import static org.opentripplanner.utils.time.DurationUtils.durationInSeconds; import org.junit.jupiter.api.Test; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TripStopTimeTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TripStopTimeTest.java index 0c0d50dfe74..e81b51c4eaa 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TripStopTimeTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/TripStopTimeTest.java @@ -1,13 +1,13 @@ package org.opentripplanner.routing.algorithm.transferoptimization.model; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.framework.time.TimeUtils.time; import static org.opentripplanner.routing.algorithm.transferoptimization.model.StopTime.stopTime; +import static org.opentripplanner.utils.time.TimeUtils.time; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.raptor._data.transit.TestTripPattern; import org.opentripplanner.raptor._data.transit.TestTripSchedule; +import org.opentripplanner.utils.time.TimeUtils; public class TripStopTimeTest { diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughNoTransfersTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughNoTransfersTest.java index 926e6ebe15c..11552ea3d1e 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughNoTransfersTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughNoTransfersTest.java @@ -1,11 +1,11 @@ package org.opentripplanner.routing.algorithm.transferoptimization.model.passthrough; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.framework.time.TimeUtils.time; import static org.opentripplanner.routing.algorithm.transferoptimization.model.passthrough.TestCase.testCase; import static org.opentripplanner.routing.algorithm.transferoptimization.model.passthrough.TestUtils.domainService; import static org.opentripplanner.routing.algorithm.transferoptimization.model.passthrough.TestUtils.first; import static org.opentripplanner.routing.algorithm.transferoptimization.model.passthrough.TestUtils.pathBuilder; +import static org.opentripplanner.utils.time.TimeUtils.time; import java.util.List; import org.junit.jupiter.params.ParameterizedTest; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughOneTransferTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughOneTransferTest.java index ad41f43a586..acd99ab4bef 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughOneTransferTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughOneTransferTest.java @@ -1,12 +1,12 @@ package org.opentripplanner.routing.algorithm.transferoptimization.model.passthrough; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.framework.time.TimeUtils.time; import static org.opentripplanner.routing.algorithm.transferoptimization.model.passthrough.TestCase.testCase; import static org.opentripplanner.routing.algorithm.transferoptimization.model.passthrough.TestUtils.domainService; import static org.opentripplanner.routing.algorithm.transferoptimization.model.passthrough.TestUtils.pathBuilder; import static org.opentripplanner.routing.algorithm.transferoptimization.model.passthrough.TestUtils.pathFocus; import static org.opentripplanner.routing.algorithm.transferoptimization.model.passthrough.TestUtils.tx; +import static org.opentripplanner.utils.time.TimeUtils.time; import java.util.List; import java.util.stream.Collectors; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughTwoTransfersTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughTwoTransfersTest.java index e92e0ba0b3b..05da490c857 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughTwoTransfersTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/PassThroughTwoTransfersTest.java @@ -1,11 +1,11 @@ package org.opentripplanner.routing.algorithm.transferoptimization.model.passthrough; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.framework.time.TimeUtils.time; import static org.opentripplanner.routing.algorithm.transferoptimization.model.passthrough.TestCase.testCase; import static org.opentripplanner.routing.algorithm.transferoptimization.model.passthrough.TestUtils.domainService; import static org.opentripplanner.routing.algorithm.transferoptimization.model.passthrough.TestUtils.pathBuilder; import static org.opentripplanner.routing.algorithm.transferoptimization.model.passthrough.TestUtils.tx; +import static org.opentripplanner.utils.time.TimeUtils.time; import java.util.List; import org.junit.jupiter.params.ParameterizedTest; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/WalkDurationForStopCombinations.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/WalkDurationForStopCombinations.java index cfd8f6c4e53..66bb1e02c17 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/WalkDurationForStopCombinations.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/passthrough/WalkDurationForStopCombinations.java @@ -4,8 +4,8 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.opentripplanner.framework.lang.IntUtils; import org.opentripplanner.raptor.api.request.PassThroughPoint; +import org.opentripplanner.utils.lang.IntUtils; /** * This class is used to adjust the walk time - giving each path an unique generalized-cost. We want diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/OptimizePathDomainServiceConstrainedTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/OptimizePathDomainServiceConstrainedTest.java index a040da1d23f..109032a0110 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/OptimizePathDomainServiceConstrainedTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/OptimizePathDomainServiceConstrainedTest.java @@ -2,12 +2,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.opentripplanner.framework.time.TimeUtils.time; import static org.opentripplanner.model.transfer.TransferPriority.ALLOWED; import static org.opentripplanner.model.transfer.TransferPriority.NOT_ALLOWED; import static org.opentripplanner.model.transfer.TransferPriority.PREFERRED; import static org.opentripplanner.model.transfer.TransferPriority.RECOMMENDED; import static org.opentripplanner.routing.algorithm.transferoptimization.services.TransferGeneratorDummy.dummyTransferGenerator; +import static org.opentripplanner.utils.time.TimeUtils.time; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/OptimizePathDomainServiceTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/OptimizePathDomainServiceTest.java index be927046c43..54c45b8a76b 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/OptimizePathDomainServiceTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/OptimizePathDomainServiceTest.java @@ -1,9 +1,9 @@ package org.opentripplanner.routing.algorithm.transferoptimization.services; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.framework.time.TimeUtils.time; import static org.opentripplanner.routing.algorithm.transferoptimization.services.TestTransferBuilder.tx; import static org.opentripplanner.routing.algorithm.transferoptimization.services.TransferGeneratorDummy.dummyTransferGenerator; +import static org.opentripplanner.utils.time.TimeUtils.time; import java.util.List; import javax.annotation.Nullable; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TestTransferBuilder.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TestTransferBuilder.java index 90dd9e5915e..d553bac75eb 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TestTransferBuilder.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TestTransferBuilder.java @@ -1,7 +1,6 @@ package org.opentripplanner.routing.algorithm.transferoptimization.services; import java.util.Objects; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.model.transfer.ConstrainedTransfer; import org.opentripplanner.model.transfer.TransferConstraint; import org.opentripplanner.model.transfer.TransferPriority; @@ -13,6 +12,7 @@ import org.opentripplanner.routing.algorithm.transferoptimization.model.TripToTripTransfer; import org.opentripplanner.transit.model._data.TimetableRepositoryForTest; import org.opentripplanner.transit.model.timetable.Trip; +import org.opentripplanner.utils.time.TimeUtils; /** * This builder is used to create a {@link ConstrainedTransfer} for use in unit-tests. It build a diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransferGeneratorTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransferGeneratorTest.java index 4283e5cca62..acaefbcf1d9 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransferGeneratorTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransferGeneratorTest.java @@ -16,7 +16,6 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.model.transfer.TransferConstraint; import org.opentripplanner.raptor._data.RaptorTestConstants; import org.opentripplanner.raptor._data.api.TestPathBuilder; @@ -29,6 +28,7 @@ import org.opentripplanner.raptor.api.path.TransitPathLeg; import org.opentripplanner.raptor.spi.DefaultSlackProvider; import org.opentripplanner.raptor.spi.RaptorSlackProvider; +import org.opentripplanner.utils.time.TimeUtils; public class TransferGeneratorTest implements RaptorTestConstants { diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransitPathLegSelectorTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransitPathLegSelectorTest.java index d62f123e7d6..5ce84b4a00d 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransitPathLegSelectorTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransitPathLegSelectorTest.java @@ -8,7 +8,6 @@ import java.util.Set; import java.util.stream.Collectors; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.raptor._data.RaptorTestConstants; import org.opentripplanner.raptor._data.transit.TestAccessEgress; import org.opentripplanner.raptor._data.transit.TestTripSchedule; @@ -21,6 +20,7 @@ import org.opentripplanner.routing.algorithm.transferoptimization.model.OptimizedPathTail; import org.opentripplanner.routing.algorithm.transferoptimization.model.PathTailFilter; import org.opentripplanner.routing.algorithm.transferoptimization.model.costfilter.MinCostPathTailFilterFactory; +import org.opentripplanner.utils.time.TimeUtils; public class TransitPathLegSelectorTest implements RaptorTestConstants { diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/via/ViaRoutingWorkerTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/via/ViaRoutingWorkerTest.java index 7b2a4d7e7a6..c11b25d4ac3 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/via/ViaRoutingWorkerTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/via/ViaRoutingWorkerTest.java @@ -10,7 +10,6 @@ import java.time.ZonedDateTime; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Place; @@ -22,6 +21,7 @@ import org.opentripplanner.routing.api.response.RoutingResponse; import org.opentripplanner.routing.api.response.ViaRoutingResponseConnection; import org.opentripplanner.transit.model._data.TimetableRepositoryForTest; +import org.opentripplanner.utils.time.TimeUtils; /** * Create search from point A to point B via point C. Search will start at 12:00 and will find two diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/framework/CostLinearFunctionTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/framework/CostLinearFunctionTest.java index e4f42fcd409..8d972896878 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/framework/CostLinearFunctionTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/framework/CostLinearFunctionTest.java @@ -13,8 +13,8 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.framework.model.Cost; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.test.support.TestTableParser; +import org.opentripplanner.utils.time.DurationUtils; class CostLinearFunctionTest { diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerializationTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerializationTest.java index 46ef4b50e77..dbb33e1f97b 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerializationTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerializationTest.java @@ -12,8 +12,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.test.support.TestTableParser; +import org.opentripplanner.utils.time.DurationUtils; class LinearFunctionSerializationTest { diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyTest.java index 58370722e7c..c13fb0e8c63 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyTest.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.framework.model.TimeAndCost; -import org.opentripplanner.framework.time.DurationUtils; +import org.opentripplanner.utils.time.DurationUtils; class TimeAndCostPenaltyTest { diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/framework/TimePenaltyTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/framework/TimePenaltyTest.java index 087ffa1d637..7321653192e 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/framework/TimePenaltyTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/framework/TimePenaltyTest.java @@ -7,7 +7,7 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.time.DurationUtils; +import org.opentripplanner.utils.time.DurationUtils; class TimePenaltyTest { diff --git a/application/src/test/java/org/opentripplanner/service/paging/PS1_LegacyMetaDataTest.java b/application/src/test/java/org/opentripplanner/service/paging/PS1_LegacyMetaDataTest.java index 609607d84ff..e87e2a5e406 100644 --- a/application/src/test/java/org/opentripplanner/service/paging/PS1_LegacyMetaDataTest.java +++ b/application/src/test/java/org/opentripplanner/service/paging/PS1_LegacyMetaDataTest.java @@ -5,7 +5,7 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.time.TimeUtils; +import org.opentripplanner.utils.time.TimeUtils; /** * This tests the entire paging service module. diff --git a/application/src/test/java/org/opentripplanner/service/paging/PS3_FewItinerariesOnSearchWindowLimitTest.java b/application/src/test/java/org/opentripplanner/service/paging/PS3_FewItinerariesOnSearchWindowLimitTest.java index 4db61579a47..fffcf93e5fb 100644 --- a/application/src/test/java/org/opentripplanner/service/paging/PS3_FewItinerariesOnSearchWindowLimitTest.java +++ b/application/src/test/java/org/opentripplanner/service/paging/PS3_FewItinerariesOnSearchWindowLimitTest.java @@ -11,12 +11,12 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.SortOrder; import org.opentripplanner.model.plan.paging.cursor.PageCursor; import org.opentripplanner.model.plan.paging.cursor.PageType; +import org.opentripplanner.utils.time.TimeUtils; /** * This test focus on testing the paging with few itineraries. There should be no page-cuts. The diff --git a/application/src/test/java/org/opentripplanner/service/paging/TestDriver.java b/application/src/test/java/org/opentripplanner/service/paging/TestDriver.java index 928fbaaf01d..e5cbb02012d 100644 --- a/application/src/test/java/org/opentripplanner/service/paging/TestDriver.java +++ b/application/src/test/java/org/opentripplanner/service/paging/TestDriver.java @@ -5,8 +5,6 @@ import java.util.List; import javax.annotation.Nullable; import org.opentripplanner._support.debug.TestDebug; -import org.opentripplanner.framework.collection.ListSection; -import org.opentripplanner.framework.lang.Box; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.SortOrder; @@ -15,6 +13,8 @@ import org.opentripplanner.routing.algorithm.filterchain.filters.system.NumItinerariesFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.system.OutsideSearchWindowFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.system.PagingFilter; +import org.opentripplanner.utils.collection.ListSection; +import org.opentripplanner.utils.lang.Box; /** * This class simulate/mock the context the paging is operating in. diff --git a/application/src/test/java/org/opentripplanner/service/paging/TestPagingModel.java b/application/src/test/java/org/opentripplanner/service/paging/TestPagingModel.java index c4db100b56f..9a30b5e8a90 100644 --- a/application/src/test/java/org/opentripplanner/service/paging/TestPagingModel.java +++ b/application/src/test/java/org/opentripplanner/service/paging/TestPagingModel.java @@ -1,13 +1,12 @@ package org.opentripplanner.service.paging; -import static org.opentripplanner.framework.time.TimeUtils.hm2time; import static org.opentripplanner.model.plan.SortOrder.STREET_AND_ARRIVAL_TIME; import static org.opentripplanner.model.plan.SortOrder.STREET_AND_DEPARTURE_TIME; +import static org.opentripplanner.utils.time.TimeUtils.hm2time; import java.time.Duration; import java.time.Instant; import java.util.List; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.SortOrder; @@ -15,6 +14,7 @@ import org.opentripplanner.model.plan.paging.cursor.PageCursor; import org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator; import org.opentripplanner.transit.model._data.TimetableRepositoryForTest; +import org.opentripplanner.utils.time.TimeUtils; class TestPagingModel { diff --git a/application/src/test/java/org/opentripplanner/standalone/config/OtpConfigLoaderTest.java b/application/src/test/java/org/opentripplanner/standalone/config/OtpConfigLoaderTest.java index c67983355e1..8dae448e2c6 100644 --- a/application/src/test/java/org/opentripplanner/standalone/config/OtpConfigLoaderTest.java +++ b/application/src/test/java/org/opentripplanner/standalone/config/OtpConfigLoaderTest.java @@ -15,8 +15,8 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.lang.StringUtils; import org.opentripplanner.standalone.config.framework.file.ConfigFileLoader; +import org.opentripplanner.utils.lang.StringUtils; public class OtpConfigLoaderTest { diff --git a/application/src/test/java/org/opentripplanner/standalone/config/framework/file/ConfigFileLoaderTest.java b/application/src/test/java/org/opentripplanner/standalone/config/framework/file/ConfigFileLoaderTest.java index 6cdba6e4b51..2e698efb64d 100644 --- a/application/src/test/java/org/opentripplanner/standalone/config/framework/file/ConfigFileLoaderTest.java +++ b/application/src/test/java/org/opentripplanner/standalone/config/framework/file/ConfigFileLoaderTest.java @@ -14,8 +14,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.opentripplanner.framework.application.OtpAppException; -import org.opentripplanner.framework.lang.StringUtils; import org.opentripplanner.standalone.config.OtpConfigLoader; +import org.opentripplanner.utils.lang.StringUtils; class ConfigFileLoaderTest { diff --git a/application/src/test/java/org/opentripplanner/standalone/config/framework/file/IncludeFileDirectiveTest.java b/application/src/test/java/org/opentripplanner/standalone/config/framework/file/IncludeFileDirectiveTest.java index cfdda47c160..0fc1199236d 100644 --- a/application/src/test/java/org/opentripplanner/standalone/config/framework/file/IncludeFileDirectiveTest.java +++ b/application/src/test/java/org/opentripplanner/standalone/config/framework/file/IncludeFileDirectiveTest.java @@ -8,7 +8,7 @@ import java.nio.file.Files; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.lang.StringUtils; +import org.opentripplanner.utils.lang.StringUtils; public class IncludeFileDirectiveTest { diff --git a/application/src/test/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesTest.java b/application/src/test/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesTest.java index 75bf99a3fcc..06469a34b2a 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesTest.java @@ -10,11 +10,11 @@ import java.util.BitSet; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.transit.model._data.TimetableRepositoryForTest; import org.opentripplanner.transit.model.basic.Accessibility; import org.opentripplanner.transit.model.framework.DataValidationException; import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.utils.time.TimeUtils; class ScheduledTripTimesTest { diff --git a/application/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingTimeTest.java b/application/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingTimeTest.java index 5036defdb88..88b113aec53 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingTimeTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingTimeTest.java @@ -5,7 +5,7 @@ import java.time.LocalTime; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.time.TimeUtils; +import org.opentripplanner.utils.time.TimeUtils; class BookingTimeTest { diff --git a/application/src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java b/application/src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java index e0f507a7983..2b9dfaface8 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java @@ -13,7 +13,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.framework.time.TimeUtils; +import org.opentripplanner.utils.time.TimeUtils; class RoutingBookingInfoTest { diff --git a/application/src/test/java/org/opentripplanner/transit/speed_test/ResultPrinter.java b/application/src/test/java/org/opentripplanner/transit/speed_test/ResultPrinter.java index 29348a7e911..1d34c88f08e 100644 --- a/application/src/test/java/org/opentripplanner/transit/speed_test/ResultPrinter.java +++ b/application/src/test/java/org/opentripplanner/transit/speed_test/ResultPrinter.java @@ -1,17 +1,17 @@ package org.opentripplanner.transit.speed_test; -import static org.opentripplanner.framework.time.DurationUtils.msToSecondsStr; +import static org.opentripplanner.utils.time.DurationUtils.msToSecondsStr; import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.opentripplanner.framework.lang.IntUtils; -import org.opentripplanner.framework.text.Table; import org.opentripplanner.transit.speed_test.model.SpeedTestProfile; import org.opentripplanner.transit.speed_test.model.testcase.TestCase; import org.opentripplanner.transit.speed_test.model.testcase.TestCaseFailedException; import org.opentripplanner.transit.speed_test.model.testcase.TestCases; import org.opentripplanner.transit.speed_test.model.timer.SpeedTestTimer; +import org.opentripplanner.utils.lang.IntUtils; +import org.opentripplanner.utils.text.Table; /** * Printing stuff clutters up the code, so it is convenient to put printing and formatting output diff --git a/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/ItineraryResultMapper.java b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/ItineraryResultMapper.java index 24cbea4aaa0..18d742b895f 100644 --- a/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/ItineraryResultMapper.java +++ b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/ItineraryResultMapper.java @@ -9,7 +9,6 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import org.opentripplanner.framework.lang.IntUtils; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.model.plan.StreetLeg; @@ -19,6 +18,7 @@ import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.organization.Agency; import org.opentripplanner.transit.model.site.StopLocation; +import org.opentripplanner.utils.lang.IntUtils; /** * Map an Itinerary to a result instance. We do this to normalize the Itinerary for the purpose of diff --git a/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/Result.java b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/Result.java index d44c8e4d8cb..34c63d49dfb 100644 --- a/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/Result.java +++ b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/Result.java @@ -4,10 +4,10 @@ import java.util.Collection; import java.util.Comparator; import java.util.List; -import org.opentripplanner.framework.collection.CompositeComparator; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.transit.model.basic.TransitMode; +import org.opentripplanner.utils.collection.CompositeComparator; +import org.opentripplanner.utils.time.DurationUtils; +import org.opentripplanner.utils.time.TimeUtils; /** * This class is responsible for holding information about a test result - a single itinerary. The diff --git a/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TableTestReport.java b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TableTestReport.java index 7534529492f..a746e744a96 100644 --- a/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TableTestReport.java +++ b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TableTestReport.java @@ -1,16 +1,16 @@ package org.opentripplanner.transit.speed_test.model.testcase; -import static org.opentripplanner.framework.text.Table.Align.Center; -import static org.opentripplanner.framework.text.Table.Align.Left; -import static org.opentripplanner.framework.text.Table.Align.Right; +import static org.opentripplanner.utils.text.Table.Align.Center; +import static org.opentripplanner.utils.text.Table.Align.Left; +import static org.opentripplanner.utils.text.Table.Align.Right; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; -import org.opentripplanner.framework.text.Table; -import org.opentripplanner.framework.text.TableBuilder; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.routing.util.DiffEntry; +import org.opentripplanner.utils.text.Table; +import org.opentripplanner.utils.text.TableBuilder; +import org.opentripplanner.utils.time.TimeUtils; /** * This class is responsible for creating a test report as a table. The Table is easy to read and diff --git a/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestCaseDefinition.java b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestCaseDefinition.java index 4a99798b10e..604a4bd1743 100644 --- a/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestCaseDefinition.java +++ b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/TestCaseDefinition.java @@ -2,10 +2,10 @@ import java.time.Duration; import org.opentripplanner.api.parameter.QualifiedModeSet; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.time.TimeUtils; -import org.opentripplanner.framework.tostring.ValueObjectToStringBuilder; import org.opentripplanner.model.GenericLocation; +import org.opentripplanner.utils.time.DurationUtils; +import org.opentripplanner.utils.time.TimeUtils; +import org.opentripplanner.utils.tostring.ValueObjectToStringBuilder; public record TestCaseDefinition( String id, diff --git a/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/io/AbstractCsvFile.java b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/io/AbstractCsvFile.java index c703476290e..fe5287b13c3 100644 --- a/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/io/AbstractCsvFile.java +++ b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/io/AbstractCsvFile.java @@ -14,9 +14,9 @@ import java.util.function.Function; import java.util.regex.Pattern; import java.util.stream.Collectors; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.transit.speed_test.model.testcase.TestCase; +import org.opentripplanner.utils.time.DurationUtils; +import org.opentripplanner.utils.time.TimeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/application/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java index e817c6e18bb..8e3c793666a 100644 --- a/application/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java +++ b/application/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java @@ -24,7 +24,6 @@ import org.opentripplanner.ConstantsForTests; import org.opentripplanner.TestOtpModel; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.model.Timetable; import org.opentripplanner.model.TimetableSnapshot; import org.opentripplanner.transit.model.framework.FeedScopedId; @@ -37,6 +36,7 @@ import org.opentripplanner.transit.service.TransitService; import org.opentripplanner.updater.GtfsRealtimeFuzzyTripMatcher; import org.opentripplanner.updater.TimetableSnapshotSourceParameters; +import org.opentripplanner.utils.time.ServiceDateUtils; public class TimetableSnapshotSourceTest { diff --git a/application/src/test/java/org/opentripplanner/updater/trip/TripInput.java b/application/src/test/java/org/opentripplanner/updater/trip/TripInput.java index e4d9309061a..eb4f3685659 100644 --- a/application/src/test/java/org/opentripplanner/updater/trip/TripInput.java +++ b/application/src/test/java/org/opentripplanner/updater/trip/TripInput.java @@ -2,9 +2,9 @@ import java.util.ArrayList; import java.util.List; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.site.RegularStop; +import org.opentripplanner.utils.time.TimeUtils; /** * A simple data structure that is used by the {@link RealtimeTestEnvironment} to create diff --git a/application/src/test/java/org/opentripplanner/updater/trip/TripUpdateBuilder.java b/application/src/test/java/org/opentripplanner/updater/trip/TripUpdateBuilder.java index 2960d92a9cd..e8218edfc1f 100644 --- a/application/src/test/java/org/opentripplanner/updater/trip/TripUpdateBuilder.java +++ b/application/src/test/java/org/opentripplanner/updater/trip/TripUpdateBuilder.java @@ -7,7 +7,7 @@ import java.time.LocalDate; import java.time.ZoneId; import java.time.ZonedDateTime; -import org.opentripplanner.framework.time.ServiceDateUtils; +import org.opentripplanner.utils.time.ServiceDateUtils; public class TripUpdateBuilder { diff --git a/utils/src/main/java/org/opentripplanner/utils/collection/CollectionUtils.java b/utils/src/main/java/org/opentripplanner/utils/collection/CollectionUtils.java index 27473dd1383..bb53ec11037 100644 --- a/utils/src/main/java/org/opentripplanner/utils/collection/CollectionUtils.java +++ b/utils/src/main/java/org/opentripplanner/utils/collection/CollectionUtils.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.collection; +package org.opentripplanner.utils.collection; import java.util.Collection; import java.util.Map; diff --git a/utils/src/main/java/org/opentripplanner/utils/collection/CollectionsView.java b/utils/src/main/java/org/opentripplanner/utils/collection/CollectionsView.java index 4ca6ae5f555..599846f9d86 100644 --- a/utils/src/main/java/org/opentripplanner/utils/collection/CollectionsView.java +++ b/utils/src/main/java/org/opentripplanner/utils/collection/CollectionsView.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.collection; +package org.opentripplanner.utils.collection; import java.io.Serializable; import java.util.AbstractCollection; diff --git a/utils/src/main/java/org/opentripplanner/utils/collection/CompositeComparator.java b/utils/src/main/java/org/opentripplanner/utils/collection/CompositeComparator.java index 286df07370a..0c2cf445504 100644 --- a/utils/src/main/java/org/opentripplanner/utils/collection/CompositeComparator.java +++ b/utils/src/main/java/org/opentripplanner/utils/collection/CompositeComparator.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.collection; +package org.opentripplanner.utils.collection; import java.util.Comparator; diff --git a/utils/src/main/java/org/opentripplanner/utils/collection/ListSection.java b/utils/src/main/java/org/opentripplanner/utils/collection/ListSection.java index d9878aa34b1..ce582f32e65 100644 --- a/utils/src/main/java/org/opentripplanner/utils/collection/ListSection.java +++ b/utils/src/main/java/org/opentripplanner/utils/collection/ListSection.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.collection; +package org.opentripplanner.utils.collection; /** * This enum is used to signal which part of a list an operation apply to. You may remove elements diff --git a/utils/src/main/java/org/opentripplanner/utils/collection/ListUtils.java b/utils/src/main/java/org/opentripplanner/utils/collection/ListUtils.java index 35b7e083695..c2f263d0044 100644 --- a/utils/src/main/java/org/opentripplanner/utils/collection/ListUtils.java +++ b/utils/src/main/java/org/opentripplanner/utils/collection/ListUtils.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.collection; +package org.opentripplanner.utils.collection; import java.util.ArrayList; import java.util.Arrays; diff --git a/utils/src/main/java/org/opentripplanner/utils/collection/MapUtils.java b/utils/src/main/java/org/opentripplanner/utils/collection/MapUtils.java index afd1e87aec2..0a67e01b9fb 100644 --- a/utils/src/main/java/org/opentripplanner/utils/collection/MapUtils.java +++ b/utils/src/main/java/org/opentripplanner/utils/collection/MapUtils.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.collection; +package org.opentripplanner.utils.collection; import java.util.Arrays; import java.util.Collection; diff --git a/utils/src/main/java/org/opentripplanner/utils/collection/SetUtils.java b/utils/src/main/java/org/opentripplanner/utils/collection/SetUtils.java index b8f773aab72..fec99c8b28c 100644 --- a/utils/src/main/java/org/opentripplanner/utils/collection/SetUtils.java +++ b/utils/src/main/java/org/opentripplanner/utils/collection/SetUtils.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.collection; +package org.opentripplanner.utils.collection; import java.util.Arrays; import java.util.Collection; diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/ArrayUtils.java b/utils/src/main/java/org/opentripplanner/utils/lang/ArrayUtils.java index a3a67cb67cd..afd8e59ec0b 100644 --- a/utils/src/main/java/org/opentripplanner/utils/lang/ArrayUtils.java +++ b/utils/src/main/java/org/opentripplanner/utils/lang/ArrayUtils.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.lang; +package org.opentripplanner.utils.lang; import javax.annotation.Nullable; diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/BitSetUtils.java b/utils/src/main/java/org/opentripplanner/utils/lang/BitSetUtils.java index 1f5bdb91fab..afb9654e56e 100644 --- a/utils/src/main/java/org/opentripplanner/utils/lang/BitSetUtils.java +++ b/utils/src/main/java/org/opentripplanner/utils/lang/BitSetUtils.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.lang; +package org.opentripplanner.utils.lang; /** * A compact bit set utility class. It rely on the client to store the bit set himself (either as a diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/Box.java b/utils/src/main/java/org/opentripplanner/utils/lang/Box.java index ae54a3c5b7f..e7d32acdbe9 100644 --- a/utils/src/main/java/org/opentripplanner/utils/lang/Box.java +++ b/utils/src/main/java/org/opentripplanner/utils/lang/Box.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.lang; +package org.opentripplanner.utils.lang; import java.util.Objects; import javax.annotation.Nullable; diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/DoubleUtils.java b/utils/src/main/java/org/opentripplanner/utils/lang/DoubleUtils.java index 0267e9e3b5d..a285ade8ad5 100644 --- a/utils/src/main/java/org/opentripplanner/utils/lang/DoubleUtils.java +++ b/utils/src/main/java/org/opentripplanner/utils/lang/DoubleUtils.java @@ -1,6 +1,6 @@ -package org.opentripplanner.framework.lang; +package org.opentripplanner.utils.lang; -import static org.opentripplanner.framework.lang.OtpNumberFormat.formatTwoDecimals; +import static org.opentripplanner.utils.lang.OtpNumberFormat.formatTwoDecimals; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/IntBox.java b/utils/src/main/java/org/opentripplanner/utils/lang/IntBox.java index 3e7a828a526..c564f6f8e25 100644 --- a/utils/src/main/java/org/opentripplanner/utils/lang/IntBox.java +++ b/utils/src/main/java/org/opentripplanner/utils/lang/IntBox.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.lang; +package org.opentripplanner.utils.lang; /** * An IntBox is a writable container for an int. The most common use-case for this class is to diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/IntRange.java b/utils/src/main/java/org/opentripplanner/utils/lang/IntRange.java index c8ff5b45d46..88477cbce27 100644 --- a/utils/src/main/java/org/opentripplanner/utils/lang/IntRange.java +++ b/utils/src/main/java/org/opentripplanner/utils/lang/IntRange.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.lang; +package org.opentripplanner.utils.lang; import java.util.Objects; import java.util.Optional; diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/IntUtils.java b/utils/src/main/java/org/opentripplanner/utils/lang/IntUtils.java index de4904dcd7c..31dbd9fa72b 100644 --- a/utils/src/main/java/org/opentripplanner/utils/lang/IntUtils.java +++ b/utils/src/main/java/org/opentripplanner/utils/lang/IntUtils.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.lang; +package org.opentripplanner.utils.lang; import java.util.ArrayList; import java.util.Arrays; diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/MemEfficientArrayBuilder.java b/utils/src/main/java/org/opentripplanner/utils/lang/MemEfficientArrayBuilder.java index 7bf36dd5b86..740cfa2e60c 100644 --- a/utils/src/main/java/org/opentripplanner/utils/lang/MemEfficientArrayBuilder.java +++ b/utils/src/main/java/org/opentripplanner/utils/lang/MemEfficientArrayBuilder.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.lang; +package org.opentripplanner.utils.lang; import java.util.Arrays; import java.util.Objects; diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/ObjectUtils.java b/utils/src/main/java/org/opentripplanner/utils/lang/ObjectUtils.java index a3f18748987..da619cdeb79 100644 --- a/utils/src/main/java/org/opentripplanner/utils/lang/ObjectUtils.java +++ b/utils/src/main/java/org/opentripplanner/utils/lang/ObjectUtils.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.lang; +package org.opentripplanner.utils.lang; import java.util.function.Function; import java.util.function.Supplier; diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/OtpNumberFormat.java b/utils/src/main/java/org/opentripplanner/utils/lang/OtpNumberFormat.java index 1ff2aca37a3..3dd1e0d76e7 100644 --- a/utils/src/main/java/org/opentripplanner/utils/lang/OtpNumberFormat.java +++ b/utils/src/main/java/org/opentripplanner/utils/lang/OtpNumberFormat.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.lang; +package org.opentripplanner.utils.lang; import java.math.BigInteger; import java.text.DecimalFormat; diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/Sandbox.java b/utils/src/main/java/org/opentripplanner/utils/lang/Sandbox.java index 67c9644fc0f..5b4d83e7772 100644 --- a/utils/src/main/java/org/opentripplanner/utils/lang/Sandbox.java +++ b/utils/src/main/java/org/opentripplanner/utils/lang/Sandbox.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.lang; +package org.opentripplanner.utils.lang; import static java.lang.annotation.ElementType.CONSTRUCTOR; import static java.lang.annotation.ElementType.FIELD; diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/StringUtils.java b/utils/src/main/java/org/opentripplanner/utils/lang/StringUtils.java index 5d18981e0e3..72eb2638c13 100644 --- a/utils/src/main/java/org/opentripplanner/utils/lang/StringUtils.java +++ b/utils/src/main/java/org/opentripplanner/utils/lang/StringUtils.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.lang; +package org.opentripplanner.utils.lang; import java.util.regex.Pattern; diff --git a/utils/src/main/java/org/opentripplanner/utils/logging/ProgressTracker.java b/utils/src/main/java/org/opentripplanner/utils/logging/ProgressTracker.java index 4be70e2abdf..4922186bfc6 100644 --- a/utils/src/main/java/org/opentripplanner/utils/logging/ProgressTracker.java +++ b/utils/src/main/java/org/opentripplanner/utils/logging/ProgressTracker.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.logging; +package org.opentripplanner.utils.logging; import java.io.InputStream; import java.io.OutputStream; @@ -7,8 +7,8 @@ import java.time.Instant; import java.util.concurrent.atomic.AtomicLong; import java.util.function.Consumer; -import org.opentripplanner.framework.text.FileSizeToTextConverter; -import org.opentripplanner.framework.time.DurationUtils; +import org.opentripplanner.utils.text.FileSizeToTextConverter; +import org.opentripplanner.utils.time.DurationUtils; /** * The progress tracker notify the caller based a time interval. diff --git a/utils/src/main/java/org/opentripplanner/utils/logging/ProgressTrackerInputStream.java b/utils/src/main/java/org/opentripplanner/utils/logging/ProgressTrackerInputStream.java index 1e5a5386275..6e3b71bfe66 100644 --- a/utils/src/main/java/org/opentripplanner/utils/logging/ProgressTrackerInputStream.java +++ b/utils/src/main/java/org/opentripplanner/utils/logging/ProgressTrackerInputStream.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.logging; +package org.opentripplanner.utils.logging; import java.io.IOException; import java.io.InputStream; diff --git a/utils/src/main/java/org/opentripplanner/utils/logging/ProgressTrackerOutputStream.java b/utils/src/main/java/org/opentripplanner/utils/logging/ProgressTrackerOutputStream.java index 38095634bdd..5f4583b8ed7 100644 --- a/utils/src/main/java/org/opentripplanner/utils/logging/ProgressTrackerOutputStream.java +++ b/utils/src/main/java/org/opentripplanner/utils/logging/ProgressTrackerOutputStream.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.logging; +package org.opentripplanner.utils.logging; import java.io.IOException; import java.io.OutputStream; diff --git a/utils/src/main/java/org/opentripplanner/utils/logging/Throttle.java b/utils/src/main/java/org/opentripplanner/utils/logging/Throttle.java index ed8a2c1bef4..393bef0c19a 100644 --- a/utils/src/main/java/org/opentripplanner/utils/logging/Throttle.java +++ b/utils/src/main/java/org/opentripplanner/utils/logging/Throttle.java @@ -1,7 +1,7 @@ -package org.opentripplanner.framework.logging; +package org.opentripplanner.utils.logging; import java.time.Duration; -import org.opentripplanner.framework.time.TimeUtils; +import org.opentripplanner.utils.time.TimeUtils; /** * This class can be used to throttle (logging) events. diff --git a/utils/src/main/java/org/opentripplanner/utils/text/CharacterEscapeFormatter.java b/utils/src/main/java/org/opentripplanner/utils/text/CharacterEscapeFormatter.java index 2bd5bf14b71..46faba6e806 100644 --- a/utils/src/main/java/org/opentripplanner/utils/text/CharacterEscapeFormatter.java +++ b/utils/src/main/java/org/opentripplanner/utils/text/CharacterEscapeFormatter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.text; +package org.opentripplanner.utils.text; /** * This class is used to escape characters in a string, removing a special character from diff --git a/utils/src/main/java/org/opentripplanner/utils/text/FileSizeToTextConverter.java b/utils/src/main/java/org/opentripplanner/utils/text/FileSizeToTextConverter.java index e110d626480..41b04fd3194 100644 --- a/utils/src/main/java/org/opentripplanner/utils/text/FileSizeToTextConverter.java +++ b/utils/src/main/java/org/opentripplanner/utils/text/FileSizeToTextConverter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.text; +package org.opentripplanner.utils.text; import java.util.Locale; diff --git a/utils/src/main/java/org/opentripplanner/utils/text/HexString.java b/utils/src/main/java/org/opentripplanner/utils/text/HexString.java index e85a139b624..16d5c56c58b 100644 --- a/utils/src/main/java/org/opentripplanner/utils/text/HexString.java +++ b/utils/src/main/java/org/opentripplanner/utils/text/HexString.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.text; +package org.opentripplanner.utils.text; /** * Converts a byte array to its hexadecimal representation diff --git a/utils/src/main/java/org/opentripplanner/utils/text/MarkdownFormatter.java b/utils/src/main/java/org/opentripplanner/utils/text/MarkdownFormatter.java index 6fdb495a0d5..95e54a1bb3f 100644 --- a/utils/src/main/java/org/opentripplanner/utils/text/MarkdownFormatter.java +++ b/utils/src/main/java/org/opentripplanner/utils/text/MarkdownFormatter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.text; +package org.opentripplanner.utils.text; import javax.annotation.Nullable; diff --git a/utils/src/main/java/org/opentripplanner/utils/text/Table.java b/utils/src/main/java/org/opentripplanner/utils/text/Table.java index 940868b82e2..bf13c23bcf5 100644 --- a/utils/src/main/java/org/opentripplanner/utils/text/Table.java +++ b/utils/src/main/java/org/opentripplanner/utils/text/Table.java @@ -1,11 +1,11 @@ -package org.opentripplanner.framework.text; +package org.opentripplanner.utils.text; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.opentripplanner.framework.lang.ObjectUtils; -import org.opentripplanner.framework.lang.StringUtils; +import org.opentripplanner.utils.lang.ObjectUtils; +import org.opentripplanner.utils.lang.StringUtils; /** * This class is responsible for creating a pretty table that can be printed to a terminal window. diff --git a/utils/src/main/java/org/opentripplanner/utils/text/TableBuilder.java b/utils/src/main/java/org/opentripplanner/utils/text/TableBuilder.java index 12e80fd62a8..e573cce6c37 100644 --- a/utils/src/main/java/org/opentripplanner/utils/text/TableBuilder.java +++ b/utils/src/main/java/org/opentripplanner/utils/text/TableBuilder.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.text; +package org.opentripplanner.utils.text; import java.util.ArrayList; import java.util.Arrays; diff --git a/utils/src/main/java/org/opentripplanner/utils/text/TableRowFormatter.java b/utils/src/main/java/org/opentripplanner/utils/text/TableRowFormatter.java index 3e7e3c727f9..9db03403a0a 100644 --- a/utils/src/main/java/org/opentripplanner/utils/text/TableRowFormatter.java +++ b/utils/src/main/java/org/opentripplanner/utils/text/TableRowFormatter.java @@ -1,9 +1,9 @@ -package org.opentripplanner.framework.text; +package org.opentripplanner.utils.text; import java.util.List; import java.util.function.Function; -import org.opentripplanner.framework.lang.ObjectUtils; -import org.opentripplanner.framework.lang.StringUtils; +import org.opentripplanner.utils.lang.ObjectUtils; +import org.opentripplanner.utils.lang.StringUtils; class TableRowFormatter { diff --git a/utils/src/main/java/org/opentripplanner/utils/time/CountdownTimer.java b/utils/src/main/java/org/opentripplanner/utils/time/CountdownTimer.java index 5d6d89147a8..674e512c535 100644 --- a/utils/src/main/java/org/opentripplanner/utils/time/CountdownTimer.java +++ b/utils/src/main/java/org/opentripplanner/utils/time/CountdownTimer.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.time; +package org.opentripplanner.utils.time; import java.time.Duration; import java.util.function.LongSupplier; diff --git a/utils/src/main/java/org/opentripplanner/utils/time/DateUtils.java b/utils/src/main/java/org/opentripplanner/utils/time/DateUtils.java index 36f62fb0448..a72098e43ab 100644 --- a/utils/src/main/java/org/opentripplanner/utils/time/DateUtils.java +++ b/utils/src/main/java/org/opentripplanner/utils/time/DateUtils.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.time; +package org.opentripplanner.utils.time; import java.time.Duration; import java.time.Instant; diff --git a/utils/src/main/java/org/opentripplanner/utils/time/DurationUtils.java b/utils/src/main/java/org/opentripplanner/utils/time/DurationUtils.java index 362fe17410e..d73faecee03 100644 --- a/utils/src/main/java/org/opentripplanner/utils/time/DurationUtils.java +++ b/utils/src/main/java/org/opentripplanner/utils/time/DurationUtils.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.time; +package org.opentripplanner.utils.time; import static java.util.Locale.ROOT; diff --git a/utils/src/main/java/org/opentripplanner/utils/time/LocalDateUtils.java b/utils/src/main/java/org/opentripplanner/utils/time/LocalDateUtils.java index dd11065bb12..6b5bf1f8f2f 100644 --- a/utils/src/main/java/org/opentripplanner/utils/time/LocalDateUtils.java +++ b/utils/src/main/java/org/opentripplanner/utils/time/LocalDateUtils.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.time; +package org.opentripplanner.utils.time; import java.time.LocalDate; import java.time.Period; diff --git a/utils/src/main/java/org/opentripplanner/utils/time/OffsetDateTimeParser.java b/utils/src/main/java/org/opentripplanner/utils/time/OffsetDateTimeParser.java index 8b40697977a..1bf33c2959f 100644 --- a/utils/src/main/java/org/opentripplanner/utils/time/OffsetDateTimeParser.java +++ b/utils/src/main/java/org/opentripplanner/utils/time/OffsetDateTimeParser.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.time; +package org.opentripplanner.utils.time; import java.text.ParseException; import java.time.OffsetDateTime; diff --git a/utils/src/main/java/org/opentripplanner/utils/time/RelativeTime.java b/utils/src/main/java/org/opentripplanner/utils/time/RelativeTime.java index b01486f8d7f..b4b13a7c68b 100644 --- a/utils/src/main/java/org/opentripplanner/utils/time/RelativeTime.java +++ b/utils/src/main/java/org/opentripplanner/utils/time/RelativeTime.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.time; +package org.opentripplanner.utils.time; import java.time.LocalDate; import java.time.LocalTime; diff --git a/utils/src/main/java/org/opentripplanner/utils/time/ServiceDateUtils.java b/utils/src/main/java/org/opentripplanner/utils/time/ServiceDateUtils.java index a2652015155..e8243ec6355 100644 --- a/utils/src/main/java/org/opentripplanner/utils/time/ServiceDateUtils.java +++ b/utils/src/main/java/org/opentripplanner/utils/time/ServiceDateUtils.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.time; +package org.opentripplanner.utils.time; import java.text.ParseException; import java.time.Duration; diff --git a/utils/src/main/java/org/opentripplanner/utils/time/TimeUtils.java b/utils/src/main/java/org/opentripplanner/utils/time/TimeUtils.java index f2d2cf5de41..2c1bde17f1b 100644 --- a/utils/src/main/java/org/opentripplanner/utils/time/TimeUtils.java +++ b/utils/src/main/java/org/opentripplanner/utils/time/TimeUtils.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.time; +package org.opentripplanner.utils.time; import java.security.SecureRandom; import java.time.Duration; diff --git a/utils/src/main/java/org/opentripplanner/utils/tostring/MultiLineToStringBuilder.java b/utils/src/main/java/org/opentripplanner/utils/tostring/MultiLineToStringBuilder.java index 32f5762843a..a3d794aef63 100644 --- a/utils/src/main/java/org/opentripplanner/utils/tostring/MultiLineToStringBuilder.java +++ b/utils/src/main/java/org/opentripplanner/utils/tostring/MultiLineToStringBuilder.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.tostring; +package org.opentripplanner.utils.tostring; import java.time.Duration; import java.util.ArrayList; @@ -8,7 +8,7 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; -import org.opentripplanner.framework.time.DurationUtils; +import org.opentripplanner.utils.time.DurationUtils; /** * When debug logging it is much more readable if the logging is nicely formatted with line-breaks. diff --git a/utils/src/main/java/org/opentripplanner/utils/tostring/ToStringBuilder.java b/utils/src/main/java/org/opentripplanner/utils/tostring/ToStringBuilder.java index f600a2a31bc..de40951ff75 100644 --- a/utils/src/main/java/org/opentripplanner/utils/tostring/ToStringBuilder.java +++ b/utils/src/main/java/org/opentripplanner/utils/tostring/ToStringBuilder.java @@ -1,7 +1,7 @@ -package org.opentripplanner.framework.tostring; +package org.opentripplanner.utils.tostring; import static java.lang.Boolean.TRUE; -import static org.opentripplanner.framework.time.DurationUtils.durationToStr; +import static org.opentripplanner.utils.time.DurationUtils.durationToStr; import java.time.Duration; import java.time.Instant; @@ -16,10 +16,10 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.opentripplanner.framework.lang.ObjectUtils; -import org.opentripplanner.framework.lang.OtpNumberFormat; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.time.TimeUtils; +import org.opentripplanner.utils.lang.ObjectUtils; +import org.opentripplanner.utils.lang.OtpNumberFormat; +import org.opentripplanner.utils.time.DurationUtils; +import org.opentripplanner.utils.time.TimeUtils; /** * This toString builder which add elements to a compact string of the form: diff --git a/utils/src/main/java/org/opentripplanner/utils/tostring/ValueObjectToStringBuilder.java b/utils/src/main/java/org/opentripplanner/utils/tostring/ValueObjectToStringBuilder.java index 14584a8dd4a..e80323ee0fb 100644 --- a/utils/src/main/java/org/opentripplanner/utils/tostring/ValueObjectToStringBuilder.java +++ b/utils/src/main/java/org/opentripplanner/utils/tostring/ValueObjectToStringBuilder.java @@ -1,11 +1,11 @@ -package org.opentripplanner.framework.tostring; +package org.opentripplanner.utils.tostring; import java.time.Duration; import java.time.Instant; import java.util.function.Function; -import org.opentripplanner.framework.lang.OtpNumberFormat; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.time.TimeUtils; +import org.opentripplanner.utils.lang.OtpNumberFormat; +import org.opentripplanner.utils.time.DurationUtils; +import org.opentripplanner.utils.time.TimeUtils; /** * Use this to-string-builder to build value objects. A [ValueObject](http://wiki.c2.com/?ValueObject) diff --git a/utils/src/test/java/org/opentripplanner/utils/collection/CollectionUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/collection/CollectionUtilsTest.java index 9cfe118f984..a79f91e3464 100644 --- a/utils/src/test/java/org/opentripplanner/utils/collection/CollectionUtilsTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/collection/CollectionUtilsTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.collection; +package org.opentripplanner.utils.collection; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/utils/src/test/java/org/opentripplanner/utils/collection/CollectionsViewTest.java b/utils/src/test/java/org/opentripplanner/utils/collection/CollectionsViewTest.java index 4196ff98e08..191540f3876 100644 --- a/utils/src/test/java/org/opentripplanner/utils/collection/CollectionsViewTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/collection/CollectionsViewTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.collection; +package org.opentripplanner.utils.collection; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/utils/src/test/java/org/opentripplanner/utils/collection/CompositeComparatorTest.java b/utils/src/test/java/org/opentripplanner/utils/collection/CompositeComparatorTest.java index 5329683d336..03dbb7d1c71 100644 --- a/utils/src/test/java/org/opentripplanner/utils/collection/CompositeComparatorTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/collection/CompositeComparatorTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.collection; +package org.opentripplanner.utils.collection; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/utils/src/test/java/org/opentripplanner/utils/collection/ListSectionTest.java b/utils/src/test/java/org/opentripplanner/utils/collection/ListSectionTest.java index 199804e4881..01ce5a2d336 100644 --- a/utils/src/test/java/org/opentripplanner/utils/collection/ListSectionTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/collection/ListSectionTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.collection; +package org.opentripplanner.utils.collection; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/utils/src/test/java/org/opentripplanner/utils/collection/ListUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/collection/ListUtilsTest.java index 33dce1f5574..602182a64b4 100644 --- a/utils/src/test/java/org/opentripplanner/utils/collection/ListUtilsTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/collection/ListUtilsTest.java @@ -1,9 +1,9 @@ -package org.opentripplanner.framework.collection; +package org.opentripplanner.utils.collection; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; -import static org.opentripplanner.framework.collection.ListUtils.first; -import static org.opentripplanner.framework.collection.ListUtils.last; +import static org.opentripplanner.utils.collection.ListUtils.first; +import static org.opentripplanner.utils.collection.ListUtils.last; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/utils/src/test/java/org/opentripplanner/utils/collection/MapUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/collection/MapUtilsTest.java index 047a8e61d6b..100e56fec03 100644 --- a/utils/src/test/java/org/opentripplanner/utils/collection/MapUtilsTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/collection/MapUtilsTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.collection; +package org.opentripplanner.utils.collection; import static java.util.Collections.singleton; import static java.util.Collections.singletonList; @@ -6,7 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.opentripplanner.framework.collection.MapUtils.mapToList; +import static org.opentripplanner.utils.collection.MapUtils.mapToList; import java.util.Collections; import java.util.Map; diff --git a/utils/src/test/java/org/opentripplanner/utils/collection/SetUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/collection/SetUtilsTest.java index 8e55e27e79b..e1c8d84eca3 100644 --- a/utils/src/test/java/org/opentripplanner/utils/collection/SetUtilsTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/collection/SetUtilsTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.collection; +package org.opentripplanner.utils.collection; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/utils/src/test/java/org/opentripplanner/utils/lang/ArrayUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/lang/ArrayUtilsTest.java index 8933555e75c..9d512af5770 100644 --- a/utils/src/test/java/org/opentripplanner/utils/lang/ArrayUtilsTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/lang/ArrayUtilsTest.java @@ -1,8 +1,8 @@ -package org.opentripplanner.framework.lang; +package org.opentripplanner.utils.lang; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.opentripplanner.framework.lang.ArrayUtils.hasContent; +import static org.opentripplanner.utils.lang.ArrayUtils.hasContent; import org.junit.jupiter.api.Test; diff --git a/utils/src/test/java/org/opentripplanner/utils/lang/BitSetUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/lang/BitSetUtilsTest.java index 83da400f69c..6327da849b4 100644 --- a/utils/src/test/java/org/opentripplanner/utils/lang/BitSetUtilsTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/lang/BitSetUtilsTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.lang; +package org.opentripplanner.utils.lang; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/utils/src/test/java/org/opentripplanner/utils/lang/BoxTest.java b/utils/src/test/java/org/opentripplanner/utils/lang/BoxTest.java index 7e072fd2f5a..b9f9218fe07 100644 --- a/utils/src/test/java/org/opentripplanner/utils/lang/BoxTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/lang/BoxTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.lang; +package org.opentripplanner.utils.lang; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/utils/src/test/java/org/opentripplanner/utils/lang/DoubleUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/lang/DoubleUtilsTest.java index cb3b0e8b1d6..415b5e939b9 100644 --- a/utils/src/test/java/org/opentripplanner/utils/lang/DoubleUtilsTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/lang/DoubleUtilsTest.java @@ -1,15 +1,15 @@ -package org.opentripplanner.framework.lang; +package org.opentripplanner.utils.lang; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.opentripplanner.framework.lang.DoubleUtils.requireInRange; -import static org.opentripplanner.framework.lang.DoubleUtils.roundTo1Decimal; -import static org.opentripplanner.framework.lang.DoubleUtils.roundTo2Decimals; -import static org.opentripplanner.framework.lang.DoubleUtils.roundTo3Decimals; -import static org.opentripplanner.framework.lang.DoubleUtils.roundTo4Decimals; -import static org.opentripplanner.framework.lang.DoubleUtils.roundToZeroDecimals; +import static org.opentripplanner.utils.lang.DoubleUtils.requireInRange; +import static org.opentripplanner.utils.lang.DoubleUtils.roundTo1Decimal; +import static org.opentripplanner.utils.lang.DoubleUtils.roundTo2Decimals; +import static org.opentripplanner.utils.lang.DoubleUtils.roundTo3Decimals; +import static org.opentripplanner.utils.lang.DoubleUtils.roundTo4Decimals; +import static org.opentripplanner.utils.lang.DoubleUtils.roundToZeroDecimals; import org.junit.jupiter.api.Test; diff --git a/utils/src/test/java/org/opentripplanner/utils/lang/IntBoxTest.java b/utils/src/test/java/org/opentripplanner/utils/lang/IntBoxTest.java index d2151b4bea7..1dea3cb7d79 100644 --- a/utils/src/test/java/org/opentripplanner/utils/lang/IntBoxTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/lang/IntBoxTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.lang; +package org.opentripplanner.utils.lang; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/utils/src/test/java/org/opentripplanner/utils/lang/IntRangeTest.java b/utils/src/test/java/org/opentripplanner/utils/lang/IntRangeTest.java index da6300b3953..f568cd5df36 100644 --- a/utils/src/test/java/org/opentripplanner/utils/lang/IntRangeTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/lang/IntRangeTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.lang; +package org.opentripplanner.utils.lang; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/utils/src/test/java/org/opentripplanner/utils/lang/IntUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/lang/IntUtilsTest.java index 3d5c92c9258..99b32f47f0a 100644 --- a/utils/src/test/java/org/opentripplanner/utils/lang/IntUtilsTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/lang/IntUtilsTest.java @@ -1,18 +1,18 @@ -package org.opentripplanner.framework.lang; +package org.opentripplanner.utils.lang; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.opentripplanner.framework.lang.IntUtils.concat; -import static org.opentripplanner.framework.lang.IntUtils.intArray; -import static org.opentripplanner.framework.lang.IntUtils.intArrayToString; -import static org.opentripplanner.framework.lang.IntUtils.intToString; -import static org.opentripplanner.framework.lang.IntUtils.requireInRange; -import static org.opentripplanner.framework.lang.IntUtils.requireNotNegative; -import static org.opentripplanner.framework.lang.IntUtils.requireNullOrNotNegative; -import static org.opentripplanner.framework.lang.IntUtils.shiftArray; -import static org.opentripplanner.framework.lang.IntUtils.standardDeviation; +import static org.opentripplanner.utils.lang.IntUtils.concat; +import static org.opentripplanner.utils.lang.IntUtils.intArray; +import static org.opentripplanner.utils.lang.IntUtils.intArrayToString; +import static org.opentripplanner.utils.lang.IntUtils.intToString; +import static org.opentripplanner.utils.lang.IntUtils.requireInRange; +import static org.opentripplanner.utils.lang.IntUtils.requireNotNegative; +import static org.opentripplanner.utils.lang.IntUtils.requireNullOrNotNegative; +import static org.opentripplanner.utils.lang.IntUtils.shiftArray; +import static org.opentripplanner.utils.lang.IntUtils.standardDeviation; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/utils/src/test/java/org/opentripplanner/utils/lang/MemEfficientArrayBuilderTest.java b/utils/src/test/java/org/opentripplanner/utils/lang/MemEfficientArrayBuilderTest.java index 16468868fe7..99297b29f1d 100644 --- a/utils/src/test/java/org/opentripplanner/utils/lang/MemEfficientArrayBuilderTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/lang/MemEfficientArrayBuilderTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.lang; +package org.opentripplanner.utils.lang; import static java.time.DayOfWeek.MONDAY; import static java.time.DayOfWeek.SATURDAY; diff --git a/utils/src/test/java/org/opentripplanner/utils/lang/ObjectUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/lang/ObjectUtilsTest.java index 274fb3e8700..3f6283543fc 100644 --- a/utils/src/test/java/org/opentripplanner/utils/lang/ObjectUtilsTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/lang/ObjectUtilsTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.lang; +package org.opentripplanner.utils.lang; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/utils/src/test/java/org/opentripplanner/utils/lang/OtpNumberFormatTest.java b/utils/src/test/java/org/opentripplanner/utils/lang/OtpNumberFormatTest.java index af5d28af94b..b8cfe684692 100644 --- a/utils/src/test/java/org/opentripplanner/utils/lang/OtpNumberFormatTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/lang/OtpNumberFormatTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.lang; +package org.opentripplanner.utils.lang; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/utils/src/test/java/org/opentripplanner/utils/lang/StringUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/lang/StringUtilsTest.java index 0e67344b2bb..7e8f0a6217b 100644 --- a/utils/src/test/java/org/opentripplanner/utils/lang/StringUtilsTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/lang/StringUtilsTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.lang; +package org.opentripplanner.utils.lang; import static java.lang.Boolean.FALSE; import static java.lang.Boolean.TRUE; diff --git a/utils/src/test/java/org/opentripplanner/utils/logging/ProgressTrackerTest.java b/utils/src/test/java/org/opentripplanner/utils/logging/ProgressTrackerTest.java index fbbc7b9a7a6..c297aac136f 100644 --- a/utils/src/test/java/org/opentripplanner/utils/logging/ProgressTrackerTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/logging/ProgressTrackerTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.logging; +package org.opentripplanner.utils.logging; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/utils/src/test/java/org/opentripplanner/utils/logging/ThrottleTest.java b/utils/src/test/java/org/opentripplanner/utils/logging/ThrottleTest.java index c9155992daa..eec907588c6 100644 --- a/utils/src/test/java/org/opentripplanner/utils/logging/ThrottleTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/logging/ThrottleTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.logging; +package org.opentripplanner.utils.logging; import java.time.Duration; import java.util.ArrayList; diff --git a/utils/src/test/java/org/opentripplanner/utils/text/CharacterEscapeFormatterTest.java b/utils/src/test/java/org/opentripplanner/utils/text/CharacterEscapeFormatterTest.java index b33b06babb6..15dc7139f30 100644 --- a/utils/src/test/java/org/opentripplanner/utils/text/CharacterEscapeFormatterTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/text/CharacterEscapeFormatterTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.text; +package org.opentripplanner.utils.text; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/utils/src/test/java/org/opentripplanner/utils/text/FileSizeToTextConverterTest.java b/utils/src/test/java/org/opentripplanner/utils/text/FileSizeToTextConverterTest.java index 0d91792423b..b860ff3f09d 100644 --- a/utils/src/test/java/org/opentripplanner/utils/text/FileSizeToTextConverterTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/text/FileSizeToTextConverterTest.java @@ -1,7 +1,7 @@ -package org.opentripplanner.framework.text; +package org.opentripplanner.utils.text; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.framework.text.FileSizeToTextConverter.fileSizeToString; +import static org.opentripplanner.utils.text.FileSizeToTextConverter.fileSizeToString; import org.junit.jupiter.api.Test; diff --git a/utils/src/test/java/org/opentripplanner/utils/text/HexStringTest.java b/utils/src/test/java/org/opentripplanner/utils/text/HexStringTest.java index 2a565857155..7efc4e3fa61 100644 --- a/utils/src/test/java/org/opentripplanner/utils/text/HexStringTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/text/HexStringTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.text; +package org.opentripplanner.utils.text; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/utils/src/test/java/org/opentripplanner/utils/text/MarkdownFormatterTest.java b/utils/src/test/java/org/opentripplanner/utils/text/MarkdownFormatterTest.java index b31f7fd8a26..602d9e3b6c5 100644 --- a/utils/src/test/java/org/opentripplanner/utils/text/MarkdownFormatterTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/text/MarkdownFormatterTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.text; +package org.opentripplanner.utils.text; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/utils/src/test/java/org/opentripplanner/utils/text/TableTest.java b/utils/src/test/java/org/opentripplanner/utils/text/TableTest.java index f79a766c80c..98915faebb1 100644 --- a/utils/src/test/java/org/opentripplanner/utils/text/TableTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/text/TableTest.java @@ -1,10 +1,10 @@ -package org.opentripplanner.framework.text; +package org.opentripplanner.utils.text; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.opentripplanner.framework.text.Table.Align.Center; -import static org.opentripplanner.framework.text.Table.Align.Left; -import static org.opentripplanner.framework.text.Table.Align.Right; +import static org.opentripplanner.utils.text.Table.Align.Center; +import static org.opentripplanner.utils.text.Table.Align.Left; +import static org.opentripplanner.utils.text.Table.Align.Right; import org.junit.jupiter.api.Test; diff --git a/utils/src/test/java/org/opentripplanner/utils/time/CountdownTimerTest.java b/utils/src/test/java/org/opentripplanner/utils/time/CountdownTimerTest.java index 4d5bdd6fe1d..a30be79cbf9 100644 --- a/utils/src/test/java/org/opentripplanner/utils/time/CountdownTimerTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/time/CountdownTimerTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.time; +package org.opentripplanner.utils.time; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/utils/src/test/java/org/opentripplanner/utils/time/DateUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/time/DateUtilsTest.java index 6b2e493b735..ac153b9a2ba 100644 --- a/utils/src/test/java/org/opentripplanner/utils/time/DateUtilsTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/time/DateUtilsTest.java @@ -1,7 +1,7 @@ -package org.opentripplanner.framework.time; +package org.opentripplanner.utils.time; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.framework.time.DateUtils.secToHHMM; +import static org.opentripplanner.utils.time.DateUtils.secToHHMM; import java.time.LocalDate; import java.time.ZoneId; diff --git a/utils/src/test/java/org/opentripplanner/utils/time/DurationUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/time/DurationUtilsTest.java index de6ac046310..ef2e0f50901 100644 --- a/utils/src/test/java/org/opentripplanner/utils/time/DurationUtilsTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/time/DurationUtilsTest.java @@ -1,13 +1,13 @@ -package org.opentripplanner.framework.time; +package org.opentripplanner.utils.time; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.params.provider.Arguments.of; -import static org.opentripplanner.framework.time.DurationUtils.requireNonNegative; -import static org.opentripplanner.framework.time.DurationUtils.requireNonNegativeMax2days; -import static org.opentripplanner.framework.time.DurationUtils.requireNonNegativeMax2hours; -import static org.opentripplanner.framework.time.DurationUtils.requireNonNegativeMax30minutes; -import static org.opentripplanner.framework.time.DurationUtils.toIntMilliseconds; +import static org.opentripplanner.utils.time.DurationUtils.requireNonNegative; +import static org.opentripplanner.utils.time.DurationUtils.requireNonNegativeMax2days; +import static org.opentripplanner.utils.time.DurationUtils.requireNonNegativeMax2hours; +import static org.opentripplanner.utils.time.DurationUtils.requireNonNegativeMax30minutes; +import static org.opentripplanner.utils.time.DurationUtils.toIntMilliseconds; import java.time.Duration; import java.time.format.DateTimeParseException; diff --git a/utils/src/test/java/org/opentripplanner/utils/time/LocalDateUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/time/LocalDateUtilsTest.java index fa6a25ab3d7..4a0ae7e37d9 100644 --- a/utils/src/test/java/org/opentripplanner/utils/time/LocalDateUtilsTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/time/LocalDateUtilsTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.time; +package org.opentripplanner.utils.time; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/utils/src/test/java/org/opentripplanner/utils/time/OffsetDateTimeParserTest.java b/utils/src/test/java/org/opentripplanner/utils/time/OffsetDateTimeParserTest.java index d8944b9a5f0..a114cc96788 100644 --- a/utils/src/test/java/org/opentripplanner/utils/time/OffsetDateTimeParserTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/time/OffsetDateTimeParserTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.time; +package org.opentripplanner.utils.time; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/utils/src/test/java/org/opentripplanner/utils/time/ServiceDateUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/time/ServiceDateUtilsTest.java index 92a67df9110..028b53b064a 100644 --- a/utils/src/test/java/org/opentripplanner/utils/time/ServiceDateUtilsTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/time/ServiceDateUtilsTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.time; +package org.opentripplanner.utils.time; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -6,7 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.opentripplanner.framework.time.ServiceDateUtils.asStartOfService; +import static org.opentripplanner.utils.time.ServiceDateUtils.asStartOfService; import java.text.ParseException; import java.time.Duration; diff --git a/utils/src/test/java/org/opentripplanner/utils/time/TimeUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/time/TimeUtilsTest.java index 936102f3496..d5c0e519742 100644 --- a/utils/src/test/java/org/opentripplanner/utils/time/TimeUtilsTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/time/TimeUtilsTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.time; +package org.opentripplanner.utils.time; import static java.time.ZoneOffset.UTC; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/utils/src/test/java/org/opentripplanner/utils/time/ZoneIds.java b/utils/src/test/java/org/opentripplanner/utils/time/ZoneIds.java index e42dc718790..0e3244dcd36 100644 --- a/utils/src/test/java/org/opentripplanner/utils/time/ZoneIds.java +++ b/utils/src/test/java/org/opentripplanner/utils/time/ZoneIds.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.time; +package org.opentripplanner.utils.time; import java.time.ZoneId; diff --git a/utils/src/test/java/org/opentripplanner/utils/tostring/MultiLineToStringBuilderTest.java b/utils/src/test/java/org/opentripplanner/utils/tostring/MultiLineToStringBuilderTest.java index 495a8649cef..55b43517e18 100644 --- a/utils/src/test/java/org/opentripplanner/utils/tostring/MultiLineToStringBuilderTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/tostring/MultiLineToStringBuilderTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.tostring; +package org.opentripplanner.utils.tostring; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/utils/src/test/java/org/opentripplanner/utils/tostring/ToStringBuilderTest.java b/utils/src/test/java/org/opentripplanner/utils/tostring/ToStringBuilderTest.java index 59d1eea4d0b..477f48e7c63 100644 --- a/utils/src/test/java/org/opentripplanner/utils/tostring/ToStringBuilderTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/tostring/ToStringBuilderTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.tostring; +package org.opentripplanner.utils.tostring; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -13,8 +13,8 @@ import java.util.Objects; import java.util.function.Function; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.time.TimeUtils; -import org.opentripplanner.framework.time.ZoneIds; +import org.opentripplanner.utils.time.TimeUtils; +import org.opentripplanner.utils.time.ZoneIds; public class ToStringBuilderTest { diff --git a/utils/src/test/java/org/opentripplanner/utils/tostring/ValueObjectToStringBuilderTest.java b/utils/src/test/java/org/opentripplanner/utils/tostring/ValueObjectToStringBuilderTest.java index a59a0bf9b90..01a9beac141 100644 --- a/utils/src/test/java/org/opentripplanner/utils/tostring/ValueObjectToStringBuilderTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/tostring/ValueObjectToStringBuilderTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.tostring; +package org.opentripplanner.utils.tostring; import static org.junit.jupiter.api.Assertions.assertEquals; From 031168ead5c2b8b123e1df04619ce3cead4c4ad0 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Tue, 29 Oct 2024 23:06:06 +0100 Subject: [PATCH 4/6] refactor: Fix broken architecture tests. --- .../OtpArchitectureModules.java | 18 +++++++--- .../framework/FrameworkArchitectureTest.java | 36 +++---------------- 2 files changed, 18 insertions(+), 36 deletions(-) diff --git a/application/src/test/java/org/opentripplanner/OtpArchitectureModules.java b/application/src/test/java/org/opentripplanner/OtpArchitectureModules.java index 72520acaa1c..8d6fc431f50 100644 --- a/application/src/test/java/org/opentripplanner/OtpArchitectureModules.java +++ b/application/src/test/java/org/opentripplanner/OtpArchitectureModules.java @@ -18,6 +18,9 @@ public interface OtpArchitectureModules { /* OTP Modules */ Package OTP_ROOT = Package.of("org.opentripplanner"); + + Package UTILS_PACKAGE = OTP_ROOT.subPackage("utils"); + Package DATASTORE = OTP_ROOT.subPackage("datastore"); Package FRAMEWORK = OTP_ROOT.subPackage("framework"); Module GEO_UTILS = Module.of(JTS_GEOM, FRAMEWORK.subPackage("geometry")); @@ -37,15 +40,20 @@ public interface OtpArchitectureModules { * This is a bag of TRUE util classes - no dependencies to other OTP classes or frameworks * (except true utilities like slf4j). */ + Module OTP_UTILS = Module.of( + UTILS_PACKAGE.subPackage("collection"), + UTILS_PACKAGE.subPackage("lang"), + UTILS_PACKAGE.subPackage("logging"), + UTILS_PACKAGE.subPackage("text"), + UTILS_PACKAGE.subPackage("time"), + UTILS_PACKAGE.subPackage("tostring") + ); + Module FRAMEWORK_UTILS = Module.of( + OTP_UTILS, FRAMEWORK.subPackage("application"), FRAMEWORK.subPackage("error"), FRAMEWORK.subPackage("i18n"), - FRAMEWORK.subPackage("lang"), - FRAMEWORK.subPackage("logging"), - FRAMEWORK.subPackage("text"), - FRAMEWORK.subPackage("time"), - FRAMEWORK.subPackage("tostring"), FRAMEWORK.subPackage("concurrent"), FRAMEWORK.subPackage("doc") ); diff --git a/application/src/test/java/org/opentripplanner/framework/FrameworkArchitectureTest.java b/application/src/test/java/org/opentripplanner/framework/FrameworkArchitectureTest.java index 9e44dd05dda..1bfc576d822 100644 --- a/application/src/test/java/org/opentripplanner/framework/FrameworkArchitectureTest.java +++ b/application/src/test/java/org/opentripplanner/framework/FrameworkArchitectureTest.java @@ -6,6 +6,7 @@ import static org.opentripplanner.OtpArchitectureModules.GNU_TROVE; import static org.opentripplanner.OtpArchitectureModules.JTS_GEOM; import static org.opentripplanner.OtpArchitectureModules.OPEN_GIS; +import static org.opentripplanner.OtpArchitectureModules.OTP_UTILS; import org.junit.jupiter.api.Test; import org.opentripplanner._support.arch.Module; @@ -27,16 +28,13 @@ public class FrameworkArchitectureTest { private static final Package GEOMETRY = FRAMEWORK.subPackage("geometry"); private static final Package I18N = FRAMEWORK.subPackage("i18n"); private static final Package IO = FRAMEWORK.subPackage("io"); - private static final Package LANG = FRAMEWORK.subPackage("lang"); private static final Package LOGGING = FRAMEWORK.subPackage("logging"); private static final Package RESOURCES = FRAMEWORK.subPackage("resources"); - private static final Package TEXT = FRAMEWORK.subPackage("text"); private static final Package TIME = FRAMEWORK.subPackage("time"); - private static final Package TO_STRING = FRAMEWORK.subPackage("tostring"); @Test void enforceApplicationPackageDependencies() { - APPLICATION.dependsOn(LANG).verify(); + APPLICATION.dependsOn(OTP_UTILS).verify(); } @Test @@ -52,16 +50,7 @@ void enforceFunctionalPackageDependencies() { @Test void enforceGeometryPackageDependencies() { GEOMETRY - .dependsOn( - GEO_JSON, - GEO_TOOLS, - GNU_TROVE, - JTS_GEOM, - OPEN_GIS, - LANG, - TO_STRING, - GUAVA_COLLECTIONS - ) + .dependsOn(GEO_JSON, GEO_TOOLS, GNU_TROVE, JTS_GEOM, OPEN_GIS, GUAVA_COLLECTIONS, OTP_UTILS) .verify(); } @@ -75,14 +64,9 @@ void enforceIoPackageDependencies() { IO.dependsOn(APACHE_HTTP, XML_MODULES).verify(); } - @Test - void enforceLangPackageDependencies() { - LANG.verify(); - } - @Test void enforceLoggingPackageDependencies() { - LOGGING.dependsOn(TEXT, TIME).verify(); + LOGGING.dependsOn(OTP_UTILS).verify(); } @Test @@ -90,18 +74,8 @@ void enforceResourcesPackageDependencies() { RESOURCES.verify(); } - @Test - void enforceTextPackageDependencies() { - TEXT.dependsOn(LANG).verify(); - } - @Test void enforceTimePackageDependencies() { - TIME.dependsOn(LOGGING).verify(); - } - - @Test - void enforceToStingPackageDependencies() { - TO_STRING.dependsOn(LANG, TIME).verify(); + TIME.dependsOn(OTP_UTILS).verify(); } } From 9890d0f30596ac3a9ec5c7db9a023a132ae35c6e Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 30 Oct 2024 00:44:22 +0100 Subject: [PATCH 5/6] code cleanup: Remove dependency on slf4j in otp-utils. --- utils/pom.xml | 6 --- .../opentripplanner/utils/time/DateUtils.java | 38 +----------------- .../utils/time/DateUtilsTest.java | 39 ------------------- 3 files changed, 2 insertions(+), 81 deletions(-) diff --git a/utils/pom.xml b/utils/pom.xml index 1cace007d00..7a223488dd0 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -19,12 +19,6 @@ jsr305 - - - org.slf4j - slf4j-api - - diff --git a/utils/src/main/java/org/opentripplanner/utils/time/DateUtils.java b/utils/src/main/java/org/opentripplanner/utils/time/DateUtils.java index a72098e43ab..e773b4e89ea 100644 --- a/utils/src/main/java/org/opentripplanner/utils/time/DateUtils.java +++ b/utils/src/main/java/org/opentripplanner/utils/time/DateUtils.java @@ -11,16 +11,12 @@ import java.time.format.DateTimeParseException; import java.util.List; import javax.annotation.Nullable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * @author Frank Purcell (p u r c e l l f @ t r i m e t . o r g) October 20, 2009 */ public class DateUtils { - private static final Logger LOG = LoggerFactory.getLogger(DateUtils.class); - private static final int SANITY_CHECK_CUTOFF_YEAR = 1000; // NOTE: don't change the order of these strings...the simplest should be on the @@ -53,9 +49,6 @@ public class DateUtils { */ @Nullable public static ZonedDateTime toZonedDateTime(String date, String time, ZoneId tz) { - //LOG.debug("JVM default timezone is {}", TimeZone.getDefault()); - LOG.debug("Parsing date {} and time {}", date, time); - LOG.debug("using timezone {}", tz); ZonedDateTime retVal = ZonedDateTime.ofInstant(Instant.now(), tz); if (date != null) { LocalDate localDate = parseDate(date); @@ -80,7 +73,6 @@ public static ZonedDateTime toZonedDateTime(String date, String time, ZoneId tz) retVal = LocalDateTime.of(retVal.toLocalDate(), localTime).atZone(tz); } } - LOG.debug("resulting date is {}", retVal); return retVal; } @@ -138,30 +130,6 @@ public static int getIntegerFromString(String input) { } } - /** - * Converts the given time in seconds to a String in the format h:mm. - * - * @param seconds the time in seconds. - * @return a String representing the time in the format h:mm - */ - public static String secToHHMM(int seconds) { - int min; - String sign = ""; - - if (seconds >= 0) { - min = seconds / 60; - sign = ""; - } else { - min = -seconds / 60; - sign = "-"; - } - - int mm = min % 60; - int hh = min / 60; - - return String.format("%s%d:%02d", sign, hh, mm); - } - public static String trim(String str) { String retVal = str; try { @@ -227,11 +195,9 @@ public static LocalTime parseTime(String time) { if (hms.length > 2) { sec = Integer.parseInt(trim(hms[2])); } - return LocalTime.of(hour, min, sec); - } catch (Exception ignore) { - LOG.info("Time '{}' didn't parse", time); - return null; + } catch (Exception e) { + throw new RuntimeException("Could not parse time: " + time, e); } } } diff --git a/utils/src/test/java/org/opentripplanner/utils/time/DateUtilsTest.java b/utils/src/test/java/org/opentripplanner/utils/time/DateUtilsTest.java index ac153b9a2ba..75621b8fadb 100644 --- a/utils/src/test/java/org/opentripplanner/utils/time/DateUtilsTest.java +++ b/utils/src/test/java/org/opentripplanner/utils/time/DateUtilsTest.java @@ -1,7 +1,6 @@ package org.opentripplanner.utils.time; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.utils.time.DateUtils.secToHHMM; import java.time.LocalDate; import java.time.ZoneId; @@ -10,24 +9,6 @@ public class DateUtilsTest { - // Create some time constants: T_(_)? - private static final int T00_00 = 0; - private static final int T00_00_01 = 1; - private static final int T00_00_59 = 59; - private static final int T00_01 = 60; - private static final int T00_05 = 300; - private static final int T08_07 = (8 * 60 + 7) * 60; - private static final int T08_47 = (8 * 60 + 47) * 60; - private static final int T35_00 = 35 * 3600; - - // Create some negative time constants: N_(_)? - private static final int N00_00_01 = -1; - private static final int N00_00_59 = -59; - private static final int N00_05 = -300; - private static final int N08_00 = -8 * 3600; - private static final int N08_07 = -(8 * 60 + 7) * 60; - private static final int N08_47 = -(8 * 60 + 47) * 60; - public static final ZoneId UTC = ZoneIds.UTC; @Test @@ -40,24 +21,4 @@ public final void testToDate() { assertEquals(LocalDate.now(UTC).toString(), date.toLocalDate().toString()); assertEquals(0, date.toEpochSecond() % TimeUtils.ONE_DAY_SECONDS); } - - @Test - public final void testSecToHHMM() { - assertEquals("0:00", secToHHMM(T00_00), "Handle zero"); - assertEquals("0:00", secToHHMM(T00_00_01), "Skip seconds(1 sec)"); - assertEquals("0:00", secToHHMM(T00_00_59), "Skip seconds(59 sec), round down"); - assertEquals("0:01", secToHHMM(T00_01), "1 minute with leading zero"); - assertEquals("0:05", secToHHMM(T00_05), "5 minutes"); - assertEquals("8:07", secToHHMM(T08_07), "Hour and min with leading zero on minute"); - assertEquals("8:47", secToHHMM(T08_47), "8 hours and 47 minutes"); - assertEquals("35:00", secToHHMM(T35_00), "allow ServiceTime beyond 24 hours"); - - // Negative times - assertEquals("-0:00", secToHHMM(N00_00_01), "1 sec - round to minus zero"); - assertEquals("-0:00", secToHHMM(N00_00_59), "59 sec - round down with minus sign"); - assertEquals("-0:05", secToHHMM(N00_05), "minus 5 min"); - assertEquals("-8:00", secToHHMM(N08_00)); - assertEquals("-8:07", secToHHMM(N08_07)); - assertEquals("-8:47", secToHHMM(N08_47)); - } } From 183117248598de09e43f62143fc849a8706bc32c Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 4 Nov 2024 14:22:29 +0100 Subject: [PATCH 6/6] refactor: Rename ToveUtils to TroveUtils --- .../collection/{ToveUtils.java => TroveUtils.java} | 2 +- .../graph_builder/module/osm/DisjointSet.java | 4 ++-- .../graph_builder/module/osm/OsmDatabase.java | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) rename application/src/main/java/org/opentripplanner/framework/collection/{ToveUtils.java => TroveUtils.java} (93%) diff --git a/application/src/main/java/org/opentripplanner/framework/collection/ToveUtils.java b/application/src/main/java/org/opentripplanner/framework/collection/TroveUtils.java similarity index 93% rename from application/src/main/java/org/opentripplanner/framework/collection/ToveUtils.java rename to application/src/main/java/org/opentripplanner/framework/collection/TroveUtils.java index 5958845e2b5..d3b59624eb9 100644 --- a/application/src/main/java/org/opentripplanner/framework/collection/ToveUtils.java +++ b/application/src/main/java/org/opentripplanner/framework/collection/TroveUtils.java @@ -4,7 +4,7 @@ import java.util.HashSet; import java.util.Set; -public class ToveUtils { +public class TroveUtils { public static void addToMapSet(TLongObjectMap> mapSet, long key, U value) { Set set = mapSet.get(key); diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/DisjointSet.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/DisjointSet.java index 369e5c20a14..d130a435eaf 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/DisjointSet.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/DisjointSet.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import org.opentripplanner.framework.collection.ToveUtils; +import org.opentripplanner.framework.collection.TroveUtils; /** Basic union-find data structure with path compression */ class DisjointSet { @@ -62,7 +62,7 @@ public boolean exists(T element) { public List> sets() { TLongObjectMap> out = new TLongObjectHashMap<>(); setMapping.forEachEntry((k, v) -> { - ToveUtils.addToMapSet(out, compact(v), k); + TroveUtils.addToMapSet(out, compact(v), k); return true; }); return new ArrayList<>(out.valueCollection()); diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmDatabase.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmDatabase.java index 382b206a053..0781b73f076 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmDatabase.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmDatabase.java @@ -24,7 +24,7 @@ import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.LineString; import org.locationtech.jts.geom.Point; -import org.opentripplanner.framework.collection.ToveUtils; +import org.opentripplanner.framework.collection.TroveUtils; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.geometry.HashGridSpatialIndex; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; @@ -267,7 +267,7 @@ public void addWay(OsmWay way) { way .getNodeRefs() .forEach(node -> { - ToveUtils.addToMapSet(areasForNode, node, way); + TroveUtils.addToMapSet(areasForNode, node, way); return true; }); } @@ -738,7 +738,7 @@ private void processMultipolygonRelations() { while (wayNodeIterator.hasNext()) { long nodeId = wayNodeIterator.next(); if (nodesById.containsKey(nodeId)) { - ToveUtils.addToMapSet(areasForNode, nodeId, way); + TroveUtils.addToMapSet(areasForNode, nodeId, way); } else { // this area is missing some nodes, perhaps because it is on // the edge of the region, so we will simply not route on it.