From 6b578f4e3f78f5180be7294480b4ea649238139c Mon Sep 17 00:00:00 2001 From: ricardo vargas <104957708+ricardovargasri@users.noreply.github.com> Date: Wed, 2 Sep 2026 18:38:20 -0500 Subject: [PATCH 01/68] fix: treat negative steps as stairs in PathwayEdge (#7914) --- .../street/model/edge/PathwayEdge.java | 2 +- .../street/model/edge/PathwayEdgeTest.java | 41 +++++++++++++++++-- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/PathwayEdge.java b/street/src/main/java/org/opentripplanner/street/model/edge/PathwayEdge.java index 314708d4de9..c89097543e0 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/PathwayEdge.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/PathwayEdge.java @@ -184,6 +184,6 @@ public boolean isWheelchairAccessible() { } private boolean isStairs() { - return steps > 0; + return steps != 0; } } diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java index c4c79471b34..82fc062bee3 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java @@ -26,7 +26,8 @@ class PathwayEdgeTest { @Test void zeroLength() { - // if elevators have a traversal time and distance of 0 we cannot interpolate the distance + // if elevators have a traversal time and distance of 0 we cannot interpolate + // the distance // from the vertices as they most likely have identical coordinates var edge = PathwayEdge.createPathwayEdge( from, @@ -132,6 +133,35 @@ void wheelchair() { assertEquals(300.0, state.getWeight()); } + @Test + void wheelchairNegativeStepsTreatedAsStairs() { + var down = PathwayEdge.createPathwayEdge( + from, + to, + new NonLocalizedString("pathway"), + 0, + 0, + -10, + 0, + true + ); + var up = PathwayEdge.createPathwayEdge( + from, + to, + new NonLocalizedString("pathway"), + 0, + 0, + 10, + 0, + true + ); + + var downState = assertThatEdgeIsTraversable(down, true); + var upState = assertThatEdgeIsTraversable(up, true); + + assertEquals(upState.getWeight(), downState.getWeight()); + } + static Stream slopeCases() { return Stream.of( // no extra cost @@ -150,10 +180,13 @@ static Stream slopeCases() { } /** - * This makes sure that when you exceed the max slope in a wheelchair there isn't a hard cut-off - * but rather the cost increases proportional to how much you go over the maximum. + * This makes sure that when you exceed the max slope in a wheelchair there + * isn't a hard cut-off + * but rather the cost increases proportional to how much you go over the + * maximum. *

- * In other words: 0.1 % over the limit only has a small cost but 2% over increases it + * In other words: 0.1 % over the limit only has a small cost but 2% over + * increases it * dramatically to the point where it's only used as a last resort. */ @ParameterizedTest(name = "slope of {0} should lead to traversal costs of {1}") From 7a3d21161b800e34c0f387e826dbc407658521fc Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 8 Sep 2026 17:53:50 +0200 Subject: [PATCH 02/68] Use TLongSet --- .../graph_builder/module/osm/storage/VertexGenerator.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/storage/VertexGenerator.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/storage/VertexGenerator.java index c756c8e7919..58489bf78f7 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/storage/VertexGenerator.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/storage/VertexGenerator.java @@ -8,6 +8,8 @@ import gnu.trove.list.TLongList; import gnu.trove.map.TLongObjectMap; import gnu.trove.map.hash.TLongObjectHashMap; +import gnu.trove.set.TLongSet; +import gnu.trove.set.hash.TLongHashSet; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -263,7 +265,7 @@ public HashMap elevatorNodeLevels() { } public void initIntersectionNodes() { - Set possibleIntersectionNodes = new HashSet<>(); + TLongSet possibleIntersectionNodes = new TLongHashSet(); for (OsmWay way : osmdb.getWays()) { TLongList nodes = way.getNodeRefs(); nodes.forEach(node -> { @@ -393,7 +395,7 @@ private Map getElevatorVertices(OsmNode node) return elevatorVertices; } - private void intersectAreaRingNodes(Set possibleIntersectionNodes, Ring outerRing) { + private void intersectAreaRingNodes(TLongSet possibleIntersectionNodes, Ring outerRing) { for (OsmNode node : outerRing.nodes) { long nodeId = node.getId(); if (possibleIntersectionNodes.contains(nodeId)) { From 298ad2190b079d8d828db4ca138492373046d0cd Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 9 Sep 2026 14:11:15 +0200 Subject: [PATCH 03/68] Save tag lookups in hot loop --- .../opentripplanner/osm/wayproperty/WayPropertySet.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/application/src/main/java/org/opentripplanner/osm/wayproperty/WayPropertySet.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/WayPropertySet.java index 6898834f91b..9891a3c0018 100644 --- a/application/src/main/java/org/opentripplanner/osm/wayproperty/WayPropertySet.java +++ b/application/src/main/java/org/opentripplanner/osm/wayproperty/WayPropertySet.java @@ -211,8 +211,9 @@ public float getCarSpeedForWay( Float speed = null; Float currentSpeed; - if (way.hasTag("maxspeed:motorcar")) { - speed = SpeedParser.getMetersSecondFromSpeed(way.getTag("maxspeed:motorcar")); + var motorCar = way.getTag("maxspeed:motorcar"); + if (motorCar != null) { + speed = SpeedParser.getMetersSecondFromSpeed(motorCar); } if (speed == null && direction == FORWARD && way.hasTag("maxspeed:forward")) { @@ -234,7 +235,8 @@ public float getCarSpeedForWay( } } - if (way.hasTag("maxspeed") && speed == null) { + var maxSpeed = way.getTag("maxspeed"); + if (maxSpeed != null && speed == null) { speed = SpeedParser.getMetersSecondFromSpeed(way.getTag("maxspeed")); } From f6e07200962f77b53cee7627b7fcc88cbe63fbf9 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Mon, 7 Sep 2026 11:36:04 +0200 Subject: [PATCH 04/68] fix(ojp): reject document type declarations in OJP and TRIAS requests The TRIAS endpoint ran the request body through an XSLT transformer built from an unhardened TransformerFactory, so a DOCTYPE declaring an external entity was resolved while parsing: an anonymous caller could read local files and make the server issue requests to internal services (XXE). Requests are now read through a SAX reader that rejects a document type declaration outright, which neither the OJP nor the TRIAS profile allows. The OJP endpoint only avoided the same problem because of a default in the JAXB implementation; it now goes through the same reader. --- .../ext/ojp/resource/SecureXmlTest.java | 107 ++++++++++++++++ .../ext/ojp/resource/OjpCodec.java | 10 +- .../ojp/resource/OjpToTriasTransformer.java | 21 ++-- .../ext/ojp/resource/SecureXml.java | 115 ++++++++++++++++++ 4 files changed, 237 insertions(+), 16 deletions(-) create mode 100644 application/src/ext-test/java/org/opentripplanner/ext/ojp/resource/SecureXmlTest.java create mode 100644 application/src/ext/java/org/opentripplanner/ext/ojp/resource/SecureXml.java diff --git a/application/src/ext-test/java/org/opentripplanner/ext/ojp/resource/SecureXmlTest.java b/application/src/ext-test/java/org/opentripplanner/ext/ojp/resource/SecureXmlTest.java new file mode 100644 index 00000000000..bb97f50d4bd --- /dev/null +++ b/application/src/ext-test/java/org/opentripplanner/ext/ojp/resource/SecureXmlTest.java @@ -0,0 +1,107 @@ +package org.opentripplanner.ext.ojp.resource; + +import static com.google.common.truth.Truth.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import jakarta.xml.bind.JAXBException; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; +import javax.xml.transform.TransformerException; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; + +/** + * The OJP and TRIAS endpoints take an XML document straight from an unauthenticated client, so a + * document type declaration must never be resolved: an external entity would otherwise turn the + * endpoints into a local file reader and an internal HTTP client (XXE). + */ +class SecureXmlTest { + + private static final String CANARY = "top-secret-xxe-canary"; + + @TempDir + static Path tempDir; + + private static String secretFileUri; + + @BeforeAll + static void writeSecretFile() throws IOException { + var secret = Files.writeString(tempDir.resolve("secret.txt"), CANARY); + secretFileUri = secret.toUri().toString(); + } + + @Test + void rejectTriasRequestWithExternalEntity() { + var ex = assertThrows(TransformerException.class, () -> + OjpToTriasTransformer.triasToOjp(triasRequestWithExternalEntity()) + ); + assertDoctypeRejected(ex); + } + + @Test + void rejectOjpRequestWithExternalEntity() { + var ex = assertThrows(JAXBException.class, () -> + OjpCodec.deserialize(ojpRequestWithExternalEntity()) + ); + assertDoctypeRejected(ex); + } + + /** + * The parser must fail on the declaration itself, and no part of the referenced file may show up + * in what the caller gets back. + */ + private static void assertDoctypeRejected(Exception ex) { + var messages = causeMessages(ex); + assertThat(messages.toString()).contains("DOCTYPE"); + assertThat(messages.toString()).doesNotContain(CANARY); + } + + private static List causeMessages(Throwable ex) { + var messages = new ArrayList(); + for (var t = ex; t != null; t = t.getCause() == t ? null : t.getCause()) { + messages.add(t.getMessage()); + } + return messages; + } + + private static String triasRequestWithExternalEntity() { + return """ + + ]> + + + 2025-01-27T13:34:00 + &xxe; + + + + + &xxe; + + + + + + + """.formatted(secretFileUri); + } + + private static String ojpRequestWithExternalEntity() { + return """ + + ]> + + + + 2025-01-27T13:34:00 + &xxe; + + + + """.formatted(secretFileUri); + } +} diff --git a/application/src/ext/java/org/opentripplanner/ext/ojp/resource/OjpCodec.java b/application/src/ext/java/org/opentripplanner/ext/ojp/resource/OjpCodec.java index ddbf0c018ab..82686300ca9 100644 --- a/application/src/ext/java/org/opentripplanner/ext/ojp/resource/OjpCodec.java +++ b/application/src/ext/java/org/opentripplanner/ext/ojp/resource/OjpCodec.java @@ -4,20 +4,20 @@ import jakarta.ws.rs.core.StreamingOutput; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBException; -import java.io.ByteArrayInputStream; import java.io.OutputStreamWriter; -import java.nio.charset.StandardCharsets; import javax.xml.transform.TransformerException; -import javax.xml.transform.stream.StreamSource; class OjpCodec { private static final JAXBContext CONTEXT = jaxbContext(); + /** + * Reads an OJP request received from a client. The input is untrusted, so it is read with + * {@link SecureXml} rather than relying on the JAXB implementation's default restrictions. + */ static OJP deserialize(String trias) throws JAXBException, TransformerException { - var source = new StreamSource(new ByteArrayInputStream(trias.getBytes(StandardCharsets.UTF_8))); var unmarshaller = CONTEXT.createUnmarshaller(); - return (OJP) unmarshaller.unmarshal(source); + return (OJP) unmarshaller.unmarshal(SecureXml.source(trias)); } static StreamingOutput serialize(OJP ojpOutput) { diff --git a/application/src/ext/java/org/opentripplanner/ext/ojp/resource/OjpToTriasTransformer.java b/application/src/ext/java/org/opentripplanner/ext/ojp/resource/OjpToTriasTransformer.java index 100be497e90..a4379686d81 100644 --- a/application/src/ext/java/org/opentripplanner/ext/ojp/resource/OjpToTriasTransformer.java +++ b/application/src/ext/java/org/opentripplanner/ext/ojp/resource/OjpToTriasTransformer.java @@ -13,7 +13,6 @@ import javax.xml.transform.Templates; import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; @@ -53,20 +52,21 @@ static void ojpToTrias(OJP ojp, Writer writer) { } } + /** + * Converts a TRIAS request received from a client into an OJP object. + *

+ * The input is untrusted, so it is read with {@link SecureXml}: a document type declaration is + * rejected rather than resolved, which is what keeps this method from reading local files and + * making requests to internal services on behalf of the caller. + */ static OJP triasToOjp(String trias) throws JAXBException, TransformerException { - var xmlSource = new StreamSource( - new ByteArrayInputStream(trias.getBytes(StandardCharsets.UTF_8)) - ); - var transformer = TRIAS_TO_OJP_TEMPLATE.newTransformer(); var writer = new ByteArrayOutputStream(); - transformer.transform(xmlSource, new StreamResult(writer)); + transformer.transform(SecureXml.source(trias), new StreamResult(writer)); var transformedXml = writer.toString(StandardCharsets.UTF_8); var unmarshaller = CONTEXT.createUnmarshaller(); - return (OJP) unmarshaller.unmarshal( - new ByteArrayInputStream(transformedXml.getBytes(StandardCharsets.UTF_8)) - ); + return (OJP) unmarshaller.unmarshal(SecureXml.source(transformedXml)); } static void ojpToTrias(Writer writer, StreamSource xmlSource) @@ -80,8 +80,7 @@ static Templates loadTemplate(String name) { try { var xslt = OjpToTriasTransformer.class.getResource(name).openStream(); var xsltSource = new StreamSource(xslt); - TransformerFactory factory = TransformerFactory.newInstance(); - return factory.newTemplates(xsltSource); + return SecureXml.transformerFactory().newTemplates(xsltSource); } catch (TransformerConfigurationException | IOException e) { throw new RuntimeException(e); } diff --git a/application/src/ext/java/org/opentripplanner/ext/ojp/resource/SecureXml.java b/application/src/ext/java/org/opentripplanner/ext/ojp/resource/SecureXml.java new file mode 100644 index 00000000000..b669c28fc26 --- /dev/null +++ b/application/src/ext/java/org/opentripplanner/ext/ojp/resource/SecureXml.java @@ -0,0 +1,115 @@ +package org.opentripplanner.ext.ojp.resource; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import javax.xml.XMLConstants; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParserFactory; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.sax.SAXSource; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.SAXNotRecognizedException; +import org.xml.sax.SAXNotSupportedException; + +/** + * Factories for the XML machinery used by the OJP and TRIAS APIs, configured so that a document + * received from a client can never make the server load anything from the file system or the + * network. + *

+ * The APIs accept an XML document in the request body. If that document is parsed with the JDK + * defaults, a {@code DOCTYPE} declaring an external entity is resolved while parsing, which turns + * the endpoint into a local file reader and an internal HTTP client (XXE). Neither the OJP nor the + * TRIAS profile allows a document type declaration, so we reject one outright instead of merely + * disabling entity resolution. + *

+ * The default JDK implementations are requested explicitly: the feature names below are the ones + * the JDK parsers understand, and a third-party parser on the classpath must not be able to + * silently take over the request path. + */ +final class SecureXml { + + /** + * Rejects a document type declaration instead of resolving it. Not a {@link XMLConstants} + * constant, but understood by the JDK (Xerces-derived) parsers. + */ + private static final String DISALLOW_DOCTYPE_DECL = + "http://apache.org/xml/features/disallow-doctype-decl"; + + private static final String EXTERNAL_GENERAL_ENTITIES = + "http://xml.org/sax/features/external-general-entities"; + + private static final String EXTERNAL_PARAMETER_ENTITIES = + "http://xml.org/sax/features/external-parameter-entities"; + + private SecureXml() {} + + /** + * Wraps the given document in a source that is parsed without resolving anything outside the + * document itself. Use this for every XML document that originates from a client. + */ + static SAXSource source(String xml) { + return source(new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8))); + } + + /** + * @see #source(String) + */ + static SAXSource source(InputStream xml) { + try { + // a SAXParserFactory is not documented as thread-safe, so it is not shared between requests + var reader = saxParserFactory().newSAXParser().getXMLReader(); + return new SAXSource(reader, new InputSource(xml)); + } catch (ParserConfigurationException | SAXException e) { + throw new IllegalStateException("Could not create a hardened XML reader.", e); + } + } + + /** + * A factory for XSLT templates which is not allowed to reach outside the stylesheet it is given. + */ + static TransformerFactory transformerFactory() { + var factory = TransformerFactory.newDefaultInstance(); + enableSecureProcessing(factory); + factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, ""); + factory.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, ""); + return factory; + } + + private static SAXParserFactory saxParserFactory() throws ParserConfigurationException { + var factory = SAXParserFactory.newDefaultInstance(); + // the stylesheets match on namespaced elements, so the reader has to report namespaces + factory.setNamespaceAware(true); + factory.setValidating(false); + factory.setXIncludeAware(false); + setFeature(factory, XMLConstants.FEATURE_SECURE_PROCESSING, true); + setFeature(factory, DISALLOW_DOCTYPE_DECL, true); + setFeature(factory, EXTERNAL_GENERAL_ENTITIES, false); + setFeature(factory, EXTERNAL_PARAMETER_ENTITIES, false); + return factory; + } + + private static void setFeature(SAXParserFactory factory, String name, boolean value) + throws ParserConfigurationException { + try { + factory.setFeature(name, value); + } catch (SAXNotRecognizedException | SAXNotSupportedException e) { + throw new ParserConfigurationException( + "The XML parser does not support the security feature '%s'.".formatted(name) + ); + } + } + + private static void enableSecureProcessing(TransformerFactory factory) { + try { + factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true); + } catch (TransformerConfigurationException e) { + throw new IllegalStateException( + "The XSLT implementation does not support secure processing.", + e + ); + } + } +} From bf9bda44be340957a602e850a71177bc4236ebbc Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 14 Sep 2026 13:35:34 +0200 Subject: [PATCH 05/68] Decode OSM data in parallel --- application/pom.xml | 2 +- .../org/opentripplanner/osm/DefaultOsmProvider.java | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/application/pom.xml b/application/pom.xml index 4db88796375..bd137128122 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -300,7 +300,7 @@ org.openstreetmap.pbf osmpbf - 1.6.1 + 1.8.0 diff --git a/application/src/main/java/org/opentripplanner/osm/DefaultOsmProvider.java b/application/src/main/java/org/opentripplanner/osm/DefaultOsmProvider.java index 3b08971baa4..0efab431497 100644 --- a/application/src/main/java/org/opentripplanner/osm/DefaultOsmProvider.java +++ b/application/src/main/java/org/opentripplanner/osm/DefaultOsmProvider.java @@ -1,10 +1,12 @@ package org.opentripplanner.osm; -import crosby.binary.file.BlockInputStream; +import crosby.binary.file.ParallelBlockInputStream; import java.io.ByteArrayInputStream; import java.io.File; import java.io.InputStream; import java.time.ZoneId; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import org.opentripplanner.datastore.api.DataSource; import org.opentripplanner.datastore.api.FileType; import org.opentripplanner.datastore.file.FileDataSource; @@ -35,6 +37,8 @@ public class DefaultOsmProvider implements OsmProvider { private final OsmTagMapper osmTagMapper; private final WayPropertySet wayPropertySet; + private final int parallelism = Math.max(4, Runtime.getRuntime().availableProcessors()); + private final ExecutorService executorService = Executors.newFixedThreadPool(parallelism); private byte[] cachedBytes = null; /** For tests */ @@ -70,6 +74,9 @@ public void readOsm(OsmDatabase osmdb) { } catch (Exception ex) { throw new IllegalStateException("error loading OSM from path " + source.path(), ex); } + finally { + executorService.shutdown(); + } } @Override @@ -95,7 +102,7 @@ private static InputStream track(OsmParserPhase phase, long size, InputStream in private void parsePhase(OsmParser parser, OsmParserPhase phase) { parser.setPhase(phase); - try (BlockInputStream in = new BlockInputStream(createInputStream(phase), parser)) { + try (var in = new ParallelBlockInputStream(createInputStream(phase), parser, executorService, parallelism)) { in.process(); } catch (Exception e) { LOG.error(e.getMessage(), e); From 65fa1cc25f994053e23b52cea2b2e762ada6901c Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Mon, 2 Jun 2025 16:01:32 +0200 Subject: [PATCH 06/68] Update NeTEx 1.16 --- .../netex/mapping/TripPatternMapper.java | 78 ++++++++++--------- .../mapping/support/NetexMapperIndexes.java | 2 +- .../validation/DSJServiceJourneyNotFound.java | 7 +- .../netex/mapping/NetexTestDataSample.java | 4 +- .../mapping/TripCalendarBuilderTest.java | 6 +- .../netex/mapping/TripPatternMapperTest.java | 18 +++-- pom.xml | 2 +- 7 files changed, 61 insertions(+), 56 deletions(-) diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java index a628429b13c..9a0e1697651 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java @@ -35,7 +35,6 @@ import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.transit.model.timetable.TripTimesFactory; import org.rutebanken.netex.model.DatedServiceJourney; -import org.rutebanken.netex.model.DatedServiceJourneyRefStructure; import org.rutebanken.netex.model.DestinationDisplay; import org.rutebanken.netex.model.FlexibleLine; import org.rutebanken.netex.model.JourneyPattern_VersionStructure; @@ -44,6 +43,7 @@ import org.rutebanken.netex.model.RouteView; import org.rutebanken.netex.model.ServiceJourney; import org.rutebanken.netex.model.ServiceLink; +import org.rutebanken.netex.model.VehicleJourneyRefStructure; /** * Maps NeTEx JourneyPattern to OTP TripPattern. All ServiceJourneys in the same JourneyPattern @@ -301,43 +301,47 @@ private TripOnServiceDate mapDatedServiceJourney( datedServiceJourney.getServiceAlteration() ); - var replacementFor = datedServiceJourney - .getJourneyRef() - .stream() - .map(JAXBElement::getValue) - .filter(DatedServiceJourneyRefStructure.class::isInstance) - .map(DatedServiceJourneyRefStructure.class::cast) - .map(DatedServiceJourneyRefStructure::getRef) - .map(datedServiceJourneyById::lookup) - .filter(Objects::nonNull) - .map(replacement -> { - if (datedServiceJourney.equals(replacement)) { - issueStore.add( - "InvalidDatedServiceJourneyRef", - "DatedServiceJourney %s has reference to itself, skipping", - datedServiceJourney.getId() + List replacementFor; + if (datedServiceJourney.getReplacedJourneys() != null) { + replacementFor = datedServiceJourney + .getReplacedJourneys() + .getDatedVehicleJourneyRefOrNormalDatedVehicleJourneyRef() + .stream() + .map(JAXBElement::getValue) + .map(VehicleJourneyRefStructure::getRef) + .map(datedServiceJourneyById::lookup) + .filter(Objects::nonNull) + .map(replacement -> { + if (datedServiceJourney.equals(replacement)) { + issueStore.add( + "InvalidDatedServiceJourneyRef", + "DatedServiceJourney %s has reference to itself, skipping", + datedServiceJourney.getId() + ); + return null; + } + String serviceJourneyRef = replacement.getJourneyRef().getValue().getRef(); + ServiceJourney serviceJourney = serviceJourneyById.lookup(serviceJourneyRef); + if (serviceJourney == null) { + issueStore.add( + "InvalidDatedServiceJourneyRef", + "DatedServiceJourney %s has reference to %s, which is not found, skipping", + datedServiceJourney.getId(), + serviceJourneyRef + ); + return null; + } + return mapDatedServiceJourney( + journeyPattern, + mapTrip(journeyPattern, serviceJourney), + replacement ); - return null; - } - String serviceJourneyRef = replacement.getJourneyRef().get(0).getValue().getRef(); - ServiceJourney serviceJourney = serviceJourneyById.lookup(serviceJourneyRef); - if (serviceJourney == null) { - issueStore.add( - "InvalidDatedServiceJourneyRef", - "DatedServiceJourney %s has reference to %s, which is not found, skipping", - datedServiceJourney.getId(), - serviceJourneyRef - ); - return null; - } - return mapDatedServiceJourney( - journeyPattern, - mapTrip(journeyPattern, serviceJourney), - replacement - ); - }) - .filter(Objects::nonNull) - .toList(); + }) + .filter(Objects::nonNull) + .toList(); + } else { + replacementFor = List.of(); + } return TripOnServiceDate.of(id) .withTrip(trip) diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/support/NetexMapperIndexes.java b/application/src/main/java/org/opentripplanner/netex/mapping/support/NetexMapperIndexes.java index 47bb8c6f756..a7325d3adc5 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/support/NetexMapperIndexes.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/support/NetexMapperIndexes.java @@ -91,7 +91,7 @@ static Multimap indexDSJBySJId( Multimap dsjBySJId = ArrayListMultimap.create(); for (DatedServiceJourney dsj : datedServiceJourneys.localValues()) { // The validation step ensure no NPE occurs here - String sjId = dsj.getJourneyRef().get(0).getValue().getRef(); + String sjId = dsj.getJourneyRef().getValue().getRef(); dsjBySJId.put(sjId, dsj); } return dsjBySJId; diff --git a/application/src/main/java/org/opentripplanner/netex/validation/DSJServiceJourneyNotFound.java b/application/src/main/java/org/opentripplanner/netex/validation/DSJServiceJourneyNotFound.java index 27086e417ea..7a246808af2 100644 --- a/application/src/main/java/org/opentripplanner/netex/validation/DSJServiceJourneyNotFound.java +++ b/application/src/main/java/org/opentripplanner/netex/validation/DSJServiceJourneyNotFound.java @@ -1,7 +1,6 @@ package org.opentripplanner.netex.validation; import jakarta.xml.bind.JAXBElement; -import java.util.List; import javax.annotation.Nullable; import org.opentripplanner.graph_builder.issue.api.DataImportIssue; import org.opentripplanner.netex.issues.ObjectNotFound; @@ -26,12 +25,12 @@ public DataImportIssue logMessage(String dsjId, DatedServiceJourney dsj) { @Nullable private String getServiceJourneyRef(DatedServiceJourney dsj) { - List> journeyRef = dsj.getJourneyRef(); + JAXBElement journeyRef = dsj.getJourneyRef(); - if (journeyRef == null || journeyRef.isEmpty()) { + if (journeyRef == null) { return null; } - JourneyRefStructure ref = journeyRef.get(0).getValue(); + JourneyRefStructure ref = journeyRef.getValue(); return ref == null ? null : ref.getRef(); } } diff --git a/application/src/test/java/org/opentripplanner/netex/mapping/NetexTestDataSample.java b/application/src/test/java/org/opentripplanner/netex/mapping/NetexTestDataSample.java index 8d12b01ea57..431e2cab473 100644 --- a/application/src/test/java/org/opentripplanner/netex/mapping/NetexTestDataSample.java +++ b/application/src/test/java/org/opentripplanner/netex/mapping/NetexTestDataSample.java @@ -188,9 +188,7 @@ public NetexTestDataSample() { DatedServiceJourney datedServiceJourney = new DatedServiceJourney() .withId(DATED_SERVICE_JOURNEY_ID.get(i)) .withJourneyRef( - List.of( - MappingSupport.createWrappedRef(SERVICE_JOURNEY_ID, ServiceJourneyRefStructure.class) - ) + MappingSupport.createWrappedRef(SERVICE_JOURNEY_ID, ServiceJourneyRefStructure.class) ) .withServiceAlteration(ServiceAlterationEnumeration.PLANNED) .withOperatingDayRef(new OperatingDayRefStructure().withRef(operatingDay.getId())); diff --git a/application/src/test/java/org/opentripplanner/netex/mapping/TripCalendarBuilderTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/TripCalendarBuilderTest.java index 2e33e46294a..e7e3235653a 100644 --- a/application/src/test/java/org/opentripplanner/netex/mapping/TripCalendarBuilderTest.java +++ b/application/src/test/java/org/opentripplanner/netex/mapping/TripCalendarBuilderTest.java @@ -151,9 +151,9 @@ private static HierarchicalMultimap dayType1Assignmen private ArrayListMultimap dsj_2020_11_02(String sjId) { var dsj = new DatedServiceJourney(); dsj.withOperatingDayRef(new OperatingDayRefStructure().withRef(OD_1)); - dsj - .getJourneyRef() - .add(jaxbElement(new JourneyRefStructure().withRef(sjId), JourneyRefStructure.class)); + dsj.setJourneyRef( + jaxbElement(new JourneyRefStructure().withRef(sjId), JourneyRefStructure.class) + ); ArrayListMultimap map = ArrayListMultimap.create(); map.put(sjId, dsj); return map; diff --git a/application/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java index 2c84b88e7f2..80d1325287b 100644 --- a/application/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java +++ b/application/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java @@ -6,7 +6,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import com.google.common.collect.ArrayListMultimap; -import java.util.List; import java.util.Map; import java.util.Optional; import org.junit.jupiter.api.Test; @@ -22,8 +21,8 @@ import org.opentripplanner.transit.model.timetable.TripOnServiceDate; import org.opentripplanner.transit.model.timetable.TripTimes; import org.rutebanken.netex.model.DatedServiceJourney; -import org.rutebanken.netex.model.DatedServiceJourneyRefStructure; import org.rutebanken.netex.model.OperatingDay; +import org.rutebanken.netex.model.ReplacedJourneys_RelStructure; import org.rutebanken.netex.model.ServiceAlterationEnumeration; class TripPatternMapperTest { @@ -128,11 +127,16 @@ void testDatedServiceJourneyReplacement() { DatedServiceJourney dsjReplacing = sample.getDatedServiceJourneyById( NetexTestDataSample.DATED_SERVICE_JOURNEY_ID_2 ); - dsjReplacing.withJourneyRef( - List.of( - MappingSupport.createWrappedRef(dsjReplaced.getId(), DatedServiceJourneyRefStructure.class) - ) - ); + ReplacedJourneys_RelStructure replacedJourneys = new ReplacedJourneys_RelStructure(); + replacedJourneys + .getDatedVehicleJourneyRefOrNormalDatedVehicleJourneyRef() + .add( + MappingSupport.createWrappedRef( + dsjReplaced.getId(), + org.rutebanken.netex.model.VehicleJourneyRefStructure.class + ) + ); + dsjReplacing.withReplacedJourneys(replacedJourneys); Optional res = mapTripPattern(sample); assertTrue(res.isPresent()); diff --git a/pom.xml b/pom.xml index 0fa468a4d9b..bacf647ece1 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ 1.6.3 10.5.0 1.17.1 - 2.0.15.4 + 2.0.16.1 5.6.0 4.36.1 2.0.6 From b1b2785c8bc12f690c30af208ce598663d586049 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 14 Sep 2026 16:14:42 +0300 Subject: [PATCH 07/68] Block @Nonnull annotation usage with checkstyle --- checkstyle.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/checkstyle.xml b/checkstyle.xml index dbf20b6e524..629eaca8d40 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -13,6 +13,12 @@ + + + + From 2e97995daa4f7191195a0d9b834a96b2578c3ca3 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 14 Sep 2026 16:16:09 +0300 Subject: [PATCH 08/68] Remove @NonNull and @Nonnull annotation usage --- .../ext/siri/updater/mqtt/SiriETMqttUpdater.java | 5 +---- .../transit/repository/DefaultTimetableRepository.java | 3 +-- .../PlatformRelationWithTwoHolesAndStairsTest.java | 3 +-- .../opentripplanner/street/search/request/RentalPeriod.java | 3 +-- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/application/src/ext/java/org/opentripplanner/ext/siri/updater/mqtt/SiriETMqttUpdater.java b/application/src/ext/java/org/opentripplanner/ext/siri/updater/mqtt/SiriETMqttUpdater.java index 1375af5cdf6..acd1a3a5a9c 100644 --- a/application/src/ext/java/org/opentripplanner/ext/siri/updater/mqtt/SiriETMqttUpdater.java +++ b/application/src/ext/java/org/opentripplanner/ext/siri/updater/mqtt/SiriETMqttUpdater.java @@ -1,7 +1,6 @@ package org.opentripplanner.ext.siri.updater.mqtt; import java.util.function.Consumer; -import javax.annotation.Nonnull; import org.opentripplanner.updater.TransitRealTimeUpdateContext; import org.opentripplanner.updater.spi.GraphUpdater; import org.opentripplanner.updater.spi.UpdateResult; @@ -33,9 +32,7 @@ public SiriETMqttUpdater( } @Override - public void setup( - @Nonnull WriteToGraphCallback writeToGraphCallback - ) { + public void setup(WriteToGraphCallback writeToGraphCallback) { this.writeToGraphCallback = writeToGraphCallback; } diff --git a/application/src/main/java/org/opentripplanner/transit/repository/DefaultTimetableRepository.java b/application/src/main/java/org/opentripplanner/transit/repository/DefaultTimetableRepository.java index a35e33863b3..2e935c008e2 100644 --- a/application/src/main/java/org/opentripplanner/transit/repository/DefaultTimetableRepository.java +++ b/application/src/main/java/org/opentripplanner/transit/repository/DefaultTimetableRepository.java @@ -26,7 +26,6 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.jspecify.annotations.NonNull; import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitData; import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.TimetableUpdateMapper; @@ -439,7 +438,7 @@ public DefaultTimetableRepository commit(boolean force) { return createSnapshot(); } - public @NonNull DefaultTimetableRepository createSnapshot() { + public DefaultTimetableRepository createSnapshot() { RaptorTransitData updatedRaptorData = timetableUpdateMapper.map( realtimeRaptorTransitData, dirtyTimetables.values(), diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/osm/moduletests/walkablearea/PlatformRelationWithTwoHolesAndStairsTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/moduletests/walkablearea/PlatformRelationWithTwoHolesAndStairsTest.java index f0f4917c10b..a4cb2bffdd2 100644 --- a/application/src/test/java/org/opentripplanner/graph_builder/module/osm/moduletests/walkablearea/PlatformRelationWithTwoHolesAndStairsTest.java +++ b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/moduletests/walkablearea/PlatformRelationWithTwoHolesAndStairsTest.java @@ -4,7 +4,6 @@ import static org.opentripplanner.osm.model.NodeBuilder.node; import java.util.List; -import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.Test; import org.opentripplanner.graph_builder.module.osm.OsmModuleTestFactory; import org.opentripplanner.osm.TestOsmProvider; @@ -153,7 +152,7 @@ void lowMaxAreaNodes() { ); } - private static @NonNull GraphSummarizer buildSummarizer(int maxAreaNodes) { + private static GraphSummarizer buildSummarizer(int maxAreaNodes) { // Outer ring: ~200 m square var outerBL = node(0, new WgsCoordinate(0, 0)); var outerTL = node(1, new WgsCoordinate(0.002, 0)); diff --git a/street/src/main/java/org/opentripplanner/street/search/request/RentalPeriod.java b/street/src/main/java/org/opentripplanner/street/search/request/RentalPeriod.java index 1acf2a17249..822c1c13423 100644 --- a/street/src/main/java/org/opentripplanner/street/search/request/RentalPeriod.java +++ b/street/src/main/java/org/opentripplanner/street/search/request/RentalPeriod.java @@ -3,7 +3,6 @@ import java.time.Duration; import java.time.Instant; import java.util.Objects; -import javax.annotation.Nonnull; /** * Represent the period, on which rental vehicle should be available in direct car street routing. @@ -14,7 +13,7 @@ public final class RentalPeriod { private final Instant end; - public RentalPeriod(@Nonnull Instant start, @Nonnull Instant end) { + public RentalPeriod(Instant start, Instant end) { this.start = Objects.requireNonNull(start); this.end = Objects.requireNonNull(end); } From a61b4e84b9eaff1c52d054cf6341288648774cb9 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 15 Sep 2026 06:38:59 +0200 Subject: [PATCH 09/68] Reformat and document --- .../osm/DefaultOsmProvider.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/application/src/main/java/org/opentripplanner/osm/DefaultOsmProvider.java b/application/src/main/java/org/opentripplanner/osm/DefaultOsmProvider.java index 0efab431497..fa0415b4b3f 100644 --- a/application/src/main/java/org/opentripplanner/osm/DefaultOsmProvider.java +++ b/application/src/main/java/org/opentripplanner/osm/DefaultOsmProvider.java @@ -37,8 +37,10 @@ public class DefaultOsmProvider implements OsmProvider { private final OsmTagMapper osmTagMapper; private final WayPropertySet wayPropertySet; - private final int parallelism = Math.max(4, Runtime.getRuntime().availableProcessors()); - private final ExecutorService executorService = Executors.newFixedThreadPool(parallelism); + /// since reading from disk is still serial, this only controls how many threads _decode_ the zip + /// stream. past 2-3, more threads don't make it faster any more. + private final int decodeParallelism = Math.max(4, Runtime.getRuntime().availableProcessors()); + private final ExecutorService executorService = Executors.newFixedThreadPool(decodeParallelism); private byte[] cachedBytes = null; /** For tests */ @@ -73,8 +75,7 @@ public void readOsm(OsmDatabase osmdb) { osmdb.doneThirdPhaseNodes(); } catch (Exception ex) { throw new IllegalStateException("error loading OSM from path " + source.path(), ex); - } - finally { + } finally { executorService.shutdown(); } } @@ -102,7 +103,14 @@ private static InputStream track(OsmParserPhase phase, long size, InputStream in private void parsePhase(OsmParser parser, OsmParserPhase phase) { parser.setPhase(phase); - try (var in = new ParallelBlockInputStream(createInputStream(phase), parser, executorService, parallelism)) { + try ( + var in = new ParallelBlockInputStream( + createInputStream(phase), + parser, + executorService, + decodeParallelism + ) + ) { in.process(); } catch (Exception e) { LOG.error(e.getMessage(), e); From c6947a12d50b1603897ccff1991f38efe92e5081 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 9 Sep 2026 06:52:55 +0200 Subject: [PATCH 10/68] Add customized collection for speeding up island pruning --- .../module/islandpruning/ArraySet.java | 68 +++++++++++++++++++ .../islandpruning/IslandPruningModule.java | 17 +++-- 2 files changed, 76 insertions(+), 9 deletions(-) create mode 100644 application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArraySet.java diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArraySet.java b/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArraySet.java new file mode 100644 index 00000000000..368e5daf982 --- /dev/null +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArraySet.java @@ -0,0 +1,68 @@ +package org.opentripplanner.graph_builder.module.islandpruning; + +import java.util.Iterator; +import java.util.NoSuchElementException; + +/** + * A small, array-backed, insertion-order collection of distinct elements. Unlike + * {@link java.util.HashSet}, membership checks are a linear scan rather than a hash lookup, and + * elements are stored directly in a growable {@code Object[]} rather than delegating to + * {@link java.util.ArrayList}. + *

+ * This is a deliberate trade-off for very small collections: for the per-vertex street graph + * neighbor lists in {@link IslandPruningModule} (a handful of elements each), the hashing + * overhead of a hash-based {@code Set} costs more than a linear scan saves. Benchmarked against a + * full-country OSM extract, a {@code HashSet}-based dedupe of those neighbor lists was ~14% + * slower overall than this approach. + *

+ * Not a general-purpose collection: this does not implement {@link java.util.Set}, has no + * removal, and degrades to O(n) per {@link #add} as element count grows. + */ +class ArraySet implements Iterable { + + private static final int INITIAL_CAPACITY = 4; + + private Object[] elements = new Object[INITIAL_CAPACITY]; + private int size = 0; + + /** + * Adds the element if not already present. + * + * @return true if the element was added, false if it was already present + */ + boolean add(T element) { + for (int i = 0; i < size; i++) { + if (elements[i].equals(element)) { + return false; + } + } + if (size == elements.length) { + Object[] grown = new Object[elements.length * 2]; + System.arraycopy(elements, 0, grown, 0, size); + elements = grown; + } + elements[size++] = element; + return true; + } + + @Override + public Iterator iterator() { + return new Iterator<>() { + private int index = 0; + + @Override + public boolean hasNext() { + return index < size; + } + + @Override + @SuppressWarnings("unchecked") + public T next() { + if (index >= size) { + throw new NoSuchElementException(); + } + return (T) elements[index++]; + } + }; + } +} diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningModule.java b/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningModule.java index 8b7e6888f4e..7417c4fb267 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningModule.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningModule.java @@ -2,6 +2,7 @@ import java.time.Duration; import java.time.Instant; +import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -139,7 +140,7 @@ private void pruneIslands(TraverseMode traverseMode) { LOG.debug("nothru pruning"); Map subgraphs = new HashMap<>(); Map extgraphs = new HashMap<>(); - Map> neighborsForVertex = new HashMap<>(); + Map> neighborsForVertex = new HashMap<>(); Map isolated = new HashMap<>(); ArrayList islands = new ArrayList<>(); int count; @@ -270,7 +271,7 @@ private int processIslands( } private void collectNeighbourVertices( - Map> neighborsForVertex, + Map> neighborsForVertex, TraverseMode traverseMode, boolean shouldMatchNoThruType ) { @@ -302,19 +303,17 @@ private void collectNeighbourVertices( Arrays.stream(states) .map(State::getVertex) .forEach(out -> { - var vertexList = neighborsForVertex.computeIfAbsent(gv, k -> new ArrayList<>()); - vertexList.add(out); + neighborsForVertex.computeIfAbsent(gv, k -> new ArraySet<>()).add(out); // note: this assumes that edges are bi-directional. Maybe explicit state traversal is needed for CAR mode. - vertexList = neighborsForVertex.computeIfAbsent(out, k -> new ArrayList<>()); - vertexList.add(gv); + neighborsForVertex.computeIfAbsent(out, k -> new ArraySet<>()).add(gv); }); } } } private int collectSubGraphs( - Map> neighborsForVertex, + Map> neighborsForVertex, // put new subgraphs here Map newgraphs, // optional isolation map from a previous round @@ -465,13 +464,13 @@ private boolean restrictOrRemove( } private Subgraph computeConnectedSubgraph( - Map> neighborsForVertex, + Map> neighborsForVertex, Vertex startVertex, Map anchors, Map alreadyMapped ) { Subgraph subgraph = new Subgraph(); - Queue q = new LinkedList<>(); + Queue q = new ArrayDeque<>(); Subgraph anchor = null; if (anchors != null) { From a5929d848f83560e8e01d5471ae6bdc316ccd5a0 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 9 Sep 2026 07:20:24 +0200 Subject: [PATCH 11/68] Use specialised multimap --- .../module/islandpruning/ArrayMultimap.java | 37 +++++++++++++++++++ .../module/islandpruning/ArraySet.java | 8 ++-- .../islandpruning/IslandPruningModule.java | 27 ++++++-------- 3 files changed, 53 insertions(+), 19 deletions(-) create mode 100644 application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArrayMultimap.java diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArrayMultimap.java b/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArrayMultimap.java new file mode 100644 index 00000000000..4f5201e97ac --- /dev/null +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArrayMultimap.java @@ -0,0 +1,37 @@ +package org.opentripplanner.graph_builder.module.islandpruning; + +import java.util.HashMap; +import java.util.Map; + +/** + * A minimal multimap from a key to a small set of distinct values, purpose-built for + * {@link IslandPruningModule}'s street graph adjacency ({@code neighborsForVertex}). Only the + * operations that class actually needs are implemented: {@link #put}, {@link #containsKey} and + * {@link #get}. + *

+ * Values for a key are deduplicated and stored in an {@link ArraySet} rather than a hash-based + * {@link java.util.Set} — see {@link ArraySet} for the benchmarked rationale (street graph + * vertices typically have very few neighbors, so a linear scan beats hashing). + */ +class ArrayMultimap { + + @SuppressWarnings("rawtypes") + private static final ArraySet EMPTY = new ArraySet(); + + private final Map> map = new HashMap<>(); + + /** Associates {@code value} with {@code key}, if not already present. */ + void put(K key, V value) { + map.computeIfAbsent(key, k -> new ArraySet<>()).add(value); + } + + boolean containsKey(K key) { + return map.containsKey(key); + } + + /** Returns the values associated with {@code key}, or an empty set if there are none. */ + @SuppressWarnings("unchecked") + Iterable get(K key) { + return map.getOrDefault(key, EMPTY); + } +} diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArraySet.java b/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArraySet.java index 368e5daf982..e213c7beb10 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArraySet.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArraySet.java @@ -10,10 +10,10 @@ * {@link java.util.ArrayList}. *

* This is a deliberate trade-off for very small collections: for the per-vertex street graph - * neighbor lists in {@link IslandPruningModule} (a handful of elements each), the hashing - * overhead of a hash-based {@code Set} costs more than a linear scan saves. Benchmarked against a - * full-country OSM extract, a {@code HashSet}-based dedupe of those neighbor lists was ~14% - * slower overall than this approach. + * neighbor lists held by {@link ArrayMultimap} in {@link IslandPruningModule} (a handful of + * elements each), the hashing overhead of a hash-based {@code Set} costs more than a linear scan + * saves. Benchmarked against a full-country OSM extract, a {@code HashSet}-based dedupe of those + * neighbor lists was ~14% slower overall than this approach. *

* Not a general-purpose collection: this does not implement {@link java.util.Set}, has no * removal, and degrades to O(n) per {@link #add} as element count grows. diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningModule.java b/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningModule.java index 7417c4fb267..5fb3635b463 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningModule.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningModule.java @@ -4,7 +4,6 @@ import java.time.Instant; import java.util.ArrayDeque; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -140,7 +139,7 @@ private void pruneIslands(TraverseMode traverseMode) { LOG.debug("nothru pruning"); Map subgraphs = new HashMap<>(); Map extgraphs = new HashMap<>(); - Map> neighborsForVertex = new HashMap<>(); + ArrayMultimap neighborsForVertex = new ArrayMultimap<>(); Map isolated = new HashMap<>(); ArrayList islands = new ArrayList<>(); int count; @@ -271,7 +270,7 @@ private int processIslands( } private void collectNeighbourVertices( - Map> neighborsForVertex, + ArrayMultimap neighborsForVertex, TraverseMode traverseMode, boolean shouldMatchNoThruType ) { @@ -291,8 +290,7 @@ private void collectNeighbourVertices( State s0 = new State(gv, request); for (Edge e : gv.getOutgoing()) { if ( - e instanceof StreetEdge && - shouldMatchNoThruType != ((StreetEdge) e).isNoThruTraffic(traverseMode) + e instanceof StreetEdge se && shouldMatchNoThruType != se.isNoThruTraffic(traverseMode) ) { continue; } @@ -300,20 +298,19 @@ private void collectNeighbourVertices( if (State.isEmpty(states)) { continue; } - Arrays.stream(states) - .map(State::getVertex) - .forEach(out -> { - neighborsForVertex.computeIfAbsent(gv, k -> new ArraySet<>()).add(out); - - // note: this assumes that edges are bi-directional. Maybe explicit state traversal is needed for CAR mode. - neighborsForVertex.computeIfAbsent(out, k -> new ArraySet<>()).add(gv); - }); + for (State state : states) { + Vertex out = state.getVertex(); + neighborsForVertex.put(gv, out); + + // note: this assumes that edges are bi-directional. Maybe explicit state traversal is needed for CAR mode. + neighborsForVertex.put(out, gv); + } } } } private int collectSubGraphs( - Map> neighborsForVertex, + ArrayMultimap neighborsForVertex, // put new subgraphs here Map newgraphs, // optional isolation map from a previous round @@ -464,7 +461,7 @@ private boolean restrictOrRemove( } private Subgraph computeConnectedSubgraph( - Map> neighborsForVertex, + ArrayMultimap neighborsForVertex, Vertex startVertex, Map anchors, Map alreadyMapped From c51512ee58f8a0454a8a25582da9acab66b6fa8e Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 9 Sep 2026 10:11:32 +0200 Subject: [PATCH 12/68] Update Javadoc --- .../graph_builder/module/islandpruning/ArrayMultimap.java | 4 +--- .../graph_builder/module/islandpruning/ArraySet.java | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArrayMultimap.java b/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArrayMultimap.java index 4f5201e97ac..f78d79aec6a 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArrayMultimap.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArrayMultimap.java @@ -9,9 +9,7 @@ * operations that class actually needs are implemented: {@link #put}, {@link #containsKey} and * {@link #get}. *

- * Values for a key are deduplicated and stored in an {@link ArraySet} rather than a hash-based - * {@link java.util.Set} — see {@link ArraySet} for the benchmarked rationale (street graph - * vertices typically have very few neighbors, so a linear scan beats hashing). + * Values for a key are deduplicated and stored in an {@link ArraySet} for performance. */ class ArrayMultimap { diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArraySet.java b/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArraySet.java index e213c7beb10..95260fac13b 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArraySet.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArraySet.java @@ -12,8 +12,7 @@ * This is a deliberate trade-off for very small collections: for the per-vertex street graph * neighbor lists held by {@link ArrayMultimap} in {@link IslandPruningModule} (a handful of * elements each), the hashing overhead of a hash-based {@code Set} costs more than a linear scan - * saves. Benchmarked against a full-country OSM extract, a {@code HashSet}-based dedupe of those - * neighbor lists was ~14% slower overall than this approach. + * saves. *

* Not a general-purpose collection: this does not implement {@link java.util.Set}, has no * removal, and degrades to O(n) per {@link #add} as element count grows. From a55bde78ae3d131625572a4039ce142a76f41527 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 15 Sep 2026 11:45:31 +0200 Subject: [PATCH 13/68] Use plain ArrayList --- .../module/islandpruning/ArrayMultimap.java | 13 ++-- .../module/islandpruning/ArraySet.java | 67 ------------------- 2 files changed, 9 insertions(+), 71 deletions(-) delete mode 100644 application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArraySet.java diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArrayMultimap.java b/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArrayMultimap.java index f78d79aec6a..df2fe01cd7c 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArrayMultimap.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArrayMultimap.java @@ -1,6 +1,8 @@ package org.opentripplanner.graph_builder.module.islandpruning; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -9,18 +11,21 @@ * operations that class actually needs are implemented: {@link #put}, {@link #containsKey} and * {@link #get}. *

- * Values for a key are deduplicated and stored in an {@link ArraySet} for performance. + * Values for a key are deduplicated and stored in an {@link ArrayList} for performance. */ class ArrayMultimap { @SuppressWarnings("rawtypes") - private static final ArraySet EMPTY = new ArraySet(); + private static final List EMPTY = List.of(); - private final Map> map = new HashMap<>(); + private final Map> map = new HashMap<>(); /** Associates {@code value} with {@code key}, if not already present. */ void put(K key, V value) { - map.computeIfAbsent(key, k -> new ArraySet<>()).add(value); + var list = map.computeIfAbsent(key, k -> new ArrayList<>(4)); + if (!list.contains(value)) { + list.add(value); + } } boolean containsKey(K key) { diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArraySet.java b/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArraySet.java deleted file mode 100644 index 95260fac13b..00000000000 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/ArraySet.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.opentripplanner.graph_builder.module.islandpruning; - -import java.util.Iterator; -import java.util.NoSuchElementException; - -/** - * A small, array-backed, insertion-order collection of distinct elements. Unlike - * {@link java.util.HashSet}, membership checks are a linear scan rather than a hash lookup, and - * elements are stored directly in a growable {@code Object[]} rather than delegating to - * {@link java.util.ArrayList}. - *

- * This is a deliberate trade-off for very small collections: for the per-vertex street graph - * neighbor lists held by {@link ArrayMultimap} in {@link IslandPruningModule} (a handful of - * elements each), the hashing overhead of a hash-based {@code Set} costs more than a linear scan - * saves. - *

- * Not a general-purpose collection: this does not implement {@link java.util.Set}, has no - * removal, and degrades to O(n) per {@link #add} as element count grows. - */ -class ArraySet implements Iterable { - - private static final int INITIAL_CAPACITY = 4; - - private Object[] elements = new Object[INITIAL_CAPACITY]; - private int size = 0; - - /** - * Adds the element if not already present. - * - * @return true if the element was added, false if it was already present - */ - boolean add(T element) { - for (int i = 0; i < size; i++) { - if (elements[i].equals(element)) { - return false; - } - } - if (size == elements.length) { - Object[] grown = new Object[elements.length * 2]; - System.arraycopy(elements, 0, grown, 0, size); - elements = grown; - } - elements[size++] = element; - return true; - } - - @Override - public Iterator iterator() { - return new Iterator<>() { - private int index = 0; - - @Override - public boolean hasNext() { - return index < size; - } - - @Override - @SuppressWarnings("unchecked") - public T next() { - if (index >= size) { - throw new NoSuchElementException(); - } - return (T) elements[index++]; - } - }; - } -} From e23a3dfd1c8ce452a438e830e1a504359805755a Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 16 Sep 2026 22:18:01 +0200 Subject: [PATCH 14/68] Replace Math.max with Math.min --- .../main/java/org/opentripplanner/osm/DefaultOsmProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/main/java/org/opentripplanner/osm/DefaultOsmProvider.java b/application/src/main/java/org/opentripplanner/osm/DefaultOsmProvider.java index fa0415b4b3f..7ce1b6a6fb1 100644 --- a/application/src/main/java/org/opentripplanner/osm/DefaultOsmProvider.java +++ b/application/src/main/java/org/opentripplanner/osm/DefaultOsmProvider.java @@ -39,7 +39,7 @@ public class DefaultOsmProvider implements OsmProvider { private final WayPropertySet wayPropertySet; /// since reading from disk is still serial, this only controls how many threads _decode_ the zip /// stream. past 2-3, more threads don't make it faster any more. - private final int decodeParallelism = Math.max(4, Runtime.getRuntime().availableProcessors()); + private final int decodeParallelism = Math.min(4, Runtime.getRuntime().availableProcessors()); private final ExecutorService executorService = Executors.newFixedThreadPool(decodeParallelism); private byte[] cachedBytes = null; From 25ea79aae1b24229742cda300d5917dfe94748e5 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 16 Sep 2026 22:21:31 +0200 Subject: [PATCH 15/68] Improve Javadoc --- .../java/org/opentripplanner/osm/DefaultOsmProvider.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/src/main/java/org/opentripplanner/osm/DefaultOsmProvider.java b/application/src/main/java/org/opentripplanner/osm/DefaultOsmProvider.java index 7ce1b6a6fb1..958588198c4 100644 --- a/application/src/main/java/org/opentripplanner/osm/DefaultOsmProvider.java +++ b/application/src/main/java/org/opentripplanner/osm/DefaultOsmProvider.java @@ -20,9 +20,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * Implementation of the provider interface that reads OSM binary files from disk. - */ +/// Implementation of the provider interface that reads OSM binary files from disk. public class DefaultOsmProvider implements OsmProvider { private static final Logger LOG = LoggerFactory.getLogger(DefaultOsmProvider.class); @@ -38,7 +36,7 @@ public class DefaultOsmProvider implements OsmProvider { private final WayPropertySet wayPropertySet; /// since reading from disk is still serial, this only controls how many threads _decode_ the zip - /// stream. past 2-3, more threads don't make it faster any more. + /// stream. past 2-3, more threads don't make it faster anymore. private final int decodeParallelism = Math.min(4, Runtime.getRuntime().availableProcessors()); private final ExecutorService executorService = Executors.newFixedThreadPool(decodeParallelism); private byte[] cachedBytes = null; @@ -61,6 +59,8 @@ public DefaultOsmProvider( this.cacheDataInMem = cacheDataInMem; } + /// Parses the OSM data from the source. Shuts down the executor service and will therefore throw an exception if + /// called a second time. public void readOsm(OsmDatabase osmdb) { try { OsmParser parser = new OsmParser(osmdb, this); From e0d7799c521e653f035e727e6bae936f81ff6360 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Sep 2026 06:05:59 +0000 Subject: [PATCH 16/68] Update Test dependencies --- application/pom.xml | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/pom.xml b/application/pom.xml index 4db88796375..f11f158896d 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -159,7 +159,7 @@ com.tngtech.archunit archunit - 1.4.2 + 1.5.0 test diff --git a/pom.xml b/pom.xml index 0fa468a4d9b..d190b38db2b 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ 2.22.2 4.0.9 3.1.12 - 6.1.2 + 6.1.3 1.14.1 5.6.0 1.6.3 @@ -700,7 +700,7 @@ com.tngtech.archunit archunit - 1.4.2 + 1.5.0 org.mockito From fb1cc5b20ea637e31fbc9aead5d9ebcda16b45fd Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Thu, 17 Sep 2026 12:23:16 +0200 Subject: [PATCH 17/68] feat(release-script): verify who labeled the PRs merged into a release Anyone with triage access to the upstream repository can label a PR, and a labeled PR is merged, built and released by a fork's release workflow without further review. The GraphQL query that lists the labeled PRs now also reads the labeling events, and a new optional config `include_prs_labelers` lists the GitHub logins allowed to set the `include_prs_label`. The release stops before anything is merged if the last user who set the label on a PR is not in the list. The head read together with the label is verified when the PR is fetched, so the code merged is the code that was listed. The API token is removed from the environment after the query, so Maven does not inherit it when testing the merged PRs. Omitting the config keeps the current behaviour, with a warning. --- script/CUSTOM_RELEASE_README.md | 20 +++++ script/custom-release.py | 135 ++++++++++++++++++++++++++------ 2 files changed, 131 insertions(+), 24 deletions(-) diff --git a/script/CUSTOM_RELEASE_README.md b/script/CUSTOM_RELEASE_README.md index 5e3efe611cf..3a41a995eb1 100644 --- a/script/CUSTOM_RELEASE_README.md +++ b/script/CUSTOM_RELEASE_README.md @@ -123,6 +123,7 @@ Add the `script/custom-release-env.json` file to your branch. The content of the "release_branch": "", "ser_ver_id_prefix": "", "include_prs_label": " Test", + "include_prs_labelers": [ "", "" ], "ext_branches" : [ ""], "otp_production_url" : "" } @@ -135,6 +136,7 @@ If you organization is _Curium_, then the file would look like this: "release_branch": "main", "ser_ver_id_prefix": "CU", "include_prs_label": "Curium Test", + "include_prs_labelers": [ "alice", "bob" ], "ext_branches" : [ "main_config"], "otp_production_url" : "https://otp.curium.org/otp" } @@ -146,6 +148,10 @@ Git clone. Use `git remote -v` to list all remote repos. The `otp_production_url` is optional. If provided, the release script will include a changelog diff in the release summary between the production and built version. +The `include_prs_labelers` is optional, but recommended. It lists the GitHub logins of the users +who are allowed to label PRs for your releases, see [Pending Pull Requests](#pending-pull-requests). +If it is omitted or empty, the script does not verify who set the label. + ``` # git remote -v curium https://github.com/curium/OpenTripPlanner.git (fetch) @@ -212,6 +218,20 @@ and merged in the upstream repo. We combine this with config, and sometimes the to turn _on_ new features in over test environment. When the new feature is tested ok, we can enable it by changing the config. +#### Who may label PRs for a release + +Anyone with triage access to the upstream repository can put a label on a PR, and a labeled PR is +merged, built and released without further review. To protect your release, list the GitHub logins +of the users you trust to label PRs in the `include_prs_labelers` config. For each PR the script +looks at who set the label _last_ - the label can be removed and set again - and stops the release +if that user is not in the list. The check runs before anything is merged. To resolve it, remove the +label from the PR or add the user to the list. The login of the labeler is also printed in the +release summary. + +The head commit of each PR is read together with the label. When the PR is fetched a moment later, +the script verifies that the head has not moved; if it has, the release stops and can be started +over. + ## How To Make The First Release diff --git a/script/custom-release.py b/script/custom-release.py index 854f1079168..7ede8aa0567 100755 --- a/script/custom-release.py +++ b/script/custom-release.py @@ -35,6 +35,7 @@ def __init__(self): self.release_branch = None self.ext_branches = None self.include_prs_label = None + self.include_prs_labelers = [] self.ser_ver_id_prefix = None self.otp_production_url = None @@ -51,7 +52,8 @@ def __str__(self): f"release_branch: '{self.release_branch}', " f"ext_branches: {self.ext_branches}, " f"include_prs_label: '{self.include_prs_label}', " - f"ser_ver_id_prefix: '{self.ser_ver_id_prefix}'" + f"include_prs_labelers: {self.include_prs_labelers}, " + f"ser_ver_id_prefix: '{self.ser_ver_id_prefix}', " f"otp_production_url: '{self.otp_production_url}'>") @@ -95,6 +97,8 @@ def __init__(self): self.title = None self.commit_hash = None self.labels = [] + # GitHub login of the user who set the 'include_prs_label' last + self.labeled_by = None def description(self): return f'{self.title} #{self.number}' @@ -103,7 +107,9 @@ def description_w_labels(self): return f'{self.description()} {self.labels}' def description_link(self): - return f"{self.title} [#{self.number}]({OTP_GITHUB_PULLREQUEST_URL}{self.number}) {self.labels}" + labeled_by = f' - labeled by {self.labeled_by}' if self.labeled_by else '' + return (f"{self.title} [#{self.number}]({OTP_GITHUB_PULLREQUEST_URL}{self.number}) " + f"{self.labels}{labeled_by}") def is_label_bump_ser_id_set(self): return LBL_BUMP_SER_VER_ID in self.labels @@ -218,7 +224,8 @@ def setup_and_verify(): resolve_version_number() resolve_next_version() resolve_latest_ser_ver_id() - read_pull_request_info_from_github() + read_pull_request_info() + verify_pr_labelers() check_if_prs_exist_in_latest_release() resolve_next_ser_ver_id() resolve_production_versions() @@ -243,10 +250,20 @@ def merge_in_labeled_prs(): temp_branch = f'pull-request-{pr.number}' if section_w_resume(temp_branch, f'Merge in PR {pr.description()}'): git('fetch', config.upstream_remote, f'pull/{pr.number}/head:{temp_branch}') + verify_pr_head_not_moved(pr, temp_branch) git('merge', temp_branch) git('branch', '-D', temp_branch) +# The PR head is fetched some time after it was read from GitHub, so make sure the code merged into +# the release is the code that was listed and verified. +def verify_pr_head_not_moved(pr, temp_branch): + fetched_hash = git_commit_hash(temp_branch) + if fetched_hash != pr.commit_hash: + error(f'The head of PR #{pr.number} has moved since it was read: expected {pr.commit_hash}, ' + f'but fetched {fetched_hash}. Start over to release the new head.') + + def merge_in_ext_branches(): if len(config.ext_branches) == 0: info('\nNo config branch configured, mering is skipped.') @@ -436,6 +453,7 @@ def load_config(): config.release_branch = doc['release_branch'] config.ext_branches = doc['ext_branches'] config.include_prs_label = doc['include_prs_label'] + config.include_prs_labelers = doc.get('include_prs_labelers', []) config.ser_ver_id_prefix = doc['ser_ver_id_prefix'] config.otp_production_url = doc['otp_production_url'] debug(f'Config loaded: {config}') @@ -443,6 +461,10 @@ def load_config(): if len(config.ser_ver_id_prefix) > 2: error(f"Configure the 'ser_ver_id_prefix'. The prefix must be maximum two characters long. " f"Value: <{config.ser_ver_id_prefix}>") + labelers = config.include_prs_labelers + if not isinstance(labelers, list) or not all(isinstance(it, str) and it for it in labelers): + error(f"Configure the 'include_prs_labelers'. It must be a list of GitHub logins. " + f"Value: <{labelers}>") def verify_script_run_from_root(): @@ -512,25 +534,39 @@ def resolve_latest_ser_ver_id(): state.latest_ser_ver_id = maxSId -def read_pull_request_info_from_github(): +def read_pull_request_info(): if options.skip_prs or (not config.include_prs_label): info('Skip merging in GitHub PRs.') - return - info('Get PRs to include and their labels from GitHub - This requires authentication ...') + else: + read_pull_request_info_from_github() +# Read the open upstream PRs labeled with the 'include_prs_label'. Together with the PR, the labeling +# events on it are read so that the login of the person who set the label can be verified, see +# 'verify_pr_labelers'. All labeling events are fetched, the filtering on label name is done here. +def read_pull_request_info_from_github(): + info('Get PRs to include and their labels from GitHub - This requires authentication ...') + query_text = ''' query ReadOpenPullRequests { repository(owner:\\"opentripplanner\\", name:\\"OpenTripPlanner\\") { pullRequests(first: 100, states: OPEN, labels: \\"''' + config.include_prs_label + '''\\") { nodes { - number, - title, + number, + title, headRefOid, labels(first: 20) { nodes { name } + }, + timelineItems(itemTypes: [LABELED_EVENT], last: 100) { + nodes { + ... on LabeledEvent { + actor { login }, + label { name } + } + } } } } @@ -551,25 +587,71 @@ def read_pull_request_info_from_github(): result = execute('curl', '-H', f'Authorization: Bearer {git_hub_access_token}', '-X', 'POST', '-d', post_body, 'https://api.github.com/graphql', error_msg='GitHub GraphQL Query failed!', quiet_err=True) + # The token is not needed after this point. Remove it from the environment so that it is not + # inherited by Maven, which runs the tests of the merged in - not yet reviewed - PRs. + del os.environ['CUSTOM_RELEASE_GIT_HUB_API_TOKEN'] # Example response - # {"data":{"repository":{"pullRequests":{"nodes":[{"number":2222,"labels":{"nodes":[{"name":"+Bump Serialization Id"},{"name":"Entur Test"}]}}]}}}} + # {"data":{"repository":{"pullRequests":{"nodes":[{"number":2222,"labels":{"nodes":[{"name":"+Bump Serialization Id"},{"name":"Entur Test"}]},"timelineItems":{"nodes":[{"actor":{"login":"octocat"},"label":{"name":"Entur Test"}}]}}]}}}} json_doc = json.loads(result.stdout) + for node in json_doc['data']['repository']['pullRequests']['nodes']: + label_names = [label['name'] for label in node['labels']['nodes']] + labeled_by = resolve_labeled_by(node['timelineItems']['nodes']) + add_pull_request(node['number'], node['title'], node['headRefOid'], label_names, labeled_by) + + +# Return the login of the user who set the 'include_prs_label' last. The label can be removed and +# set again, so only the last event counts. A user who no longer exists has no login, in which case +# 'unknown' is returned - the same if no event is found. +def resolve_labeled_by(labeled_events): + labeled_by = 'unknown' + for event in labeled_events: + if event.get('label', {}).get('name', '').lower() == config.include_prs_label.lower(): + actor = event.get('actor') + labeled_by = actor['login'] if actor and actor.get('login') else 'unknown' + return labeled_by + + +def add_pull_request(number, title, commit_hash, label_names, labeled_by): + if not re.fullmatch(r'[0-9a-f]{40}', str(commit_hash)): + error(f'PR #{number} does not have a full 40 character commit hash as head: {commit_hash}') + pr = PullRequest() + pr.number = int(number) + pr.title = title + pr.commit_hash = commit_hash + pr.labeled_by = labeled_by + # GitHub labels are not case-sensitive, hence using 'lower()' defined_labels = [LBL_BUMP_SER_VER_ID.lower(), config.include_prs_label.lower()] + pr.labels = [name for name in label_names if name.lower() in defined_labels] + pullRequests.append(pr) - for node in json_doc['data']['repository']['pullRequests']['nodes']: - pr = PullRequest() - pr.number = node['number'] - pr.title = node['title'] - pr.commit_hash = node['headRefOid'] - labels = node['labels']['nodes'] - # GitHub labels are not case-sensitive, hence using 'lower()' - for label in labels: - lbl_name = label['name'] - lbl_name_lc= lbl_name.lower() - if lbl_name_lc in defined_labels: - pr.labels.append(lbl_name) - pullRequests.append(pr) + +# Anyone with triage access to the upstream repository can label a PR, and a labeled PR is merged, +# built and released without review. If 'include_prs_labelers' is configured, only PRs labeled by +# one of the listed GitHub logins are accepted. The check runs before anything is merged. +def verify_pr_labelers(): + if not pullRequests: + return + if not config.include_prs_labelers: + warn(f"'include_prs_labelers' is not configured, so it is not verified who set the " + f"'{config.include_prs_label}' label on the PRs merged into this release.") + return + section(f'Verify who set the {config.include_prs_label} label on the PRs ...') + # GitHub logins are not case-sensitive, hence using 'lower()' + trusted = [login.lower() for login in config.include_prs_labelers] + untrusted = [] + for pr in pullRequests: + if pr.labeled_by and pr.labeled_by.lower() in trusted: + info(f' - PR #{pr.number} labeled by {pr.labeled_by} - OK') + else: + info(f' - PR #{pr.number} labeled by {pr.labeled_by} - NOT TRUSTED') + untrusted.append(pr) + if untrusted: + error('These PRs are labeled by a user not listed in the \'include_prs_labelers\':\n' + + ''.join(f" - PR #{pr.number} '{pr.title}' labeled by {pr.labeled_by}\n" + for pr in untrusted) + + "Remove the label, or add the login to 'include_prs_labelers' in the " + "'script/custom-release-env.json' file.") def check_if_prs_exist_in_latest_release(): @@ -675,19 +757,22 @@ def print_setup(): - Dry run .................... : {options.dry_run} - Debugging ................... : {options.debugging} - Release ..................... : {options.release_only} + - Skip PRs .................... : {options.skip_prs} Config - Upstream git repo remote name : {config.upstream_remote} - Release to remote git repo .. : {config.release_remote} - Release branch .............. : {config.release_branch} - Configuration branches ...... : {config.ext_branches} + - PRs label ................... : {config.include_prs_label} + - PRs trusted labelers ........ : {config.include_prs_labelers} - Ser.ver.id prefix ........... : {config.ser_ver_id_prefix} - Otp production url .......... : {config.otp_production_url} ''') if config.include_prs_label: info(f'PRs to merge') for pr in pullRequests: - info(f' - {pr.description_w_labels()}') + info(f' - {pr.description_w_labels()} labeled by {pr.labeled_by}') info(f''' Release info - Project major version ....... : {state.major_version} @@ -908,7 +993,9 @@ def print_help(): Release process overview 1. The configured release-branch is reset hard to the script argument. - 2. Then the labeled PRs are merged into the release-branch [if configured]. + 2. Then the labeled PRs are merged into the release-branch [if configured]. If the + 'include_prs_labelers' is configured, only PRs labeled by one of the listed GitHub + users are accepted - the release stops if any other user has set the label. 3. The config-branches are merged into the release-branch [if configured]. 4. The pom.xml file is updated with a new version and serialization version id [if required]. 5. The release is tested, tagged and pushed to Git repo. From 6afa13846271ed76d009a39eb32400782f645e85 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 17 Sep 2026 14:32:21 +0200 Subject: [PATCH 18/68] Update Javadoc --- .../main/java/org/opentripplanner/osm/DefaultOsmProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/main/java/org/opentripplanner/osm/DefaultOsmProvider.java b/application/src/main/java/org/opentripplanner/osm/DefaultOsmProvider.java index 958588198c4..95953497948 100644 --- a/application/src/main/java/org/opentripplanner/osm/DefaultOsmProvider.java +++ b/application/src/main/java/org/opentripplanner/osm/DefaultOsmProvider.java @@ -36,7 +36,7 @@ public class DefaultOsmProvider implements OsmProvider { private final WayPropertySet wayPropertySet; /// since reading from disk is still serial, this only controls how many threads _decode_ the zip - /// stream. past 2-3, more threads don't make it faster anymore. + /// stream. past 3-4, more threads don't make it faster anymore. private final int decodeParallelism = Math.min(4, Runtime.getRuntime().availableProcessors()); private final ExecutorService executorService = Executors.newFixedThreadPool(decodeParallelism); private byte[] cachedBytes = null; From 68807502c0920dd473565b5498e65e926a0227da Mon Sep 17 00:00:00 2001 From: Michael Tsang Date: Thu, 17 Sep 2026 22:09:07 +0800 Subject: [PATCH 19/68] Remove duplicate method call --- .../org/opentripplanner/osm/wayproperty/WayPropertySet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/main/java/org/opentripplanner/osm/wayproperty/WayPropertySet.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/WayPropertySet.java index 9891a3c0018..e0e5be227b2 100644 --- a/application/src/main/java/org/opentripplanner/osm/wayproperty/WayPropertySet.java +++ b/application/src/main/java/org/opentripplanner/osm/wayproperty/WayPropertySet.java @@ -237,7 +237,7 @@ public float getCarSpeedForWay( var maxSpeed = way.getTag("maxspeed"); if (maxSpeed != null && speed == null) { - speed = SpeedParser.getMetersSecondFromSpeed(way.getTag("maxspeed")); + speed = SpeedParser.getMetersSecondFromSpeed(maxSpeed); } if (speed != null) { From 61fffd0a0b2898266c278facb0b6dcc18fe17569 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Thu, 17 Sep 2026 14:37:37 +0000 Subject: [PATCH 20/68] Add changelog entry for #8008 [ci skip] --- doc/user/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/Changelog.md b/doc/user/Changelog.md index 74cd96ce22d..84be794ec26 100644 --- a/doc/user/Changelog.md +++ b/doc/user/Changelog.md @@ -12,6 +12,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Limit growth of NeTEx stop time index [#7963](https://github.com/opentripplanner/OpenTripPlanner/pull/7963) - Remove .idea files from version control [#7992](https://github.com/opentripplanner/OpenTripPlanner/pull/7992) - Deprecate serviceId in GTFS API and stop populating it [#7991](https://github.com/opentripplanner/OpenTripPlanner/pull/7991) +- Decode OSM PBF data in parallel [#8008](https://github.com/opentripplanner/OpenTripPlanner/pull/8008) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.10.0 (2026-09-09) From 9d9216a5229fc1ddd6eaa397c9aa2da866107c95 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 18 Sep 2026 09:58:00 +0200 Subject: [PATCH 21/68] Start renovate for debug UI earlier in the day [ci skip] --- renovate.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json5 b/renovate.json5 index b8457d9ac53..c4c9434ff53 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -39,7 +39,7 @@ "matchFiles": ["client/package.json"], "matchUpdateTypes": ["patch", "minor"], "groupName": "Debug UI dependencies (non-major)", - "schedule": ["after 6pm on the 17th day of the month"], + "schedule": ["after 3pm on the 17th day of the month"], "minimumReleaseAge": "4 days", "reviewers": ["testower"], "postUpdateOptions": ["npmInstallTwice"] From d70779d3d06c394897127ac7161173ca9db89716 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Sep 2026 07:58:43 +0000 Subject: [PATCH 22/68] Update Debug UI dependencies (non-major) --- client/package-lock.json | 837 +++++++++++++++++++-------------------- client/package.json | 30 +- 2 files changed, 415 insertions(+), 452 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 800e93159d0..7de319c2a3a 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -13,24 +13,24 @@ "bootstrap": "5.3.8", "graphql": "16.14.2", "graphql-request": "7.4.0", - "maplibre-gl": "6.4.1", - "react": "19.2.7", + "maplibre-gl": "6.9.0", + "react": "19.3.0", "react-bootstrap": "2.10.10", - "react-dom": "19.2.7", - "react-map-gl": "8.1.2", + "react-dom": "19.3.0", + "react-map-gl": "8.1.3", "react-select": "5.10.2" }, "devDependencies": { - "@eslint/compat": "2.1.0", + "@eslint/compat": "2.1.1", "@eslint/js": "9.39.5", "@graphql-codegen/cli": "6.2.1", "@graphql-codegen/client-preset": "5.2.4", "@graphql-codegen/introspection": "5.0.1", - "@parcel/watcher": "2.5.6", - "@testing-library/react": "16.3.2", - "@types/react": "19.2.17", - "@types/react-dom": "19.2.3", - "@vitejs/plugin-react": "6.0.3", + "@parcel/watcher": "2.6.0", + "@testing-library/react": "16.3.3", + "@types/react": "19.3.0", + "@types/react-dom": "19.3.0", + "@vitejs/plugin-react": "6.1.1", "@vitest/coverage-v8": "5.0.0", "eslint": "9.39.5", "eslint-config-prettier": "10.1.8", @@ -38,13 +38,13 @@ "eslint-plugin-jsx-a11y": "6.10.2", "eslint-plugin-react": "7.37.5", "eslint-plugin-react-hooks": "7.1.1", - "eslint-plugin-react-refresh": "0.5.3", - "globals": "17.7.0", + "eslint-plugin-react-refresh": "0.5.6", + "globals": "17.12.0", "jsdom": "30.0.1", - "prettier": "3.9.5", + "prettier": "3.9.6", "typescript": "6.0.3", - "typescript-eslint": "8.64.0", - "vite": "8.1.5", + "typescript-eslint": "8.70.0", + "vite": "8.3.0", "vitest": "5.0.0" } }, @@ -544,40 +544,6 @@ "node": ">=20.19.0" } }, - "node_modules/@emnapi/core": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.1.tgz", - "integrity": "sha512-RSvbQmHzdKzNsLYa/wHrbc3KN4sYLKAdPZxqiM2HATqv/SBk2/ENSHpvXGaLOMcsAyz0poEGqkmmKYG3OWiJEQ==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "@emnapi/wasi-threads": "1.2.2", - "tslib": "^2.4.0" - } - }, - "node_modules/@emnapi/runtime": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.1.tgz", - "integrity": "sha512-vgj7R3y3Wgx24IQaGPA/R6YFXLHVMOZ0uVEyIQPaWs+rd1AzfEMXlAC22FYwO1XkKR6NPsq7mUandH8oIRdZFw==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "tslib": "^2.4.0" - } - }, - "node_modules/@emnapi/wasi-threads": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.2.tgz", - "integrity": "sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "tslib": "^2.4.0" - } - }, "node_modules/@emotion/babel-plugin": { "version": "11.13.5", "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.13.5.tgz", @@ -772,9 +738,9 @@ } }, "node_modules/@eslint/compat": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@eslint/compat/-/compat-2.1.0.tgz", - "integrity": "sha512-LgaSCymEpw7tF53xvDw9SNsraPb1IBHxpdABIOM0hW8UAlP8znrjYtuxfR58FSJ3L9BhwD+FaPRFQpZq84Nh6g==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@eslint/compat/-/compat-2.1.1.tgz", + "integrity": "sha512-rMcy8GSrwNzcISX/BlTDY/GLB4eCopEuy9woIls3To+15OLxykZrxxq+WUcylCPCQ6F4MujjBM1DX5V1aqI3Vw==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -2426,9 +2392,9 @@ } }, "node_modules/@maplibre/maplibre-gl-style-spec": { - "version": "26.2.1", - "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-26.2.1.tgz", - "integrity": "sha512-QFKCXkOeSzOr8jF75jm6kySOg+dUvOehPhRi68gcOYPHb7U5JloUq0dJW0Y5/fZV8ygfT0Vp2RWodvq+fyxFWA==", + "version": "26.4.2", + "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-26.4.2.tgz", + "integrity": "sha512-6J0vZqMZvRAJKtdWJdDGHEh1YJ2ZHG08/GOur8gCArYhO8ZkM//OXqtI2AAEz4jc2G+Wq4MfcePg8qNK5TZ4Kg==", "license": "ISC", "dependencies": { "@mapbox/jsonlint-lines-primitives": "^2.0.3", @@ -2451,9 +2417,9 @@ "license": "BSD-2-Clause" }, "node_modules/@maplibre/mlt": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/@maplibre/mlt/-/mlt-1.1.12.tgz", - "integrity": "sha512-ZeK5w2TTeHOajcLaEQs1KZXw2V9wIKo1PmThlxlsHoXsQsYlBqLJzPOd6tJHRtGTChUY3DPPmjXRArYVvAbmZw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@maplibre/mlt/-/mlt-1.2.1.tgz", + "integrity": "sha512-5n5dgolE2EYxwCKgx8vlwURCB8A+kyfJJyThlYimjlGgOcOe2Bhw9VxxnnHC91OC9PgHg+nVdgVPTYPkIo62vg==", "license": "(MIT OR Apache-2.0)", "dependencies": { "@mapbox/point-geometry": "^1.1.0" @@ -2470,25 +2436,6 @@ "pbf": "^5.1.0" } }, - "node_modules/@napi-rs/wasm-runtime": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.6.tgz", - "integrity": "sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "@tybys/wasm-util": "^0.10.3" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/Brooooooklyn" - }, - "peerDependencies": { - "@emnapi/core": "^1.7.1", - "@emnapi/runtime": "^1.7.1" - } - }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -2525,19 +2472,19 @@ } }, "node_modules/@oxc-project/types": { - "version": "0.139.0", - "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.139.0.tgz", - "integrity": "sha512-r9gHphtCs+1M7J0pw6Sn/hh/Wpa/iQrOOkrNAlVLF/gHq+/CJmHIWKKUUhdWjcD6CIa8idarspCsASiXCXvFUw==", + "version": "0.149.0", + "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.149.0.tgz", + "integrity": "sha512-Efcc+iF0j3Bf67YjEqIqWXbX5XddXoK/Mw4K1/JuXwRCZ8N16VR7iT23nlCc9XrveFVh/E5Rqs2StT0V8v9LdA==", "dev": true, "license": "MIT", "funding": { - "url": "https://github.com/sponsors/Boshen" + "url": "https://github.com/sponsors/oxc-project" } }, "node_modules/@parcel/watcher": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.6.tgz", - "integrity": "sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.6.0.tgz", + "integrity": "sha512-7FNeNl8NCE7aINx7WXiKQrPYZWC/hvrTsmk6zmxbI7LTXE7hVek/n8AfVgpe2y82zl3w0HvCHN0bVKMBoJcC0w==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -2545,7 +2492,7 @@ "detect-libc": "^2.0.3", "is-glob": "^4.0.3", "node-addon-api": "^7.0.0", - "picomatch": "^4.0.3" + "picomatch": "^4.0.4" }, "engines": { "node": ">= 10.0.0" @@ -2555,25 +2502,24 @@ "url": "https://opencollective.com/parcel" }, "optionalDependencies": { - "@parcel/watcher-android-arm64": "2.5.6", - "@parcel/watcher-darwin-arm64": "2.5.6", - "@parcel/watcher-darwin-x64": "2.5.6", - "@parcel/watcher-freebsd-x64": "2.5.6", - "@parcel/watcher-linux-arm-glibc": "2.5.6", - "@parcel/watcher-linux-arm-musl": "2.5.6", - "@parcel/watcher-linux-arm64-glibc": "2.5.6", - "@parcel/watcher-linux-arm64-musl": "2.5.6", - "@parcel/watcher-linux-x64-glibc": "2.5.6", - "@parcel/watcher-linux-x64-musl": "2.5.6", - "@parcel/watcher-win32-arm64": "2.5.6", - "@parcel/watcher-win32-ia32": "2.5.6", - "@parcel/watcher-win32-x64": "2.5.6" + "@parcel/watcher-android-arm64": "2.6.0", + "@parcel/watcher-darwin-arm64": "2.6.0", + "@parcel/watcher-darwin-x64": "2.6.0", + "@parcel/watcher-freebsd-x64": "2.6.0", + "@parcel/watcher-linux-arm-glibc": "2.6.0", + "@parcel/watcher-linux-arm-musl": "2.6.0", + "@parcel/watcher-linux-arm64-glibc": "2.6.0", + "@parcel/watcher-linux-arm64-musl": "2.6.0", + "@parcel/watcher-linux-x64-glibc": "2.6.0", + "@parcel/watcher-linux-x64-musl": "2.6.0", + "@parcel/watcher-win32-arm64": "2.6.0", + "@parcel/watcher-win32-x64": "2.6.0" } }, "node_modules/@parcel/watcher-android-arm64": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.6.tgz", - "integrity": "sha512-YQxSS34tPF/6ZG7r/Ih9xy+kP/WwediEUsqmtf0cuCV5TPPKw/PQHRhueUo6JdeFJaqV3pyjm0GdYjZotbRt/A==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.6.0.tgz", + "integrity": "sha512-trgpLSCKRC/huFjXX/Smh+0sWe4+YtKfktIToiMl59ghz7z+qkH6kMvNnUbLyRs9N11t8l4svSCs1+5B3rOAhA==", "cpu": [ "arm64" ], @@ -2592,9 +2538,9 @@ } }, "node_modules/@parcel/watcher-darwin-arm64": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.6.tgz", - "integrity": "sha512-Z2ZdrnwyXvvvdtRHLmM4knydIdU9adO3D4n/0cVipF3rRiwP+3/sfzpAwA/qKFL6i1ModaabkU7IbpeMBgiVEA==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.6.0.tgz", + "integrity": "sha512-Y3QV0gl7Q1zbfueunkWIERICbEojQFCgpyG7YqOGNFLsckXyI1xu9mAIUpKY9QBYzBtSkN8dBPwd3yiAO9ovMw==", "cpu": [ "arm64" ], @@ -2613,9 +2559,9 @@ } }, "node_modules/@parcel/watcher-darwin-x64": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.6.tgz", - "integrity": "sha512-HgvOf3W9dhithcwOWX9uDZyn1lW9R+7tPZ4sug+NGrGIo4Rk1hAXLEbcH1TQSqxts0NYXXlOWqVpvS1SFS4fRg==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.6.0.tgz", + "integrity": "sha512-Ohv6OpzhUfKYD7Beb8kDvG0jbIxORCYY1JRdZnaBtnjjkJxgD7ZVL0nw2sCYd0yTMKTvz3nnTnOF3cDifK+kvw==", "cpu": [ "x64" ], @@ -2634,9 +2580,9 @@ } }, "node_modules/@parcel/watcher-freebsd-x64": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.6.tgz", - "integrity": "sha512-vJVi8yd/qzJxEKHkeemh7w3YAn6RJCtYlE4HPMoVnCpIXEzSrxErBW5SJBgKLbXU3WdIpkjBTeUNtyBVn8TRng==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.6.0.tgz", + "integrity": "sha512-5HmXvDgs8VK+74jF9y9/2FE3/OnlcKmc56tjmSrEuZjpSZOGL+fvAu+HKJBdPs9uwoP2hE6TlSUpXZ/C5jUFmQ==", "cpu": [ "x64" ], @@ -2655,13 +2601,16 @@ } }, "node_modules/@parcel/watcher-linux-arm-glibc": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.6.tgz", - "integrity": "sha512-9JiYfB6h6BgV50CCfasfLf/uvOcJskMSwcdH1PHH9rvS1IrNy8zad6IUVPVUfmXr+u+Km9IxcfMLzgdOudz9EQ==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.6.0.tgz", + "integrity": "sha512-Ps/hui3A+vMbjdqlqAowK2ZL8+BO8dBjxeWXj6npTBs3jx4wWmbPpaLuqwrQrSqIVMCnpWo238bJ1U37GhQOYg==", "cpu": [ "arm" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -2676,13 +2625,16 @@ } }, "node_modules/@parcel/watcher-linux-arm-musl": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.6.tgz", - "integrity": "sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.6.0.tgz", + "integrity": "sha512-9c6AUHgHoG+IY88MRIHupztQiQnrbqHYQjkM2btA+Bf/wQnQMuiD0Wfk1EVv3TlNT3x41uU71rn6E4xh/+zvkw==", "cpu": [ "arm" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -2697,13 +2649,16 @@ } }, "node_modules/@parcel/watcher-linux-arm64-glibc": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.6.tgz", - "integrity": "sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.6.0.tgz", + "integrity": "sha512-yHRqS2owEXe6Hic9z6Mh1ECsCd+ODVOGvZDyciqRd21+v+o+DnXMOrw50DSpIG2sb8GPEaPPmfeCAWKPJdq46g==", "cpu": [ "arm64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -2718,13 +2673,16 @@ } }, "node_modules/@parcel/watcher-linux-arm64-musl": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.6.tgz", - "integrity": "sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.6.0.tgz", + "integrity": "sha512-WhB2e/V7rqdHHWZusBSPuy5Ei8S6lSz6FE5TKKQz5h3a0O+C+mhY7vxU9b/stqvMb8beLnPY82ZrFTLKs+SrKA==", "cpu": [ "arm64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -2739,13 +2697,16 @@ } }, "node_modules/@parcel/watcher-linux-x64-glibc": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.6.tgz", - "integrity": "sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.6.0.tgz", + "integrity": "sha512-ulGE6x6Oz6iAwg75T8YQSoguBWasniIbX+QWpaYPcCnDOpdWX3k+4xbEYPZVLxOuoJI+svJJPD3sEj8G7lrQ3A==", "cpu": [ "x64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -2760,13 +2721,16 @@ } }, "node_modules/@parcel/watcher-linux-x64-musl": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.6.tgz", - "integrity": "sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.6.0.tgz", + "integrity": "sha512-tkBYKt7YQrjIJWYDnto2YgO8MRkjlMTSNoRHzsXinBqbLdeOM3L32wPZJvIZxqaLMfSlS/4sUjH/6STVP/XDLw==", "cpu": [ "x64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -2781,9 +2745,9 @@ } }, "node_modules/@parcel/watcher-win32-arm64": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.6.tgz", - "integrity": "sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.6.0.tgz", + "integrity": "sha512-gIZAP23jaHjGWasY/TY6yL7NHFClf0Ga7FN+iINvk+KN94rhm94lYZhFsbYFNcA04/onvGD9kKmiJLJB2HbNwQ==", "cpu": [ "arm64" ], @@ -2801,31 +2765,10 @@ "url": "https://opencollective.com/parcel" } }, - "node_modules/@parcel/watcher-win32-ia32": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.6.tgz", - "integrity": "sha512-k35yLp1ZMwwee3Ez/pxBi5cf4AoBKYXj00CZ80jUz5h8prpiaQsiRPKQMxoLstNuqe2vR4RNPEAEcjEFzhEz/g==", - "cpu": [ - "ia32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, "node_modules/@parcel/watcher-win32-x64": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.6.tgz", - "integrity": "sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.6.0.tgz", + "integrity": "sha512-cA+/pXV2YkfxlIcXOQ5fSWqAzzPyD78/x5qbK/I0vUkrlYHA8TIz+MXjAbGouguKVSI4bOmkTSJ1/poVSsgt+A==", "cpu": [ "x64" ], @@ -2844,9 +2787,9 @@ } }, "node_modules/@parcel/watcher/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz", + "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==", "dev": true, "license": "MIT", "engines": { @@ -2936,10 +2879,27 @@ "react": ">=16.14.0" } }, + "node_modules/@rolldown/binding-android-arm-eabi": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.8.tgz", + "integrity": "sha512-tN5aztYkKCte4i5SIrrz5yK/HMjEuCqCSCJa418jOV8tZ1cBY3YF2otxB1ktPxzsLA1BeTqwapK0bfjxNvHJVw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, "node_modules/@rolldown/binding-android-arm64": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.1.5.tgz", - "integrity": "sha512-lZg8fqIv2v7FF237bwMgzGZEJvGL79/s5knJ/i6FmsGF4XXlzccZ4jb+TrFIxtSSxFtIpdsgrPZeMk1I9AFcyQ==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.8.tgz", + "integrity": "sha512-dIYTWl9XprMUiQFoc55KUyk/oS8SKYH3zFl0LTR7RT0Xj4hgSVyuJcroH8JUu8RcpF8fTB6E0aOwCkZoYPcDSQ==", "cpu": [ "arm64" ], @@ -2954,9 +2914,9 @@ } }, "node_modules/@rolldown/binding-darwin-arm64": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.1.5.tgz", - "integrity": "sha512-51Bnx9pNiMRKSUNtBfySkNJ9vMU9Hh3I1ozDd6gyPPYzaXCfnptUcEZxXGYFn+ul2dtcMUiqGR1Yai2K10uoTw==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.8.tgz", + "integrity": "sha512-PCSDQGXD2IyTEFrcgPyBM8jJuGmrbCMuoIOXdbEGVemruKACXoLQJrb+A45Z0L5t1RQkdfJprAYPkikbh7dzdA==", "cpu": [ "arm64" ], @@ -2971,9 +2931,9 @@ } }, "node_modules/@rolldown/binding-darwin-x64": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.1.5.tgz", - "integrity": "sha512-Tm+gbfC0aHu1tBA/JvKQh32S0K6YgCHkiAF4/W6xX0K0RmNuc94VeK419dJoE65R5aRxmo+noZQSWrAMF6yb6g==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.8.tgz", + "integrity": "sha512-Uk7lRsGhPFHVX/sAUC6D5H9Ol30dFHd6iquokll2th3LpdJ3F5CzQB+7DHn0Ri2mG+U7k2zXiPHDrwZenXhwSA==", "cpu": [ "x64" ], @@ -2988,9 +2948,9 @@ } }, "node_modules/@rolldown/binding-freebsd-x64": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.1.5.tgz", - "integrity": "sha512-JMzDKCCXq93YccG5gz3hvOs1oXRKAf0XYpfOS88e+wZrC8Iugj6j68867vrYZkvpDDpKn/KoKORThmchMpF6TA==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.8.tgz", + "integrity": "sha512-DjszaTEVogPqA5bYzsEeqDCQxbcp2fexQwKcRspYji2yzR68fCf+e4fx6kBSRDwX5/brZaHw/hWS9+A/+/w9sQ==", "cpu": [ "x64" ], @@ -3005,9 +2965,9 @@ } }, "node_modules/@rolldown/binding-linux-arm-gnueabihf": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.1.5.tgz", - "integrity": "sha512-uML21j2K5TfPGutKxub+M+nLjZIrWjXQ5Grx4lCe/nimTj9B4L63zHpjXLl4y0L3mcm2htEQIb06oCG/szerNw==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.8.tgz", + "integrity": "sha512-zmwa7FTmdzB6aaEEuuls18H6Ap5JmJPSoPTuXixeJZV6tG40SyLkApQtz1g8ptZtiEKqj9OM0oNLPh1AgvE31Q==", "cpu": [ "arm" ], @@ -3022,13 +2982,16 @@ } }, "node_modules/@rolldown/binding-linux-arm64-gnu": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.1.5.tgz", - "integrity": "sha512-navSiuTMogvnQoZoM/v+l3ZWo50/NTwSHSzheABx/RCnmUPaKwq9qSo4Br2OYRs21+Fz8uFqITZM3H4opOB0/Q==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.8.tgz", + "integrity": "sha512-KdYQDPHwJVnbFwdTGMgxsI9SqblBlz6STGM+w1We/d5B8OWWidYH0MwkU/uA1wM5fIpO2MkOVxXrNzzuZhw9ew==", "cpu": [ "arm64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -3039,13 +3002,16 @@ } }, "node_modules/@rolldown/binding-linux-arm64-musl": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.1.5.tgz", - "integrity": "sha512-lAryqH7IteztmCXQXk0etKj4wBQ7Gx5S6LjKhsgp9zb8I5bsuvU/2llH1hDQcjsFeqIsovMVN339/8pUDDBXxA==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.8.tgz", + "integrity": "sha512-jFJTifHnNPY+yzOoNZQfSIysrVyXzEQPhPnOUjmD1bcQGHH6s7c8cViKWar8YplQImE5N9JRqMCLrM2CdxOrZA==", "cpu": [ "arm64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -3056,13 +3022,16 @@ } }, "node_modules/@rolldown/binding-linux-ppc64-gnu": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.1.5.tgz", - "integrity": "sha512-fsK/sNBnxzBlL4O1JNrZakVQxPspqpED5dLtNsZS9oOKmtSpdNIzxH2kkol5HYTWJN47sE20ztMJPxfZ89qGOg==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.8.tgz", + "integrity": "sha512-FhiOziBDWPBjbcmRzfLyIJnaP7AVMFXT7YCXPjXxj7wKU3vx24RjrCNN/zjvVa+N2vVoHJwCoUBvsrN/DG3zIA==", "cpu": [ "ppc64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -3073,13 +3042,16 @@ } }, "node_modules/@rolldown/binding-linux-s390x-gnu": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.1.5.tgz", - "integrity": "sha512-gLYb4BIadlfTOYT5gO503n8zQjXflgzpD0FcyKh0Mzx3rqCZKnHoJWV9xe1KXUJ5lx2JfcSHr/mhzS0PC/McAA==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.8.tgz", + "integrity": "sha512-WnHfADMzOV2Y55wlx1hzzQnar/wDt/VdvWSD99r18Mz9ylNieIGOkRx3UV21h7m/eJvjySYJkO26VvGNFkwsIQ==", "cpu": [ "s390x" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -3090,13 +3062,16 @@ } }, "node_modules/@rolldown/binding-linux-x64-gnu": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.1.5.tgz", - "integrity": "sha512-FjcpEKUyJygHgs1o50VYNvkt5+7Le/VEdYt0AkRpkL33MnyQfwr8l5mXwMmfmTbyMPr5vJLC+8/Gd9gXnwU1QQ==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.8.tgz", + "integrity": "sha512-H9tRr5ibfXFVLxbPOseVewewFpl28zcEdjRDt2FTUZU7odxP0gEv1ki4/kGmcGOh78oRwZuuQllGLZ9zTJp84g==", "cpu": [ "x64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -3107,13 +3082,16 @@ } }, "node_modules/@rolldown/binding-linux-x64-musl": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.1.5.tgz", - "integrity": "sha512-Me+PfPI2TMeOQk0gYWfLQZtTktrmzbr8cDboqX83XKc7UrgAi55gF+2dUkWdxd19n55Essp2yeca+O9N5rBxHg==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.8.tgz", + "integrity": "sha512-UefiqfM3D6IVNlZ8tSGs9+Ejjud2T+oxO0IHADU45Y+lyEjD2dVFyZHbkfX0LUb5Zugo/oIv1eCO/KVYhgYJYA==", "cpu": [ "x64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -3124,9 +3102,9 @@ } }, "node_modules/@rolldown/binding-openharmony-arm64": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.1.5.tgz", - "integrity": "sha512-yc5WrLzXks6zCQfn9Oxr8pORKyl/pF+QjHmW/Qx3qu0oyrrNC+y2JLTU1E2rcWYAmzlnqngWXHQjy51VzW70Vw==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.8.tgz", + "integrity": "sha512-637Ke4kWSy6rp9cxQ9gMOXlxPgIw/c1beASV4M//3+9I4uwBVOOl74G+e3zyU3u19U7RkRl/HuewixZ/Z6+Rjg==", "cpu": [ "arm64" ], @@ -3140,29 +3118,10 @@ "node": "^20.19.0 || >=22.12.0" } }, - "node_modules/@rolldown/binding-wasm32-wasi": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.1.5.tgz", - "integrity": "sha512-VbQGPX2b4r48TAMIM2cjgluIM1HYutm4pcTEJsle7iEP7sB1dFqtPLBVbdLAZCxy1txCcPxf4QFf4v8uvltPqA==", - "cpu": [ - "wasm32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "@emnapi/core": "1.11.1", - "@emnapi/runtime": "1.11.1", - "@napi-rs/wasm-runtime": "^1.1.6" - }, - "engines": { - "node": "^20.19.0 || >=22.12.0" - } - }, "node_modules/@rolldown/binding-win32-arm64-msvc": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.1.5.tgz", - "integrity": "sha512-gHv82k63z4qpV5+Q1y/12KrK0ltWBukVDI8nZcbT7Tt/ZlOIVwppazneq0F93oDxTo3IgAMEDIoQh3E2n6mVsw==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.8.tgz", + "integrity": "sha512-xWBkPOF1Q9k/Gv1nQXnVdLxKu74jXppuOM4Z3mnypVUJJJwLsMl7hNJGRAUJoG8A5MgOI1ACKM+wBFxSJzKy4A==", "cpu": [ "arm64" ], @@ -3177,9 +3136,9 @@ } }, "node_modules/@rolldown/binding-win32-x64-msvc": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.1.5.tgz", - "integrity": "sha512-tTZuDBPw85tEN5PQi1pnEBzDy0Z49HtScLAbD5t6hyeU92A95pRWaSMw1GZZi/RwgSgUIl0xrSlXIT/9QzvYSA==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.8.tgz", + "integrity": "sha512-uz2ZvfgXbxqNwijjjbxrnvALwpyODDcgc1T1N8N3rf/DXKQmaFwmB4LX4yyjggpwN2obdQLb2rgirX5ffCWYng==", "cpu": [ "x64" ], @@ -3235,9 +3194,9 @@ } }, "node_modules/@testing-library/react": { - "version": "16.3.2", - "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.3.2.tgz", - "integrity": "sha512-XU5/SytQM+ykqMnAnvB2umaJNIOsLF3PVv//1Ew4CTcpz0/BRyy/af40qqrt7SjKpDdT1saBMc42CUok5gaw+g==", + "version": "16.3.3", + "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.3.3.tgz", + "integrity": "sha512-Uo193NgQbPMz6lrrhtRQQFcMC6Re/ELLFbbuVL30WDlZxlpZf9/lMHTAVxPRLw1q1iu9OJmR1c2BLiENRstdBg==", "dev": true, "license": "MIT", "dependencies": { @@ -3262,17 +3221,6 @@ } } }, - "node_modules/@tybys/wasm-util": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.3.tgz", - "integrity": "sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "tslib": "^2.4.0" - } - }, "node_modules/@types/aria-query": { "version": "5.0.4", "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz", @@ -3344,22 +3292,22 @@ "integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==" }, "node_modules/@types/react": { - "version": "19.2.17", - "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.17.tgz", - "integrity": "sha512-MXfmqaVPEVgkBT/aY0aGCkRWWtByiYQXo3xdQ8r5RzuFrPiRn8Gar2tQdXSUQ2GKV3bkXckek89V8wQBY2Q/Aw==", + "version": "19.3.0", + "resolved": "https://registry.npmjs.org/@types/react/-/react-19.3.0.tgz", + "integrity": "sha512-N0rFCuH9YoxG9/m61l9MfpJKfmLOVU0em7ipIz6TRgSSkvReLB9vL85GB+yr8Bs5leqpvg96JSwF4ZS1s4viQg==", "license": "MIT", "dependencies": { "csstype": "^3.2.2" } }, "node_modules/@types/react-dom": { - "version": "19.2.3", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.2.3.tgz", - "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==", + "version": "19.3.0", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.3.0.tgz", + "integrity": "sha512-ZI7bU42mZXXKHn/qNLEw2IrbiINU7X5+vfgdixBHkCNpYWXjKgfQ/P+uyGb5CjOLB9UcnTeg3rylQtV2hym44Q==", "dev": true, "license": "MIT", "peerDependencies": { - "@types/react": "^19.2.0" + "@types/react": "^19.3.0" } }, "node_modules/@types/react-transition-group": { @@ -3385,17 +3333,17 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.64.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.64.0.tgz", - "integrity": "sha512-CGvQPBxN3wZLu6Rz2kFUpZeoCm78xUic92ck39KPePkO1NPOwjCqdQnm5Q87tpWw9vcBvW8XLrDXjH9PWYtJ3Q==", + "version": "8.70.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.70.0.tgz", + "integrity": "sha512-/v8HZt6RlyIZxB3ntehELOcUcfxKPVGWXnQdJuHRmzrqgF8nQypcC/oxGW+Ot4VGKDq81XugPKxx0n5PBtf9PA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.12.2", - "@typescript-eslint/scope-manager": "8.64.0", - "@typescript-eslint/type-utils": "8.64.0", - "@typescript-eslint/utils": "8.64.0", - "@typescript-eslint/visitor-keys": "8.64.0", + "@typescript-eslint/scope-manager": "8.70.0", + "@typescript-eslint/type-utils": "8.70.0", + "@typescript-eslint/utils": "8.70.0", + "@typescript-eslint/visitor-keys": "8.70.0", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.5.0" @@ -3408,7 +3356,7 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.64.0", + "@typescript-eslint/parser": "^8.70.0", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } @@ -3424,16 +3372,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.64.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.64.0.tgz", - "integrity": "sha512-KA0OshtlcCCXmbfqyZkM5pV3/WNraJf7DkJRLpyrmwPtud57H5BDX7C3k0LPSPxpprfRL+cJDGabF10mvNCoCw==", + "version": "8.70.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.70.0.tgz", + "integrity": "sha512-zYvrmj9Yxd63UGaXw+kdt6A0F0s0qveJyuatIM77bYC2DE4pgmg7a50u8LR7PRtXd0x+h+Tl3eXabGm06SWd3Q==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.64.0", - "@typescript-eslint/types": "8.64.0", - "@typescript-eslint/typescript-estree": "8.64.0", - "@typescript-eslint/visitor-keys": "8.64.0", + "@typescript-eslint/scope-manager": "8.70.0", + "@typescript-eslint/types": "8.70.0", + "@typescript-eslint/typescript-estree": "8.70.0", + "@typescript-eslint/visitor-keys": "8.70.0", "debug": "^4.4.3" }, "engines": { @@ -3449,14 +3397,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.64.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.64.0.tgz", - "integrity": "sha512-tk4WpOJ6IEbGrVHaNmM0YRrwAD3exZlIK3iadQNAxh4YKk6jvUQ4ecq18n+v7+meh+cJ3j+D8nbk8sRKhlwLQg==", + "version": "8.70.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.70.0.tgz", + "integrity": "sha512-hFHbTNqhU9G+2eKFXCBVb1tjFT/LceiJ4+HfLO4pTpDI0KHi6iajpcFFkaSQ9gXmCh7n82A0PthaayEdN6mspQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.64.0", - "@typescript-eslint/types": "^8.64.0", + "@typescript-eslint/tsconfig-utils": "^8.70.0", + "@typescript-eslint/types": "^8.70.0", "debug": "^4.4.3" }, "engines": { @@ -3471,14 +3419,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.64.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.64.0.tgz", - "integrity": "sha512-CXEaFdYXjSTgKhisNkwCcJwTP8Pl+fmRrEQrri4nm3vU743bALrxzLmq7fHG/7e6a5xO0lDYeURpZmBuhHk54w==", + "version": "8.70.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.70.0.tgz", + "integrity": "sha512-8nP3Kwh5hlgZ4FicGvmznAmJe8UL4sdU8tLukrPaMuQmDuk4Y8xYfzu/aYZW4xT2JCgc7H/TpDI5cGlxcWJSqQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.64.0", - "@typescript-eslint/visitor-keys": "8.64.0" + "@typescript-eslint/types": "8.70.0", + "@typescript-eslint/visitor-keys": "8.70.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3489,9 +3437,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.64.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.64.0.tgz", - "integrity": "sha512-2yo8rRNKuzbVWQp5kslhANqZ2uDAeROQHBRZNPu8JDsHmeFNj/XJJhX/FhNUWmkHHvoNsKa6+tHJiig87EzsQw==", + "version": "8.70.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.70.0.tgz", + "integrity": "sha512-adnkeeNq9Sq1sUf4+FRVc0KdgYghzsgFpZSQVZVvY0LCuUuN0FnQgyGzCJeC4fW1cdXseBAjU2EOqUIjbNcZUw==", "dev": true, "license": "MIT", "engines": { @@ -3506,15 +3454,15 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.64.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.64.0.tgz", - "integrity": "sha512-XWG4Fmmv/6SvyS9nH8jWrKs6terwJvE8cyRt1CzYYqzp9OrPhCT4cMc/f7C6RZCwG+qMmiffJS1/qJP8G1URtg==", + "version": "8.70.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.70.0.tgz", + "integrity": "sha512-NUMKIhYVaVIVLnRL9CRt+VVcuLgSHUCpXn4/+K8wql+vdInUzvx8BjUO1oJ7cG9shjFJKtF8F8Hh2kCh3/KBVw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.64.0", - "@typescript-eslint/typescript-estree": "8.64.0", - "@typescript-eslint/utils": "8.64.0", + "@typescript-eslint/types": "8.70.0", + "@typescript-eslint/typescript-estree": "8.70.0", + "@typescript-eslint/utils": "8.70.0", "debug": "^4.4.3", "ts-api-utils": "^2.5.0" }, @@ -3531,9 +3479,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.64.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.64.0.tgz", - "integrity": "sha512-qjhfuTfLXjA4IOzXvz0rTjT01BqEiIgPoUeMwiEjnaHKJMTNo8rH5pYW1a2L/0Dnux2fPC85AeyJoWaGa8WxTA==", + "version": "8.70.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.70.0.tgz", + "integrity": "sha512-asTOIYhDg4zdzOScCyaytrsV3cR6B4ecPQlXw/dJIm7J/MZTtCtfVII9JD8Geh4jTCrK/Xe6cg5UevoleMcoJQ==", "dev": true, "license": "MIT", "engines": { @@ -3545,16 +3493,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.64.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.64.0.tgz", - "integrity": "sha512-Pztpsn1aCE1oWDvDEfUk31nngvvF7vUB5SwHFEaZIFpvw7WJtqUHHL4plBZDA9HfWJJjL13BdG0YrJInTUvoVA==", + "version": "8.70.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.70.0.tgz", + "integrity": "sha512-d9NmHMPEKQ7QCLLm1jI3zmoQBwT5KwFYjXBJ9ymZfKCUU+5rmTRykKAFvH5Qn/ZCds3CEAFS9OC9M/jkl0X2bA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.64.0", - "@typescript-eslint/tsconfig-utils": "8.64.0", - "@typescript-eslint/types": "8.64.0", - "@typescript-eslint/visitor-keys": "8.64.0", + "@typescript-eslint/project-service": "8.70.0", + "@typescript-eslint/tsconfig-utils": "8.70.0", + "@typescript-eslint/types": "8.70.0", + "@typescript-eslint/visitor-keys": "8.70.0", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", @@ -3583,26 +3531,26 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { - "version": "5.0.7", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.7.tgz", - "integrity": "sha512-7oFy703dxfY3/NLxC1fh2SUCQ0H9rmAY+5EpDVfXjUTTs+HEwR2nYaqLv+GWcTsumwxPfiz6CzCNkwXwBUwqCA==", + "version": "5.0.9", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.9.tgz", + "integrity": "sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==", "dev": true, "license": "MIT", "dependencies": { "balanced-match": "^4.0.2" }, "engines": { - "node": "18 || 20 || >=22" + "node": "20 || >=22" } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { - "version": "10.2.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz", - "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==", + "version": "10.2.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz", + "integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { - "brace-expansion": "^5.0.5" + "brace-expansion": "^5.0.8" }, "engines": { "node": "18 || 20 || >=22" @@ -3625,16 +3573,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.64.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.64.0.tgz", - "integrity": "sha512-aJUGVB3+U0htrrCjoA8qukw8cm8fNCGAxK/tVoS70k8aeb7DETKeFozRiVFIwEeN9WJLsjaP3ph8I60tY2XZoQ==", + "version": "8.70.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.70.0.tgz", + "integrity": "sha512-oZmtKJz/4fufZ2p3+Cn3ijEojcdfR+1zYDH2xKYrEly0dR/Q/1xUPRCOlKGxod78nWlU2UnDe09GZ3TaknBFGA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", - "@typescript-eslint/scope-manager": "8.64.0", - "@typescript-eslint/types": "8.64.0", - "@typescript-eslint/typescript-estree": "8.64.0" + "@typescript-eslint/scope-manager": "8.70.0", + "@typescript-eslint/types": "8.70.0", + "@typescript-eslint/typescript-estree": "8.70.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3649,13 +3597,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.64.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.64.0.tgz", - "integrity": "sha512-mrtuL8Nsn6gi2H4mo5KMTp823M+3Q19Ew/i+Zlikq20tIMm99C3Ez0dCmkWWnxut20esQvTg8aUSEhMcAOXhEw==", + "version": "8.70.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.70.0.tgz", + "integrity": "sha512-BoC8PiO4Hkdo0TVJh9Ntxr5MxPDI7/oFsrygN5ADelFSeXG/qgNuucIGA+L5Z6JpPTE/uRfcTWtscjbUaufepQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.64.0", + "@typescript-eslint/types": "8.70.0", "eslint-visitor-keys": "^5.0.0" }, "engines": { @@ -3680,9 +3628,9 @@ } }, "node_modules/@vis.gl/react-mapbox": { - "version": "8.1.2", - "resolved": "https://registry.npmjs.org/@vis.gl/react-mapbox/-/react-mapbox-8.1.2.tgz", - "integrity": "sha512-g/TbFYympMg+TMS+ctASbcgIxEJRnYL7+VyCo2rI6dpG7dUP4wNOOAUxO8og6OH6QwavaQVYSHcY4mfQL7Ixbw==", + "version": "8.1.3", + "resolved": "https://registry.npmjs.org/@vis.gl/react-mapbox/-/react-mapbox-8.1.3.tgz", + "integrity": "sha512-96sCSl8BKoTLn2xMWlkjlR9GA5URM2t5Ln386t8pNVsoINsUXxweyuJ+gJlDe0GgAIOttXreU/1fK9AfrD28NA==", "license": "MIT", "peerDependencies": { "mapbox-gl": ">=3.5.0", @@ -3696,9 +3644,9 @@ } }, "node_modules/@vis.gl/react-maplibre": { - "version": "8.1.2", - "resolved": "https://registry.npmjs.org/@vis.gl/react-maplibre/-/react-maplibre-8.1.2.tgz", - "integrity": "sha512-cjghAMHSJLO3sJ7N6iHJRG+n0l30LtiZ0TNND+HYhHgZDd8UMdNHwcnqQ7Ku0guY3lZ4Rw4LvMqpJYKcqbX39A==", + "version": "8.1.3", + "resolved": "https://registry.npmjs.org/@vis.gl/react-maplibre/-/react-maplibre-8.1.3.tgz", + "integrity": "sha512-5Ntvp8YP94SBRaJXLolw6Q57CtrPdWYxdCIo+JeI63hM9BPEJ1efLcPgfSAAUhzXanDeorTE91GsZAgoXbnB3g==", "license": "MIT", "dependencies": { "@maplibre/maplibre-gl-style-spec": "^19.2.1" @@ -3740,9 +3688,9 @@ "license": "MIT" }, "node_modules/@vitejs/plugin-react": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-6.0.3.tgz", - "integrity": "sha512-vmFvco5/QuC2f9Oj+wTk0+9XeDFkHxSamwZKYc7MxYwKICfvUvlMhqKI0VuICPltGqh1neqBKDvO4kes1ya8vg==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-6.1.1.tgz", + "integrity": "sha512-yxLaQV9gkhS8ezJqCM6+ndU7mDY6gqAg75NQ+0IjwEI8IYOmQCgkRwHKVSfWXW076DsqMo0Dk+0FK1U+M5RgFw==", "dev": true, "license": "MIT", "dependencies": { @@ -3754,6 +3702,7 @@ "peerDependencies": { "@rolldown/plugin-babel": "^0.1.7 || ^0.2.0", "babel-plugin-react-compiler": "^1.0.0", + "oxc-transform-react": "^0.145.0", "vite": "^8.0.0" }, "peerDependenciesMeta": { @@ -3762,6 +3711,9 @@ }, "babel-plugin-react-compiler": { "optional": true + }, + "oxc-transform-react": { + "optional": true } } }, @@ -4332,10 +4284,9 @@ } }, "node_modules/bidi-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/bidi-js/-/bidi-js-1.0.3.tgz", - "integrity": "sha512-RKshQI1R3YQ+n9YJz2QQ147P66ELpa1FQEg20Dk8oW9t2KgLbpDLLp9aGZ7y8WHSshDknG0bknqGw5/tyCs5tw==", - "dev": true, + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/bidi-js/-/bidi-js-1.1.0.tgz", + "integrity": "sha512-fX1Onk0tdVPC7obPWB5EbJ1z7NVhLq4m2xZLq2YXBkxzMXIGRpNMU88n0EPgWseKl12J7zXs7qrDxPK4sRs2fg==", "license": "MIT", "dependencies": { "require-from-string": "^2.0.2" @@ -5630,9 +5581,9 @@ } }, "node_modules/eslint-plugin-react-refresh": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.5.3.tgz", - "integrity": "sha512-5EMmLCV98Pi4o/f/3DP/v/tNqLHMIc9I8LKClNDWhZ9JTho89/kQcitCXQBMG7sAfVRK0Ie3T2EDOzp1YXYiVA==", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.5.6.tgz", + "integrity": "sha512-uZnh24On2bk478AkaDAKcpRiYhS3qFSaSNvpXxV6/Ek/BBDICkWGG7MnBSfjnIlCVBei5vsLlIeQYxbF22+Udg==", "dev": true, "license": "MIT", "peerDependencies": { @@ -6126,9 +6077,9 @@ } }, "node_modules/globals": { - "version": "17.7.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-17.7.0.tgz", - "integrity": "sha512-Czmyns5dUsq4seFBR/Kdydhmo8y9kC79hiSkPn0YcGtNnYWnrgt0vjrSjx9tspoDGWm2CMarffRuLjM4xUz8xg==", + "version": "17.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-17.12.0.tgz", + "integrity": "sha512-cezEd/DTyyht9cvSSURyygXPfy04GtWO/5e6ZPvH7fCtjKz9PYOmuawphw1Ctd1f6C+5JypXfGD7ahNMXvevBA==", "dev": true, "license": "MIT", "engines": { @@ -7332,9 +7283,9 @@ } }, "node_modules/lightningcss": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz", - "integrity": "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.33.0.tgz", + "integrity": "sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==", "dev": true, "license": "MPL-2.0", "dependencies": { @@ -7348,23 +7299,23 @@ "url": "https://opencollective.com/parcel" }, "optionalDependencies": { - "lightningcss-android-arm64": "1.32.0", - "lightningcss-darwin-arm64": "1.32.0", - "lightningcss-darwin-x64": "1.32.0", - "lightningcss-freebsd-x64": "1.32.0", - "lightningcss-linux-arm-gnueabihf": "1.32.0", - "lightningcss-linux-arm64-gnu": "1.32.0", - "lightningcss-linux-arm64-musl": "1.32.0", - "lightningcss-linux-x64-gnu": "1.32.0", - "lightningcss-linux-x64-musl": "1.32.0", - "lightningcss-win32-arm64-msvc": "1.32.0", - "lightningcss-win32-x64-msvc": "1.32.0" + "lightningcss-android-arm64": "1.33.0", + "lightningcss-darwin-arm64": "1.33.0", + "lightningcss-darwin-x64": "1.33.0", + "lightningcss-freebsd-x64": "1.33.0", + "lightningcss-linux-arm-gnueabihf": "1.33.0", + "lightningcss-linux-arm64-gnu": "1.33.0", + "lightningcss-linux-arm64-musl": "1.33.0", + "lightningcss-linux-x64-gnu": "1.33.0", + "lightningcss-linux-x64-musl": "1.33.0", + "lightningcss-win32-arm64-msvc": "1.33.0", + "lightningcss-win32-x64-msvc": "1.33.0" } }, "node_modules/lightningcss-android-arm64": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.32.0.tgz", - "integrity": "sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.33.0.tgz", + "integrity": "sha512-gEpRTalKdosp4Bb8qWtc2iOgE5SeIHlpS1up9bFq2wAyYhl1UdTObYiHe98zEM9SQvSoqQZ1IQD0JNpg3Ml5pg==", "cpu": [ "arm64" ], @@ -7383,9 +7334,9 @@ } }, "node_modules/lightningcss-darwin-arm64": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.32.0.tgz", - "integrity": "sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.33.0.tgz", + "integrity": "sha512-Sciaz8eenNTKn9b3t7+xr0ipTp9YxKQY4npwQ3mrRuL0BAVHBLyZxofhaKBAVtzmtRZ/zTyo0/to4B1uWG/Djg==", "cpu": [ "arm64" ], @@ -7404,9 +7355,9 @@ } }, "node_modules/lightningcss-darwin-x64": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.32.0.tgz", - "integrity": "sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.33.0.tgz", + "integrity": "sha512-Z5UPAxzrjlWNNyGy6i65cJzzvgJ5D3T6wMvs+gWpY9d7qRhANrxqAp6LhxIgZhWEw18RfJTGcRxjuLIBr+m8XQ==", "cpu": [ "x64" ], @@ -7425,9 +7376,9 @@ } }, "node_modules/lightningcss-freebsd-x64": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.32.0.tgz", - "integrity": "sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.33.0.tgz", + "integrity": "sha512-QQM/Ti/hQajJwCY+RiWuCZ9sdtI/XQk7nDK5vC8kkdwixezOlDgvDx7+RT+QjK6FcFT4MpsuoBnHIo/O3StRRg==", "cpu": [ "x64" ], @@ -7446,9 +7397,9 @@ } }, "node_modules/lightningcss-linux-arm-gnueabihf": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.32.0.tgz", - "integrity": "sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.33.0.tgz", + "integrity": "sha512-N7FVBe6iS24MlM6R/4RBTxGhQheZGs7tiQ9U32UtF75NzP5Q7xWPRqLBCKxlRQRk3rY1jCIPLzx7WzOhuUIRLQ==", "cpu": [ "arm" ], @@ -7467,13 +7418,16 @@ } }, "node_modules/lightningcss-linux-arm64-gnu": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.32.0.tgz", - "integrity": "sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.33.0.tgz", + "integrity": "sha512-j2v/itmy4HlNxlc6voKXYgBqNi0Ng2LShg4z7GufpEgs05P+2suBVyi9I6YHq5uoVFx9ETin3eCEhLVyXGQnKg==", "cpu": [ "arm64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MPL-2.0", "optional": true, "os": [ @@ -7488,13 +7442,16 @@ } }, "node_modules/lightningcss-linux-arm64-musl": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.32.0.tgz", - "integrity": "sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.33.0.tgz", + "integrity": "sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==", "cpu": [ "arm64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MPL-2.0", "optional": true, "os": [ @@ -7509,13 +7466,16 @@ } }, "node_modules/lightningcss-linux-x64-gnu": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.32.0.tgz", - "integrity": "sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.33.0.tgz", + "integrity": "sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg==", "cpu": [ "x64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MPL-2.0", "optional": true, "os": [ @@ -7530,13 +7490,16 @@ } }, "node_modules/lightningcss-linux-x64-musl": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.32.0.tgz", - "integrity": "sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.33.0.tgz", + "integrity": "sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==", "cpu": [ "x64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MPL-2.0", "optional": true, "os": [ @@ -7551,9 +7514,9 @@ } }, "node_modules/lightningcss-win32-arm64-msvc": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.32.0.tgz", - "integrity": "sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.33.0.tgz", + "integrity": "sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==", "cpu": [ "arm64" ], @@ -7572,9 +7535,9 @@ } }, "node_modules/lightningcss-win32-x64-msvc": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.32.0.tgz", - "integrity": "sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.33.0.tgz", + "integrity": "sha512-OlEICDx/Xl0FqSp4bry8zFnCvGpig3Gl4gCquvYwHuqJKEC1+n9NgDniFvqHGmMv1ZkqDJrDqKKSykTDX+ehuA==", "cpu": [ "x64" ], @@ -8037,9 +8000,9 @@ } }, "node_modules/maplibre-gl": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-6.4.1.tgz", - "integrity": "sha512-KzxQKtfBu/pSz1C+yW1hNS9eyj2h2lC7ufdAi6/SEt177n3oAfDfmUmslRfJdXY7ReAFBcnvwsqmiyoDhtA9GQ==", + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-6.9.0.tgz", + "integrity": "sha512-vFMwMK0Zs+NM/rOMSdtu8bO30DIexhBEVi5KC6f70/XtI+L/K2wC3LsDCAXFZ4s8ik5gAuDugfCNbpllpdJ9bA==", "license": "BSD-3-Clause", "dependencies": { "@mapbox/point-geometry": "^1.1.0", @@ -8047,10 +8010,11 @@ "@mapbox/unitbezier": "^1.0.0", "@mapbox/vector-tile": "^3.0.0", "@maplibre/geojson-vt": "^6.1.1", - "@maplibre/maplibre-gl-style-spec": "^26.2.1", - "@maplibre/mlt": "^1.1.12", + "@maplibre/maplibre-gl-style-spec": "^26.4.2", + "@maplibre/mlt": "^1.2.1", "@maplibre/vt-pbf": "^4.3.2", "@types/geojson": "^7946.0.16", + "bidi-js": "^1.1.0", "earcut": "^3.2.3", "gl-matrix": "^3.4.4", "kdbush": "^4.1.0", @@ -8180,9 +8144,9 @@ "integrity": "sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw==" }, "node_modules/nanoid": { - "version": "3.3.16", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.16.tgz", - "integrity": "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==", + "version": "3.3.19", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.19.tgz", + "integrity": "sha512-Y2tUNy4ouw6tq5oDSKeQYGOyhkUBhNOcGV/02KC+6kd9eDGqdZd++mjMiIDilrBYvjEnCYvVtsuHCuP+okSfug==", "dev": true, "funding": [ { @@ -8652,9 +8616,9 @@ } }, "node_modules/postcss": { - "version": "8.5.19", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.19.tgz", - "integrity": "sha512-Mz8SaolMd8nB+G13WkORcxQKHZ/NE4xXevtkJHVuG+guo9/wYKlIMTKAqGdEmYOXR2ijPjTYNHssizdaVSUNdQ==", + "version": "8.5.28", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.28.tgz", + "integrity": "sha512-RRuzqDtt5Y9h3quz5hWhK+TPnsmVs6WwSU6LkJMeY4HstUEDuYTG8UJSdawMRzmzAtV+KEoG8N3Qg2qLy5vM/A==", "dev": true, "funding": [ { @@ -8672,7 +8636,7 @@ ], "license": "MIT", "dependencies": { - "nanoid": "^3.3.12", + "nanoid": "^3.3.18", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" }, @@ -8696,9 +8660,9 @@ } }, "node_modules/prettier": { - "version": "3.9.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.5.tgz", - "integrity": "sha512-/FVl766LpUfB5vXgCYOYa0MeV/441Ia99AeICQIQFTY/Nw0roZwULcXpku5i1/m5kt/baz+s4Zogspd839HSMg==", + "version": "3.9.6", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.6.tgz", + "integrity": "sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g==", "dev": true, "license": "MIT", "bin": { @@ -8812,9 +8776,9 @@ "integrity": "sha512-XdjUArbK4Bm5fLLvlm5KpTFOiOThgfWWI4axAZDWg4E/0mKdZyI9tNEfds27qCi1ze/vwTR16kvmmGhRra3c2g==" }, "node_modules/react": { - "version": "19.2.7", - "resolved": "https://registry.npmjs.org/react/-/react-19.2.7.tgz", - "integrity": "sha512-HNe9WslTbXmFK8o8cmwgAeJFSBvt1bPdHCVKtaaV+WlAN36mpT4hcRpwbf3fY56ar2oIXzsBpOAiIRHAdY0OlQ==", + "version": "19.3.0", + "resolved": "https://registry.npmjs.org/react/-/react-19.3.0.tgz", + "integrity": "sha512-E8LUcbtBWt20bbl2YoHfx4ZDBdxVTfOKtCZn9cDSJ4l6/nuoApcpIBcj47t2wZoVX8g2ZHuMHbiShgCR1T5Sog==", "license": "MIT", "engines": { "node": ">=0.10.0" @@ -8852,15 +8816,15 @@ } }, "node_modules/react-dom": { - "version": "19.2.7", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.7.tgz", - "integrity": "sha512-t0BRVXvbiE/o20Hfw669rLbMCDWtYZLvmJigy2f0MxsXF+71pxhR3xOkspmsO8h3ZlNzyibAmtCa3l4lYKk6gQ==", + "version": "19.3.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.3.0.tgz", + "integrity": "sha512-JDk8dgif51OjFoDE70+OT9ICyYr+69HlmihNwp1+Nsfbna3t5sIiCa9ZJktDmQ4/1b/rn26hIAR2uYXDMr5r0Q==", "license": "MIT", "dependencies": { - "scheduler": "^0.27.0" + "scheduler": "^0.28.0" }, "peerDependencies": { - "react": "^19.2.7" + "react": "^19.3.0" } }, "node_modules/react-is": { @@ -8876,13 +8840,13 @@ "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" }, "node_modules/react-map-gl": { - "version": "8.1.2", - "resolved": "https://registry.npmjs.org/react-map-gl/-/react-map-gl-8.1.2.tgz", - "integrity": "sha512-7jBqPoyO30M9GR+qd8utPipWGmpuCPOIJA/ePjR6LjQEZoedTf1hSN1SDj2jj6or8NQxe+ztEi91Bwbs5C+f4A==", + "version": "8.1.3", + "resolved": "https://registry.npmjs.org/react-map-gl/-/react-map-gl-8.1.3.tgz", + "integrity": "sha512-i8ExMBodZ5waBlnnXhPHfubf1mSQrzVBKsp9LUSWIAQjOuUhI4Dv962rzE2QfI7n5oywunldQlxcW1Mjy8rp7w==", "license": "MIT", "dependencies": { - "@vis.gl/react-mapbox": "8.1.2", - "@vis.gl/react-maplibre": "8.1.2" + "@vis.gl/react-mapbox": "8.1.3", + "@vis.gl/react-maplibre": "8.1.3" }, "peerDependencies": { "mapbox-gl": ">=1.13.0", @@ -9012,7 +8976,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -9073,13 +9036,13 @@ "dev": true }, "node_modules/rolldown": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.1.5.tgz", - "integrity": "sha512-t9z29cJjXf/vxQ8dyhCSpt6H6aSwHTk8cT5I3iy6SMXuFpk5mB6PL6XfC8PCwrPTx93udwKUm9HRteAlTGBLiA==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.8.tgz", + "integrity": "sha512-Z67nTmhZe7anqnM/EjI392w5i/ANUinjip7QYsOyN37oayduxt3ksdX0hf5OOamkAd53BiIHfbfSzfUmzKFQqQ==", "dev": true, "license": "MIT", "dependencies": { - "@oxc-project/types": "=0.139.0", + "@oxc-project/types": "=0.149.0", "@rolldown/pluginutils": "^1.0.0" }, "bin": { @@ -9089,21 +9052,21 @@ "node": "^20.19.0 || >=22.12.0" }, "optionalDependencies": { - "@rolldown/binding-android-arm64": "1.1.5", - "@rolldown/binding-darwin-arm64": "1.1.5", - "@rolldown/binding-darwin-x64": "1.1.5", - "@rolldown/binding-freebsd-x64": "1.1.5", - "@rolldown/binding-linux-arm-gnueabihf": "1.1.5", - "@rolldown/binding-linux-arm64-gnu": "1.1.5", - "@rolldown/binding-linux-arm64-musl": "1.1.5", - "@rolldown/binding-linux-ppc64-gnu": "1.1.5", - "@rolldown/binding-linux-s390x-gnu": "1.1.5", - "@rolldown/binding-linux-x64-gnu": "1.1.5", - "@rolldown/binding-linux-x64-musl": "1.1.5", - "@rolldown/binding-openharmony-arm64": "1.1.5", - "@rolldown/binding-wasm32-wasi": "1.1.5", - "@rolldown/binding-win32-arm64-msvc": "1.1.5", - "@rolldown/binding-win32-x64-msvc": "1.1.5" + "@rolldown/binding-android-arm-eabi": "1.2.8", + "@rolldown/binding-android-arm64": "1.2.8", + "@rolldown/binding-darwin-arm64": "1.2.8", + "@rolldown/binding-darwin-x64": "1.2.8", + "@rolldown/binding-freebsd-x64": "1.2.8", + "@rolldown/binding-linux-arm-gnueabihf": "1.2.8", + "@rolldown/binding-linux-arm64-gnu": "1.2.8", + "@rolldown/binding-linux-arm64-musl": "1.2.8", + "@rolldown/binding-linux-ppc64-gnu": "1.2.8", + "@rolldown/binding-linux-s390x-gnu": "1.2.8", + "@rolldown/binding-linux-x64-gnu": "1.2.8", + "@rolldown/binding-linux-x64-musl": "1.2.8", + "@rolldown/binding-openharmony-arm64": "1.2.8", + "@rolldown/binding-win32-arm64-msvc": "1.2.8", + "@rolldown/binding-win32-x64-msvc": "1.2.8" } }, "node_modules/run-parallel": { @@ -9206,9 +9169,9 @@ } }, "node_modules/scheduler": { - "version": "0.27.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.27.0.tgz", - "integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.28.0.tgz", + "integrity": "sha512-juorfCmIkIw8tT+p5BXSm6PJjQF/ycEYmKyzURCIt/RaZIhL+PulbQ9Yu2z1HdOJDdqDTlxA1+xKBmHXJsczAw==", "license": "MIT" }, "node_modules/semver": { @@ -10139,16 +10102,16 @@ } }, "node_modules/typescript-eslint": { - "version": "8.64.0", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.64.0.tgz", - "integrity": "sha512-0qg+pDNMnqYzqH9AnNK+39tejHvsShUOUUoRUgtnTGE7QuMZhiFDnozq8nHJVq+Wae6NMLKNWLg5WmkcC/ndyQ==", + "version": "8.70.0", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.70.0.tgz", + "integrity": "sha512-P/W5cz70/cQAuKfY3xwQMWWTV7BvJ0mAQmi+9mBcsVPaBUpd6Ohpa+fECv9rBFrQcig86jAiNBFNWUqnTjr4pw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.64.0", - "@typescript-eslint/parser": "8.64.0", - "@typescript-eslint/typescript-estree": "8.64.0", - "@typescript-eslint/utils": "8.64.0" + "@typescript-eslint/eslint-plugin": "8.70.0", + "@typescript-eslint/parser": "8.70.0", + "@typescript-eslint/typescript-estree": "8.70.0", + "@typescript-eslint/utils": "8.70.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -10342,16 +10305,16 @@ } }, "node_modules/vite": { - "version": "8.1.5", - "resolved": "https://registry.npmjs.org/vite/-/vite-8.1.5.tgz", - "integrity": "sha512-7ULLwsCdYx/nRyrpiEwvqb5TFHrMVZyBt+rg/OAXT7rgj/z+DtTDyKFeLAdDkubDVDKD8jOsndmy7m55XcfUsw==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.0.tgz", + "integrity": "sha512-lhZBVvEHefgE+HQZC9O7EBJgCU/nVzFNl7vkS4RE0APtWLP02/8QVIkQtzBxPquh7lq5/78NHipTj7ODQ6XuyQ==", "dev": true, "license": "MIT", "dependencies": { - "lightningcss": "^1.32.0", - "picomatch": "^4.0.5", - "postcss": "^8.5.17", - "rolldown": "~1.1.5", + "lightningcss": "^1.33.0", + "picomatch": "^4.0.7", + "postcss": "^8.5.28", + "rolldown": "~1.2.6", "tinyglobby": "^0.2.17" }, "bin": { @@ -10368,7 +10331,7 @@ }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", - "@vitejs/devtools": "^0.3.0", + "@vitejs/devtools": "^0.7.1", "esbuild": "^0.27.0 || ^0.28.0", "jiti": ">=1.21.0", "less": "^4.0.0", @@ -10420,9 +10383,9 @@ } }, "node_modules/vite/node_modules/picomatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz", - "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz", + "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==", "dev": true, "license": "MIT", "engines": { diff --git a/client/package.json b/client/package.json index bc77c4cefc7..d8121b921a9 100644 --- a/client/package.json +++ b/client/package.json @@ -20,24 +20,24 @@ "bootstrap": "5.3.8", "graphql": "16.14.2", "graphql-request": "7.4.0", - "maplibre-gl": "6.4.1", - "react": "19.2.7", + "maplibre-gl": "6.9.0", + "react": "19.3.0", "react-bootstrap": "2.10.10", - "react-dom": "19.2.7", - "react-map-gl": "8.1.2", + "react-dom": "19.3.0", + "react-map-gl": "8.1.3", "react-select": "5.10.2" }, "devDependencies": { - "@eslint/compat": "2.1.0", + "@eslint/compat": "2.1.1", "@eslint/js": "9.39.5", "@graphql-codegen/cli": "6.2.1", "@graphql-codegen/client-preset": "5.2.4", "@graphql-codegen/introspection": "5.0.1", - "@parcel/watcher": "2.5.6", - "@testing-library/react": "16.3.2", - "@types/react": "19.2.17", - "@types/react-dom": "19.2.3", - "@vitejs/plugin-react": "6.0.3", + "@parcel/watcher": "2.6.0", + "@testing-library/react": "16.3.3", + "@types/react": "19.3.0", + "@types/react-dom": "19.3.0", + "@vitejs/plugin-react": "6.1.1", "@vitest/coverage-v8": "5.0.0", "eslint": "9.39.5", "eslint-config-prettier": "10.1.8", @@ -45,13 +45,13 @@ "eslint-plugin-jsx-a11y": "6.10.2", "eslint-plugin-react": "7.37.5", "eslint-plugin-react-hooks": "7.1.1", - "eslint-plugin-react-refresh": "0.5.3", - "globals": "17.7.0", + "eslint-plugin-react-refresh": "0.5.6", + "globals": "17.12.0", "jsdom": "30.0.1", - "prettier": "3.9.5", + "prettier": "3.9.6", "typescript": "6.0.3", - "typescript-eslint": "8.64.0", - "vite": "8.1.5", + "typescript-eslint": "8.70.0", + "vite": "8.3.0", "vitest": "5.0.0" } } From 1b1177b7dc44cc2c5f89f18ad04076e99d608d23 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Fri, 18 Sep 2026 11:40:44 +0000 Subject: [PATCH 23/68] Add changelog entry for #8018 [ci skip] --- doc/user/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/Changelog.md b/doc/user/Changelog.md index 84be794ec26..4b56ecdd745 100644 --- a/doc/user/Changelog.md +++ b/doc/user/Changelog.md @@ -13,6 +13,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Remove .idea files from version control [#7992](https://github.com/opentripplanner/OpenTripPlanner/pull/7992) - Deprecate serviceId in GTFS API and stop populating it [#7991](https://github.com/opentripplanner/OpenTripPlanner/pull/7991) - Decode OSM PBF data in parallel [#8008](https://github.com/opentripplanner/OpenTripPlanner/pull/8008) +- Verify who labeled the PRs merged by the custom release script [#8018](https://github.com/opentripplanner/OpenTripPlanner/pull/8018) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.10.0 (2026-09-09) From 3ee7895498c9d488eaf6ef0df2faf1bb3dac2668 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Fri, 18 Sep 2026 14:43:22 +0000 Subject: [PATCH 24/68] Add changelog entry for #7990 [ci skip] --- doc/user/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/Changelog.md b/doc/user/Changelog.md index 4b56ecdd745..81cd2ef5eec 100644 --- a/doc/user/Changelog.md +++ b/doc/user/Changelog.md @@ -14,6 +14,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Deprecate serviceId in GTFS API and stop populating it [#7991](https://github.com/opentripplanner/OpenTripPlanner/pull/7991) - Decode OSM PBF data in parallel [#8008](https://github.com/opentripplanner/OpenTripPlanner/pull/8008) - Verify who labeled the PRs merged by the custom release script [#8018](https://github.com/opentripplanner/OpenTripPlanner/pull/8018) +- Use custom collections to speed up island pruning [#7990](https://github.com/opentripplanner/OpenTripPlanner/pull/7990) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.10.0 (2026-09-09) From 267055ac2f4f98edf1236cde3412104b7eb51589 Mon Sep 17 00:00:00 2001 From: Max Gosau Date: Thu, 17 Sep 2026 09:25:17 +0200 Subject: [PATCH 25/68] Add wildcard type parameter to `TripTimes` usages across codebase --- .../apis/gtfs/datafetchers/TripImpl.java | 5 ++-- .../gtfs/mapping/RealtimeStateMapper.java | 2 +- .../apis/support/SemanticHash.java | 4 +-- .../mapping/RealtimeStateMapper.java | 2 +- .../model/TripTimeOnDateHelper.java | 5 ++-- .../gtfs/interlining/InterlineProcessor.java | 14 +++++----- .../opentripplanner/model/TripTimeOnDate.java | 18 ++++++------- .../model/impl/TransitDataImportBuilder.java | 2 +- .../model/modes/ExcludeAllTransitFilter.java | 2 +- .../model/plan/leg/ScheduledTransitLeg.java | 4 +-- .../plan/leg/ScheduledTransitLegBuilder.java | 6 ++--- .../model/plan/leg/StopArrivalMapper.java | 4 +-- .../ScheduledTransitLegReference.java | 3 +-- .../netex/mapping/TripPatternMapper.java | 6 ++--- .../TripLocationResolver.java | 2 +- .../transit/TripPatternForDate.java | 18 +++++++------ .../raptoradapter/transit/TripSchedule.java | 2 +- .../frequency/FrequencyAlightEvent.java | 2 +- .../FrequencyBoardOrAlightEvent.java | 6 ++--- .../frequency/FrequencyBoardingEvent.java | 2 +- .../frequency/TripFrequencyAlightSearch.java | 3 +-- .../frequency/TripFrequencyBoardSearch.java | 3 +-- .../mappers/TimetableUpdateMapper.java | 2 +- .../mappers/TripPatternForDateMapper.java | 4 +-- .../DefaultTransitDataProviderFilter.java | 4 +-- .../request/TransitDataProviderFilter.java | 2 +- .../request/TripScheduleWithOffset.java | 4 +-- .../alternativelegs/AlternativeLegs.java | 4 +-- .../request/filter/AllowAllTransitFilter.java | 2 +- .../request/request/filter/SelectRequest.java | 4 +-- .../request/request/filter/TransitFilter.java | 2 +- .../request/filter/TransitFilterRequest.java | 2 +- .../transit/model/network/TripPattern.java | 2 +- .../model/timetable/RealTimeTripUpdate.java | 14 ++++++---- .../transit/model/timetable/Timetable.java | 27 +++++++++++-------- .../model/timetable/TimetableBuilder.java | 27 +++++++++++-------- .../transit/model/timetable/TripTimes.java | 8 +++--- .../DefaultTimetableRepository.java | 10 +++---- .../service/DefaultTransitService.java | 4 +-- .../transit/service/StopTimesHelper.java | 4 +-- .../transit/service/TransitRepository.java | 2 +- .../transit/service/TransitService.java | 2 +- .../transit/service/TripTimesHelper.java | 2 +- .../gtfs/GtfsRealtimeFuzzyTripMatcher.java | 2 +- .../updater/trip/gtfs/StopPositionMapper.java | 4 +-- .../trip/siri/ModifiedTripBuilder.java | 6 ++--- .../trip/siri/SiriFuzzyTripMatcher.java | 3 +-- .../trip/siri/SiriFuzzyTripMatcherCache.java | 3 +-- .../trip/siri/SiriRealTimeUpdateHandler.java | 5 ++-- .../updater/trip/siri/TripUpdate.java | 2 +- .../RealtimeVehiclePatternMatcher.java | 2 +- .../apis/gtfs/GraphQLIntegrationTest.java | 3 +-- .../model/TripTimeOnDateTest.java | 2 +- .../model/plan/TestItineraryBuilder.java | 3 +-- .../netex/mapping/TripPatternMapperTest.java | 3 +-- .../_data/transit/TestTripSchedule.java | 8 +++--- .../RaptorPathToItineraryMapperTest.java | 2 +- .../mappers/TripPatternForDateMapperTest.java | 2 +- .../DefaultTransitDataProviderFilterTest.java | 18 ++++--------- ...rRoutingRequestTransitDataCreatorTest.java | 4 +-- .../transit/request/TestRouteData.java | 4 +-- 61 files changed, 160 insertions(+), 163 deletions(-) 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 366dde6f059..0466ced4f11 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 @@ -41,7 +41,6 @@ import org.opentripplanner.transit.model.timetable.Timetable; import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripOnServiceDate; -import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.transit.service.TransitService; import org.opentripplanner.utils.time.ServiceDateUtils; @@ -155,7 +154,7 @@ public DataFetcher arrivalStoptime() { Instant midnight = ServiceDateUtils.asStartOfService(serviceDate, timeZone).toInstant(); Timetable timetable = transitService.findTimetable(tripPattern, serviceDate); - TripTimes tripTimes = timetable.getTripTimes(trip); + var tripTimes = timetable.getTripTimes(trip); if (tripTimes == null) { return null; } @@ -211,7 +210,7 @@ public DataFetcher departureStoptime() { Instant midnight = ServiceDateUtils.asStartOfService(serviceDate, timeZone).toInstant(); Timetable timetable = transitService.findTimetable(tripPattern, serviceDate); - TripTimes tripTimes = timetable.getTripTimes(trip); + var tripTimes = timetable.getTripTimes(trip); if (tripTimes == null) { return null; } diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/RealtimeStateMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/RealtimeStateMapper.java index 92f6d715473..f18b9bde2f4 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/RealtimeStateMapper.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/RealtimeStateMapper.java @@ -16,7 +16,7 @@ public class RealtimeStateMapper { private static final Logger LOG = LoggerFactory.getLogger(RealtimeStateMapper.class); - public static GraphQLTypes.GraphQLRealtimeState map(TripTimes tripTimes) { + public static GraphQLTypes.GraphQLRealtimeState map(TripTimes tripTimes) { return switch (tripTimes) { case RealTimeTripTimes realTimeTripTimes -> map(realTimeTripTimes); case ScheduledTripTimes _ -> GraphQLTypes.GraphQLRealtimeState.SCHEDULED; diff --git a/application/src/main/java/org/opentripplanner/apis/support/SemanticHash.java b/application/src/main/java/org/opentripplanner/apis/support/SemanticHash.java index 94e7de0d2e1..7464e939d61 100644 --- a/application/src/main/java/org/opentripplanner/apis/support/SemanticHash.java +++ b/application/src/main/java/org/opentripplanner/apis/support/SemanticHash.java @@ -39,7 +39,7 @@ public static String forTripPattern(TripPattern tripPattern, Trip trip) { StringBuilder sb = new StringBuilder(50); sb.append(encoder.encodeToString(forStopPattern(tripPattern, murmur).asBytes())); if (trip != null) { - TripTimes tripTimes = tripPattern.getScheduledTimetable().getTripTimes(trip); + var tripTimes = tripPattern.getScheduledTimetable().getTripTimes(trip); if (tripTimes == null) { return null; } @@ -83,7 +83,7 @@ private static HashCode forStopPattern(TripPattern tripPattern, HashFunction has *

  • this hash function needs to stay stable when users switch from 0.10.x to 1.0
    • * */ - private static HashCode forTripTimes(TripTimes tripTimes, final HashFunction hashFunction) { + private static HashCode forTripTimes(TripTimes tripTimes, final HashFunction hashFunction) { final Hasher hasher = hashFunction.newHasher(); for (int hop = 0; hop < tripTimes.getNumStops() - 1; hop++) { hasher.putInt(tripTimes.getScheduledDepartureTime(hop)); diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/RealtimeStateMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/RealtimeStateMapper.java index bcc04b1f096..c5c2982590f 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/RealtimeStateMapper.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/RealtimeStateMapper.java @@ -15,7 +15,7 @@ public class RealtimeStateMapper { private static final Logger LOG = LoggerFactory.getLogger(RealtimeStateMapper.class); - public static TransmodelRealTimeState map(TripTimes tripTimes) { + public static TransmodelRealTimeState map(TripTimes tripTimes) { return switch (tripTimes) { case RealTimeTripTimes realTimeTripTimes -> map(realTimeTripTimes); case ScheduledTripTimes _ -> TransmodelRealTimeState.SCHEDULED; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/TripTimeOnDateHelper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/TripTimeOnDateHelper.java index 58bba69a1b0..c9f359be143 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/model/TripTimeOnDateHelper.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/model/TripTimeOnDateHelper.java @@ -10,7 +10,6 @@ import org.opentripplanner.model.plan.Leg; import org.opentripplanner.model.plan.leg.ScheduledTransitLeg; import org.opentripplanner.transit.model.network.TripPattern; -import org.opentripplanner.transit.model.timetable.TripTimes; public class TripTimeOnDateHelper { @@ -81,7 +80,7 @@ public static List getAllTripTimeOnDatesForLegsTrip(Leg leg) { return List.of(); } ScheduledTransitLeg transitLeg = leg.asScheduledTransitLeg(); - TripTimes tripTimes = transitLeg.tripTimes(); + var tripTimes = transitLeg.tripTimes(); TripPattern tripPattern = transitLeg.tripPattern(); Instant serviceDateMidnight = transitLeg.serviceDateMidnight(); LocalDate serviceDate = transitLeg.serviceDate(); @@ -106,7 +105,7 @@ public static List getIntermediateTripTimeOnDatesForLeg(Leg leg) return List.of(); } ScheduledTransitLeg transitLeg = leg.asScheduledTransitLeg(); - TripTimes tripTimes = transitLeg.tripTimes(); + var tripTimes = transitLeg.tripTimes(); TripPattern tripPattern = transitLeg.tripPattern(); Instant serviceDateMidnight = transitLeg.serviceDateMidnight(); LocalDate serviceDate = transitLeg.serviceDate(); 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 c6312101fdd..ee4b8ec4bfe 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/interlining/InterlineProcessor.java +++ b/application/src/main/java/org/opentripplanner/gtfs/interlining/InterlineProcessor.java @@ -122,16 +122,16 @@ private Multimap getInterlinedTrips( Collection tripPatterns ) { /* Record which Pattern each interlined TripTimes belongs to. */ - Map patternForTripTimes = new HashMap<>(); + Map, TripPattern> patternForTripTimes = new HashMap<>(); /* TripTimes grouped by the block ID of their trips. Must be a ListMultimap to allow sorting. */ - ListMultimap tripTimesForBlockId = ArrayListMultimap.create(); + ListMultimap> tripTimesForBlockId = ArrayListMultimap.create(); LOG.info("Finding interlining trips based on block IDs."); for (TripPattern pattern : tripPatterns) { Timetable timetable = pattern.getScheduledTimetable(); /* TODO: Block semantics seem undefined for frequency trips, so skip them? */ - for (TripTimes tripTimes : timetable.getTripTimes()) { + for (TripTimes tripTimes : timetable.getTripTimes()) { Trip trip = tripTimes.getTrip(); if (StringUtils.hasValue(trip.getGtfsBlockId())) { tripTimesForBlockId.put(trip.getGtfsBlockId(), tripTimes); @@ -148,7 +148,7 @@ private Multimap getInterlinedTrips( // linking them. One from trip can have multiple interline transfers if trip which interlines // with the from trip doesn't operate on every service date of the from trip. for (String blockId : tripTimesForBlockId.keySet()) { - List blockTripTimes = tripTimesForBlockId.get(blockId); + List> blockTripTimes = tripTimesForBlockId.get(blockId); Collections.sort(blockTripTimes); for (int i = 0; i < blockTripTimes.size(); i++) { var fromTripTimes = blockTripTimes.get(i); @@ -188,10 +188,10 @@ private Multimap getInterlinedTrips( * creation for certain service dates. */ private boolean createInterline( - TripTimes fromTripTimes, - TripTimes toTripTimes, + TripTimes fromTripTimes, + TripTimes toTripTimes, String blockId, - Map patternForTripTimes, + Map, TripPattern> patternForTripTimes, Multimap interlines ) { if ( diff --git a/application/src/main/java/org/opentripplanner/model/TripTimeOnDate.java b/application/src/main/java/org/opentripplanner/model/TripTimeOnDate.java index 5a87f5dc995..0fc17158d7c 100644 --- a/application/src/main/java/org/opentripplanner/model/TripTimeOnDate.java +++ b/application/src/main/java/org/opentripplanner/model/TripTimeOnDate.java @@ -34,7 +34,7 @@ public class TripTimeOnDate { public static final int UNDEFINED = -1; - private final TripTimes tripTimes; + private final TripTimes tripTimes; private final int stopPosition; // This is only needed because TripTimes has no reference to TripPattern private final TripPattern tripPattern; @@ -44,7 +44,7 @@ public class TripTimeOnDate { private final long midnight; - public TripTimeOnDate(TripTimes tripTimes, int stopPosition, TripPattern tripPattern) { + public TripTimeOnDate(TripTimes tripTimes, int stopPosition, TripPattern tripPattern) { this.tripTimes = tripTimes; this.stopPosition = stopPosition; this.tripPattern = tripPattern; @@ -53,7 +53,7 @@ public TripTimeOnDate(TripTimes tripTimes, int stopPosition, TripPattern tripPat } public TripTimeOnDate( - TripTimes tripTimes, + TripTimes tripTimes, int stopPosition, TripPattern tripPattern, @Nullable LocalDate serviceDate, @@ -74,7 +74,7 @@ public TripTimeOnDate( */ @Nullable public static List fromTripTimes(Timetable table, Trip trip) { - TripTimes times = table.getTripTimes(trip); + var times = table.getTripTimes(trip); if (times == null) { return null; } @@ -100,7 +100,7 @@ public static List fromTripTimesWithScheduleFallback( LocalDate serviceDate, Instant midnight ) { - TripTimes times = table.getTripTimes(trip); + var times = table.getTripTimes(trip); if (times == null) { Timetable scheduledTimetable = table.getPattern().getScheduledTimetable(); return fromTripTimes(scheduledTimetable, trip); @@ -129,7 +129,7 @@ public static List fromTripTimes( ) { // The timetable given should always contain the trip. // if the trip doesn't run on the date, the scheduled timetable should be given. - TripTimes times = Objects.requireNonNull(table.getTripTimes(trip)); + var times = Objects.requireNonNull(table.getTripTimes(trip)); List out = new ArrayList<>(); for (int i = 0; i < times.getNumStops(); ++i) { out.add(new TripTimeOnDate(times, i, table.getPattern(), serviceDate, midnight)); @@ -146,7 +146,7 @@ public static TripTimeOnDate firstFromTripTimes( LocalDate serviceDate, Instant midnight ) { - TripTimes times = table.getTripTimes(trip); + var times = table.getTripTimes(trip); return new TripTimeOnDate(times, 0, table.getPattern(), serviceDate, midnight); } @@ -159,7 +159,7 @@ public static TripTimeOnDate lastFromTripTimes( LocalDate serviceDate, Instant midnight ) { - TripTimes times = table.getTripTimes(trip); + var times = table.getTripTimes(trip); return new TripTimeOnDate( times, times.getNumStops() - 1, @@ -216,7 +216,7 @@ public int getStopPosition() { return stopPosition; } - public TripTimes getTripTimes() { + public TripTimes getTripTimes() { return tripTimes; } diff --git a/application/src/main/java/org/opentripplanner/model/impl/TransitDataImportBuilder.java b/application/src/main/java/org/opentripplanner/model/impl/TransitDataImportBuilder.java index c24a0cbe148..49ae36c4634 100644 --- a/application/src/main/java/org/opentripplanner/model/impl/TransitDataImportBuilder.java +++ b/application/src/main/java/org/opentripplanner/model/impl/TransitDataImportBuilder.java @@ -383,7 +383,7 @@ private void fixOrRemovePatternsWhichReferenceNoneExistingTrips() { for (Map.Entry e : tripPatterns.entries()) { TripPattern ptn = e.getValue(); - Set tripTimesToBeRemoved = ptn + Set> tripTimesToBeRemoved = ptn .getScheduledTimetable() .getTripTimes() .stream() 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 8cbc96c7512..30c160400b4 100644 --- a/application/src/main/java/org/opentripplanner/model/modes/ExcludeAllTransitFilter.java +++ b/application/src/main/java/org/opentripplanner/model/modes/ExcludeAllTransitFilter.java @@ -24,7 +24,7 @@ public boolean matchTripPattern(TripPattern tripPattern) { } @Override - public boolean matchTripTimes(TripTimes trip) { + public boolean matchTripTimes(TripTimes trip) { return false; } diff --git a/application/src/main/java/org/opentripplanner/model/plan/leg/ScheduledTransitLeg.java b/application/src/main/java/org/opentripplanner/model/plan/leg/ScheduledTransitLeg.java index 6c390c143ff..d60ecd6f6b8 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/leg/ScheduledTransitLeg.java +++ b/application/src/main/java/org/opentripplanner/model/plan/leg/ScheduledTransitLeg.java @@ -55,7 +55,7 @@ public class ScheduledTransitLeg implements TransitLeg { private static final Comparator FARE_OFFER_COMPARATOR = Comparator.comparing( (FareOffer o) -> o.fareProduct().id().getId() ).thenComparing(FareOffer::uniqueId); - private final TripTimes tripTimes; + private final TripTimes tripTimes; private final TripPattern tripPattern; private final ZonedDateTime startTime; @@ -139,7 +139,7 @@ public ZoneId zoneId() { return zoneId; } - public TripTimes tripTimes() { + public TripTimes tripTimes() { return tripTimes; } diff --git a/application/src/main/java/org/opentripplanner/model/plan/leg/ScheduledTransitLegBuilder.java b/application/src/main/java/org/opentripplanner/model/plan/leg/ScheduledTransitLegBuilder.java index e75c3f764e9..1eba5bfe63f 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/leg/ScheduledTransitLegBuilder.java +++ b/application/src/main/java/org/opentripplanner/model/plan/leg/ScheduledTransitLegBuilder.java @@ -23,7 +23,7 @@ public class ScheduledTransitLegBuilder> */ private static final int POS_NOT_SET = -1; - private TripTimes tripTimes; + private TripTimes tripTimes; private TripPattern tripPattern; private int boardStopIndexInPattern = POS_NOT_SET; private int alightStopIndexInPattern = POS_NOT_SET; @@ -69,12 +69,12 @@ public ScheduledTransitLegBuilder(ScheduledTransitLeg original) { emissionPerPerson = original.emissionPerPerson(); } - public B withTripTimes(TripTimes tripTimes) { + public B withTripTimes(TripTimes tripTimes) { this.tripTimes = tripTimes; return instance(); } - public TripTimes tripTimes() { + public TripTimes tripTimes() { return tripTimes; } diff --git a/application/src/main/java/org/opentripplanner/model/plan/leg/StopArrivalMapper.java b/application/src/main/java/org/opentripplanner/model/plan/leg/StopArrivalMapper.java index b829a2d866b..13700927647 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/leg/StopArrivalMapper.java +++ b/application/src/main/java/org/opentripplanner/model/plan/leg/StopArrivalMapper.java @@ -15,9 +15,9 @@ class StopArrivalMapper { private final ZoneId zoneId; private final LocalDate serviceDate; - private final TripTimes tripTimes; + private final TripTimes tripTimes; - public StopArrivalMapper(ZoneId zoneId, LocalDate serviceDate, TripTimes tripTimes) { + public StopArrivalMapper(ZoneId zoneId, LocalDate serviceDate, TripTimes tripTimes) { this.zoneId = Objects.requireNonNull(zoneId); this.serviceDate = Objects.requireNonNull(serviceDate); this.tripTimes = Objects.requireNonNull(tripTimes); 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 c1c2d5bc55c..92e26537255 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 @@ -15,7 +15,6 @@ import org.opentripplanner.transit.model.timetable.Timetable; import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripOnServiceDate; -import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.transit.service.TransitService; import org.opentripplanner.utils.collection.TwoWayLinearSearch; import org.opentripplanner.utils.lang.ObjectUtils; @@ -179,7 +178,7 @@ public ScheduledTransitLeg getLeg( } Timetable timetable = transitService.findTimetable(tripPattern, serviceDate); - TripTimes tripTimes = timetable.getTripTimes(trip); + var tripTimes = timetable.getTripTimes(trip); if (tripTimes == null) { logInvalidLegRef( diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java index a628429b13c..f218f322709 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java @@ -361,11 +361,11 @@ private org.opentripplanner.transit.model.network.Route lookupRoute( return otpRouteById.get(idFactory.createId(lineId)); } - private List createTripTimes( + private List> createTripTimes( List trips, Map> tripStopTimes ) { - var tripTimesResult = new ArrayList(); + var tripTimesResult = new ArrayList>(); for (Trip trip : trips) { List stopTimes = tripStopTimes.get(trip); if (stopTimes.isEmpty()) { @@ -376,7 +376,7 @@ private List createTripTimes( ); } else { try { - TripTimes tripTimes = TripTimesFactory.tripTimes(trip, stopTimes, deduplicator); + var tripTimes = TripTimesFactory.tripTimes(trip, stopTimes, deduplicator); tripTimesResult.add(tripTimes); } catch (DataValidationException e) { issueStore.add(e.error()); diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/startonboardaccess/TripLocationResolver.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/startonboardaccess/TripLocationResolver.java index 5b960c72a10..562059aeab9 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/startonboardaccess/TripLocationResolver.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/startonboardaccess/TripLocationResolver.java @@ -128,7 +128,7 @@ private LocationInTripPatternReference findLocationInTripPattern( private List matchingLocations( TripPattern tripPattern, FeedScopedId stopOrStationId, - TripTimes tripTimes, + TripTimes tripTimes, @Nullable Integer targetSeconds ) { var locations = new ArrayList(); 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 13c0a374368..f95a30bdc6e 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 @@ -34,7 +34,7 @@ public class TripPatternForDate implements Comparable { * day. Invariant: this array should contain a subset of the TripSchedules in * tripPattern.tripSchedules. */ - private final TripTimes[] tripTimes; + private final TripTimes[] tripTimes; /** * The filtered FrequencyEntries for only those entries in the TripPattern that are active on the @@ -58,12 +58,14 @@ public class TripPatternForDate implements Comparable { public TripPatternForDate( RoutingTripPattern tripPattern, - List tripTimes, + List> tripTimes, List frequencies, LocalDate serviceDate ) { this.tripPattern = tripPattern; - this.tripTimes = tripTimes.toArray(new TripTimes[0]); + @SuppressWarnings("unchecked") + TripTimes[] arr = tripTimes.toArray(TripTimes[]::new); + this.tripTimes = arr; this.frequencies = frequencies.toArray(new FrequencyEntry[0]); this.serviceDate = serviceDate; @@ -93,7 +95,7 @@ public TripPatternForDate( } } - public List tripTimes() { + public List> tripTimes() { return Arrays.asList(tripTimes); } @@ -109,7 +111,7 @@ public int stopIndex(int i) { return this.tripPattern.stopIndex(i); } - public TripTimes getTripTimes(int i) { + public TripTimes getTripTimes(int i) { return tripTimes[i]; } @@ -186,9 +188,9 @@ public String toString() { } @Nullable - public TripPatternForDate newWithFilteredTripTimes(Predicate filter) { - ArrayList filteredTripTimes = new ArrayList<>(tripTimes.length); - for (TripTimes tripTimes : tripTimes) { + public TripPatternForDate newWithFilteredTripTimes(Predicate> filter) { + ArrayList> filteredTripTimes = new ArrayList<>(tripTimes.length); + for (TripTimes tripTimes : tripTimes) { if (filter.test(tripTimes)) { filteredTripTimes.add(tripTimes); } diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripSchedule.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripSchedule.java index 40e7b4a3751..3dfd24f35d7 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripSchedule.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripSchedule.java @@ -15,7 +15,7 @@ public interface TripSchedule extends DefaultTripSchedule { /** * TODO OTP2 - Add JavaDoc */ - TripTimes getOriginalTripTimes(); + TripTimes getOriginalTripTimes(); /** * TODO OTP2 - Add JavaDoc diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyAlightEvent.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyAlightEvent.java index b801c519619..46c87a92031 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyAlightEvent.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyAlightEvent.java @@ -12,7 +12,7 @@ final class FrequencyAlightEvent extends Frequenc public FrequencyAlightEvent( TripPatternForDates raptorTripPattern, - TripTimes tripTimes, + TripTimes tripTimes, int stopPositionInPattern, int earliestDepartureTime, int departureTime, diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyBoardOrAlightEvent.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyBoardOrAlightEvent.java index 9473438c82d..0fd8a102288 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyBoardOrAlightEvent.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyBoardOrAlightEvent.java @@ -32,7 +32,7 @@ abstract class FrequencyBoardOrAlightEvent implem TripSchedule { protected final TripPatternForDates raptorTripPattern; - protected final TripTimes tripTimes; + protected final TripTimes tripTimes; protected final int stopPositionInPattern; protected final int earliestDepartureTime; protected final int departureTime; @@ -43,7 +43,7 @@ abstract class FrequencyBoardOrAlightEvent implem public FrequencyBoardOrAlightEvent( TripPatternForDates raptorTripPattern, - TripTimes tripTimes, + TripTimes tripTimes, int stopPositionInPattern, int earliestDepartureTime, int departureTime, @@ -130,7 +130,7 @@ public int transitReluctanceFactorIndex() { /* TripSchedule implementation */ @Override - public TripTimes getOriginalTripTimes() { + public TripTimes getOriginalTripTimes() { return tripTimes; } diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyBoardingEvent.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyBoardingEvent.java index 852d93108c8..119f25c49de 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyBoardingEvent.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyBoardingEvent.java @@ -12,7 +12,7 @@ final class FrequencyBoardingEvent extends Freque public FrequencyBoardingEvent( TripPatternForDates raptorTripPattern, - TripTimes tripTimes, + TripTimes tripTimes, int stopPositionInPattern, int earliestDepartureTime, int departureTime, diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyAlightSearch.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyAlightSearch.java index ecfdceab506..a1f94bdaaff 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyAlightSearch.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyAlightSearch.java @@ -6,7 +6,6 @@ import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.DefaultTripSchedule; import org.opentripplanner.routing.algorithm.raptoradapter.transit.request.TripPatternForDates; import org.opentripplanner.transit.model.timetable.FrequencyEntry; -import org.opentripplanner.transit.model.timetable.TripTimes; /** * Searches for a concrete trip time for a frequency based pattern. The {@link FrequencyEntry}s are @@ -41,7 +40,7 @@ public RaptorBoardOrAlightEvent search( ); if (arrivalTime != -1) { int headway = frequency.routingSlack(); - TripTimes tripTimes = frequency.materialize( + var tripTimes = frequency.materialize( stopPositionInPattern, arrivalTime + headway, false diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyBoardSearch.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyBoardSearch.java index 6493f204b0c..63e544defbd 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyBoardSearch.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyBoardSearch.java @@ -6,7 +6,6 @@ import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.DefaultTripSchedule; import org.opentripplanner.routing.algorithm.raptoradapter.transit.request.TripPatternForDates; import org.opentripplanner.transit.model.timetable.FrequencyEntry; -import org.opentripplanner.transit.model.timetable.TripTimes; /** * Searches for a concrete trip time for a frequency based pattern. The {@link FrequencyEntry}s are @@ -40,7 +39,7 @@ public RaptorBoardOrAlightEvent search( ); if (departureTime != -1) { int headway = frequency.routingSlack(); - TripTimes tripTimes = frequency.materialize( + var tripTimes = frequency.materialize( stopPositionInPattern, departureTime - headway, true diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TimetableUpdateMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TimetableUpdateMapper.java index 10e7d3fd72e..98284e4c072 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TimetableUpdateMapper.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TimetableUpdateMapper.java @@ -153,7 +153,7 @@ public RaptorTransitData map( ); } - for (TripTimes triptimes : timetable.getTripTimes()) { + for (TripTimes triptimes : timetable.getTripTimes()) { var id = new TripIdAndServiceDate( triptimes.getTrip().getId(), timetable.getServiceDate() diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TripPatternForDateMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TripPatternForDateMapper.java index 82353a8ace0..bfd8c2422cf 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TripPatternForDateMapper.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TripPatternForDateMapper.java @@ -62,9 +62,9 @@ public TripPatternForDate map(Timetable timetable, LocalDate serviceDate) { return null; } - List times = new ArrayList<>(); + List> times = new ArrayList<>(); - for (TripTimes tripTimes : timetable.getTripTimes()) { + for (TripTimes tripTimes : timetable.getTripTimes()) { if (!serviceCodesRunning.contains(tripTimes.getServiceCode())) { continue; } diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilter.java index 5047da906cf..c5b8f97f19f 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilter.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilter.java @@ -70,7 +70,7 @@ public static BikeAccess bikeAccessForTrip(Trip trip) { @Override @Nullable - public Predicate createTripFilter(TripPattern tripPattern) { + public Predicate> createTripFilter(TripPattern tripPattern) { for (TransitFilter filter : filters) { if (filter.matchTripPattern(tripPattern)) { var applyTripTimesFilters = @@ -81,7 +81,7 @@ public Predicate createTripFilter(TripPattern tripPattern) { return null; } - private boolean tripTimesPredicate(TripTimes tripTimes, boolean applyTripTimesFilters) { + private boolean tripTimesPredicate(TripTimes tripTimes, boolean applyTripTimesFilters) { final Trip trip = tripTimes.getTrip(); if (requireBikesAllowed && bikeAccessForTrip(trip) != BikeAccess.ALLOWED) { diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TransitDataProviderFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TransitDataProviderFilter.java index e07690d6d60..4fe41208a62 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TransitDataProviderFilter.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TransitDataProviderFilter.java @@ -26,7 +26,7 @@ public interface TransitDataProviderFilter { * object. */ @Nullable - Predicate createTripFilter(TripPattern tripPattern); + Predicate> createTripFilter(TripPattern tripPattern); /** * Check if boarding/alighting is possible at each stop. If the values differ from the default 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 52449a25ea9..46964c6e963 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 @@ -23,7 +23,7 @@ public final class TripScheduleWithOffset implements TripSchedule { private final int tripIndexForDates; // Computed when needed later for RaptorPathToItineraryMapper - private TripTimes tripTimes = null; + private TripTimes tripTimes = null; private LocalDate serviceDate = null; private int secondsOffset; @@ -77,7 +77,7 @@ public Accessibility wheelchairBoarding() { * Following methods are only called in RaptorPathToItineraryMapper, instantiation or debug/tests, these are not optimised for performance */ @Override - public TripTimes getOriginalTripTimes() { + public TripTimes getOriginalTripTimes() { if (tripTimes == null) { this.findTripTimes(); } 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 724f186f5de..f821f5a59b1 100644 --- a/application/src/main/java/org/opentripplanner/routing/alternativelegs/AlternativeLegs.java +++ b/application/src/main/java/org/opentripplanner/routing/alternativelegs/AlternativeLegs.java @@ -158,7 +158,7 @@ private static Stream generateLegs( var servicesRunning = transitService.getServiceCodesRunningForDate(serviceDate); - for (TripTimes tripTimes : timetable.getTripTimes()) { + for (TripTimes tripTimes : timetable.getTripTimes()) { if (!servicesRunning.contains(tripTimes.getServiceCode())) { continue; } @@ -213,7 +213,7 @@ private static ScheduledTransitLeg mapToLeg( TransitService transitService ) { LocalDate serviceDay = tripTimeOnDate.getServiceDay(); - TripTimes tripTimes = tripTimeOnDate.getTripTimes(); + var tripTimes = tripTimeOnDate.getTripTimes(); ZonedDateTime boardingTime = ServiceDateUtils.toZonedDateTime( serviceDay, diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/request/filter/AllowAllTransitFilter.java b/application/src/main/java/org/opentripplanner/routing/api/request/request/filter/AllowAllTransitFilter.java index b22a1540ea1..a74ce2239ff 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/request/filter/AllowAllTransitFilter.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/request/filter/AllowAllTransitFilter.java @@ -23,7 +23,7 @@ public boolean matchTripPattern(TripPattern tripPattern) { } @Override - public boolean matchTripTimes(TripTimes trip) { + public boolean matchTripTimes(TripTimes trip) { return true; } 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 8dc4a184b2e..9b490870313 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 @@ -57,7 +57,7 @@ public boolean matchesPatternNot(TripPattern tripPattern) { /** * Matches the select clause of a transit filter request. */ - public boolean matchesSelect(TripTimes tripTimes) { + public boolean matchesSelect(TripTimes tripTimes) { var trip = tripTimes.getTrip(); return ( @@ -73,7 +73,7 @@ public boolean matchesSelect(TripTimes tripTimes) { /** * Matches the not clause of a transit filter request. */ - public boolean matchesNot(TripTimes tripTimes) { + public boolean matchesNot(TripTimes tripTimes) { var trip = tripTimes.getTrip(); return ( this.transportModeFilter != null && diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitFilter.java b/application/src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitFilter.java index ce4cf0e6cb4..1ef610762f0 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitFilter.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/request/filter/TransitFilter.java @@ -12,7 +12,7 @@ public interface TransitFilter { /** * Return false is tripTimes are banned, otherwise return true */ - boolean matchTripTimes(TripTimes trip); + boolean matchTripTimes(TripTimes trip); /** * Returns {@code true} if this filter contains mode-selective constraints that may require 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 38054459378..8485653766e 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 @@ -86,7 +86,7 @@ public boolean matchTripPattern(TripPattern tripPattern) { } @Override - public boolean matchTripTimes(TripTimes tripTimes) { + public boolean matchTripTimes(TripTimes tripTimes) { if (select.length != 0) { var anyMatch = false; for (var selectRequest : select) { 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 fb27ac4dd80..6c314c49c3c 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 @@ -547,7 +547,7 @@ private boolean containsSameStopsAsOriginalPattern() { /** * Helper method for getting the trip headsign from the {@link TripTimes}. */ - private I18NString getTripHeadSignFromTripTimes(TripTimes tripTimes) { + private I18NString getTripHeadSignFromTripTimes(TripTimes tripTimes) { return tripTimes != null ? tripTimes.getTripHeadsign() : null; } diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripUpdate.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripUpdate.java index e9213b28ba0..f86aae35301 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripUpdate.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripUpdate.java @@ -11,7 +11,7 @@ public final class RealTimeTripUpdate { private final TripPattern pattern; - private final TripTimes updatedTripTimes; + private final TripTimes updatedTripTimes; private final LocalDate serviceDate; @Nullable @@ -61,7 +61,11 @@ private RealTimeTripUpdate(Builder builder) { * @param serviceDate the service date for which this update applies (updates are valid * only for one service date). */ - public static Builder of(TripPattern pattern, TripTimes updatedTripTimes, LocalDate serviceDate) { + public static Builder of( + TripPattern pattern, + TripTimes updatedTripTimes, + LocalDate serviceDate + ) { return new Builder(pattern, updatedTripTimes, serviceDate); } @@ -69,7 +73,7 @@ public TripPattern pattern() { return pattern; } - public TripTimes updatedTripTimes() { + public TripTimes updatedTripTimes() { return updatedTripTimes; } @@ -107,7 +111,7 @@ public TripPattern hideTripInScheduledPattern() { public static class Builder { private final TripPattern pattern; - private final TripTimes updatedTripTimes; + private final TripTimes updatedTripTimes; private final LocalDate serviceDate; private TripOnServiceDate addedTripOnServiceDate = null; private boolean tripCreation = false; @@ -116,7 +120,7 @@ public static class Builder { private boolean revertPreviousRealTimeUpdates = false; private TripPattern hideTripInScheduledPattern = null; - private Builder(TripPattern pattern, TripTimes updatedTripTimes, LocalDate serviceDate) { + private Builder(TripPattern pattern, TripTimes updatedTripTimes, LocalDate serviceDate) { this.pattern = pattern; this.updatedTripTimes = updatedTripTimes; this.serviceDate = serviceDate; diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/Timetable.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/Timetable.java index 6cdadc42aa2..5cca84a07ac 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/Timetable.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/Timetable.java @@ -24,9 +24,9 @@ public class Timetable implements Serializable { private final TripPattern pattern; - private List tripTimes; + private List> tripTimes; - private Map tripTimesIndex; + private Map> tripTimesIndex; private List frequencyEntries; @@ -57,12 +57,12 @@ public TimetableBuilder copyOf() { } @Nullable - public TripTimes getTripTimes(Trip trip) { + public TripTimes getTripTimes(Trip trip) { return getTripTimes(trip.getId()); } @Nullable - public TripTimes getTripTimes(FeedScopedId tripId) { + public TripTimes getTripTimes(FeedScopedId tripId) { return tripTimesIndex.get(tripId); } @@ -75,7 +75,7 @@ public boolean isValidFor(LocalDate serviceDate) { public void setServiceCodes(Map serviceCodes) { tripTimes = tripTimes .stream() - .map(tt -> tt.withServiceCode(serviceCodes.get(tt.getTrip().getServiceId()))) + .>map(tt -> withServiceCode(tt, serviceCodes.get(tt.getTrip().getServiceId()))) .toList(); tripTimesIndex = tripTimes .stream() @@ -98,7 +98,7 @@ public TripPattern getPattern() { * Contains one TripTimes object for each scheduled trip (even cancelled ones) and possibly * additional TripTimes objects for unscheduled trips. Frequency entries are stored separately. */ - public List getTripTimes() { + public List> getTripTimes() { return tripTimes; } @@ -140,7 +140,7 @@ public Direction getDirection() { * Return an arbitrary TripTimes in this Timetable. * Return a scheduled trip times if it exists, otherwise return a frequency-based trip times. */ - public TripTimes getRepresentativeTripTimes() { + public TripTimes getRepresentativeTripTimes() { return getRepresentativeTripTimes(tripTimes, frequencyEntries); } @@ -160,7 +160,7 @@ public boolean isCreatedByRealTimeUpdater() { * @param frequencies all the frequency-based trip times in a timetable. */ static Direction getDirection( - Collection scheduledTripTimes, + Collection> scheduledTripTimes, Collection frequencies ) { return Optional.ofNullable(getRepresentativeTripTimes(scheduledTripTimes, frequencies)) @@ -175,8 +175,8 @@ static Direction getDirection( * @param frequencies all the frequency-based trip times in a timetable. * */ - private static TripTimes getRepresentativeTripTimes( - Collection scheduledTripTimes, + private static TripTimes getRepresentativeTripTimes( + Collection> scheduledTripTimes, Collection frequencies ) { if (!scheduledTripTimes.isEmpty()) { @@ -201,12 +201,17 @@ public Timetable copyForServiceDate(LocalDate date) { return copyOf().withServiceDate(date).build(); } + @SuppressWarnings({ "unchecked", "rawtypes" }) + private static TripTimes withServiceCode(TripTimes tt, int serviceCode) { + return ((TripTimes) tt).withServiceCode(serviceCode); + } + /** * Compute the maximum number of whole days a trip schedule lasts. This method * will use the last stop arrival time of the last trip. Return zero if the * arrival time is negative. */ - private static int computeMaxTripSpanDays(List tripTimes) { + private static int computeMaxTripSpanDays(List> tripTimes) { if (tripTimes.isEmpty()) { return 0; } diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/TimetableBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TimetableBuilder.java index f6dbb15405b..c397d4a17eb 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/TimetableBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/TimetableBuilder.java @@ -14,7 +14,7 @@ public class TimetableBuilder { private TripPattern pattern; private LocalDate serviceDate; - private final Map tripTimes; + private final Map> tripTimes; private final List frequencies; TimetableBuilder() { @@ -45,7 +45,7 @@ public TimetableBuilder withServiceDate(LocalDate serviceDate) { * thrown. This is considered a programming error. Use {@link #addOrUpdateTripTimes(TripTimes)} * if you want to replace an existing trip. */ - public TimetableBuilder addTripTimes(TripTimes tripTimes) { + public TimetableBuilder addTripTimes(TripTimes tripTimes) { var trip = tripTimes.getTrip(); if (this.tripTimes.containsKey(trip.getId())) { throw new IllegalStateException( @@ -60,25 +60,25 @@ public TimetableBuilder addTripTimes(TripTimes tripTimes) { * are replaced. If not, the trip-times it is added. Consider using * {@link #addTripTimes(TripTimes)}. */ - public TimetableBuilder addOrUpdateTripTimes(TripTimes tripTimes) { + public TimetableBuilder addOrUpdateTripTimes(TripTimes tripTimes) { this.tripTimes.put(tripTimes.getTrip().getId(), tripTimes); return this; } - public TimetableBuilder addAllTripTimes(List tripTimes) { - for (TripTimes it : tripTimes) { + public TimetableBuilder addAllTripTimes(List> tripTimes) { + for (TripTimes it : tripTimes) { addTripTimes(it); } return this; } - public TimetableBuilder removeTripTimes(TripTimes tripTimesToRemove) { + public TimetableBuilder removeTripTimes(TripTimes tripTimesToRemove) { tripTimes.remove(tripTimesToRemove.getTrip().getId()); return this; } - public TimetableBuilder removeAllTripTimes(Collection tripTimesToBeRemoved) { - for (TripTimes it : tripTimesToBeRemoved) { + public TimetableBuilder removeAllTripTimes(Collection> tripTimesToBeRemoved) { + for (TripTimes it : tripTimesToBeRemoved) { tripTimes.remove(it.getTrip().getId()); } return this; @@ -90,11 +90,16 @@ public TimetableBuilder removeAllTripTimes(Collection tripTimesToBeRe *

    */ public TimetableBuilder withAdjustedTimes(Duration timeshift) { - tripTimes.replaceAll((t, tt) -> tt.withAdjustedTimes(timeshift)); + tripTimes.replaceAll((t, tt) -> withAdjustedTimes(tt, timeshift)); frequencies.replaceAll(it -> it.withAdjustedTimes(timeshift)); return this; } + @SuppressWarnings({ "unchecked", "rawtypes" }) + private static TripTimes withAdjustedTimes(TripTimes tt, Duration timeshift) { + return ((TripTimes) tt).withAdjustedTimes(timeshift); + } + public TimetableBuilder addFrequencyEntry(FrequencyEntry frequencyEntry) { this.frequencies.add(frequencyEntry); return this; @@ -111,11 +116,11 @@ public Timetable build() { return new Timetable(this); } - List createImmutableOrderedListOfTripTimes() { + List> createImmutableOrderedListOfTripTimes() { return tripTimes.values().stream().sorted().toList(); } - Map createImmutableTripTimesIndex() { + Map> createImmutableTripTimesIndex() { return Map.copyOf(tripTimes); } diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java index 87d03cbf400..51d51173367 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java @@ -31,8 +31,8 @@ * the position within the trip's TripPattern, not its GTFS stop sequence for example or Raptor * stop index. The stop position is 0(zero) based. */ -public sealed interface TripTimes - extends Serializable, Comparable +public sealed interface TripTimes> + extends Serializable, Comparable> permits RealTimeTripTimes, ScheduledTripTimes { /** @@ -106,12 +106,12 @@ default int sortIndex() { } /** Sort trips based on first departure time. */ - default Comparator compare() { + default Comparator> compare() { return Comparator.comparingInt(TripTimes::sortIndex); } /** Sort trips based on first departure time. */ - default int compareTo(TripTimes other) { + default int compareTo(TripTimes other) { return sortIndex() - other.sortIndex(); } diff --git a/application/src/main/java/org/opentripplanner/transit/repository/DefaultTimetableRepository.java b/application/src/main/java/org/opentripplanner/transit/repository/DefaultTimetableRepository.java index a35e33863b3..e02cadf6ab7 100644 --- a/application/src/main/java/org/opentripplanner/transit/repository/DefaultTimetableRepository.java +++ b/application/src/main/java/org/opentripplanner/transit/repository/DefaultTimetableRepository.java @@ -362,7 +362,7 @@ public void update(RealTimeTripUpdate realTimeTripUpdate) { TripPattern pattern = realTimeTripUpdate.pattern(); LocalDate serviceDate = realTimeTripUpdate.serviceDate(); - TripTimes updatedTripTimes = realTimeTripUpdate.updatedTripTimes(); + var updatedTripTimes = realTimeTripUpdate.updatedTripTimes(); Timetable tt = resolve(pattern, serviceDate); TimetableBuilder ttb = tt.copyOf().withServiceDate(serviceDate); @@ -522,10 +522,10 @@ public boolean revertTripToScheduledTripPattern(FeedScopedId tripId, LocalDate s // under that now-obsolete realtime-added pattern. SortedSet sortedTimetables = this.timetables.get(pattern.getId()); if (sortedTimetables != null) { - TripTimes tripTimesToRemove = null; + TripTimes tripTimesToRemove = null; for (Timetable timetable : sortedTimetables) { if (timetable.isValidFor(serviceDate)) { - final TripTimes tripTimes = timetable.getTripTimes(tripId); + final var tripTimes = timetable.getTripTimes(tripId); if (tripTimes == null) { LOG.debug("No triptimes to remove for trip {}", tripId); } else if (tripTimesToRemove != null) { @@ -796,7 +796,7 @@ private void validateNotReadOnly() { } } - private TripOnServiceDate mapToTripOnServiceDate(TripTimes tripTimes, Timetable timetable) { + private TripOnServiceDate mapToTripOnServiceDate(TripTimes tripTimes, Timetable timetable) { return TripOnServiceDate.of(tripTimes.getTrip().getId()) .withServiceDate(timetable.getServiceDate()) .withTrip(tripTimes.getTrip()) @@ -808,7 +808,7 @@ private TripOnServiceDate mapToTripOnServiceDate(TripTimes tripTimes, Timetable * * @param filter used to filter {@link TripTimes}. */ - private List findTripsOnServiceDates(Predicate filter) { + private List findTripsOnServiceDates(Predicate> filter) { return timetables .values() .stream() 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 c45c3d1b146..29abc4121a9 100644 --- a/application/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java +++ b/application/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java @@ -135,7 +135,7 @@ public Optional> findTripTimesOnDate(Trip trip, LocalDate s Timetable timetable = findTimetable(pattern, serviceDate); // This check is made here to avoid changing TripTimeOnDate.fromTripTimes - TripTimes times = timetable.getTripTimes(trip); + var times = timetable.getTripTimes(trip); if ( times == null || !this.getServiceCodesRunningForDate(serviceDate).contains(times.getServiceCode()) @@ -151,7 +151,7 @@ public Optional> findTripTimesOnDate(Trip trip, LocalDate s } @Override - public Optional findTripTimes(Trip trip, LocalDate serviceDate) { + public Optional> findTripTimes(Trip trip, LocalDate serviceDate) { return Optional.ofNullable(findPattern(trip, serviceDate)) .map(pattern -> findTimetable(pattern, serviceDate)) .map(timetable -> timetable.getTripTimes(trip)); diff --git a/application/src/main/java/org/opentripplanner/transit/service/StopTimesHelper.java b/application/src/main/java/org/opentripplanner/transit/service/StopTimesHelper.java index 2d9f7d6ee7f..0141c81c41a 100644 --- a/application/src/main/java/org/opentripplanner/transit/service/StopTimesHelper.java +++ b/application/src/main/java/org/opentripplanner/transit/service/StopTimesHelper.java @@ -192,7 +192,7 @@ List stopTimesForStop( if (skipByStopCancellation(pattern, includeCancellations, i)) { continue; } - for (TripTimes t : tt.getTripTimes()) { + for (TripTimes t : tt.getTripTimes()) { if (TripTimesHelper.skipByTripCancellationOrDeletion(t, includeCancellations)) { continue; } @@ -329,7 +329,7 @@ private Queue listTripTimeOnDatesForPatternAtStop( continue; } - for (TripTimes tripTimes : timetable.getTripTimes()) { + for (TripTimes tripTimes : timetable.getTripTimes()) { if (!servicesRunning.contains(tripTimes.getServiceCode())) { continue; } diff --git a/application/src/main/java/org/opentripplanner/transit/service/TransitRepository.java b/application/src/main/java/org/opentripplanner/transit/service/TransitRepository.java index 3891907c828..59d0b88ab85 100644 --- a/application/src/main/java/org/opentripplanner/transit/service/TransitRepository.java +++ b/application/src/main/java/org/opentripplanner/transit/service/TransitRepository.java @@ -553,7 +553,7 @@ public Set getStopLocationsUsedForBikesAllowedTrips() { } private Set getStopLocationsUsedByTripTimes( - Predicate tripTimesPredicate + Predicate> tripTimesPredicate ) { Set stopLocations = getAllTripPatterns() .stream() diff --git a/application/src/main/java/org/opentripplanner/transit/service/TransitService.java b/application/src/main/java/org/opentripplanner/transit/service/TransitService.java index 57ce10560ee..951e5adaf60 100644 --- a/application/src/main/java/org/opentripplanner/transit/service/TransitService.java +++ b/application/src/main/java/org/opentripplanner/transit/service/TransitService.java @@ -460,5 +460,5 @@ Collection findRegularStopsByBoundingBox( * for the given trip on the given service date, or empty if the * trip does not run on that date. */ - Optional findTripTimes(Trip trip, LocalDate serviceDate); + Optional> findTripTimes(Trip trip, LocalDate serviceDate); } diff --git a/application/src/main/java/org/opentripplanner/transit/service/TripTimesHelper.java b/application/src/main/java/org/opentripplanner/transit/service/TripTimesHelper.java index f69980c5480..cb2e21d613e 100644 --- a/application/src/main/java/org/opentripplanner/transit/service/TripTimesHelper.java +++ b/application/src/main/java/org/opentripplanner/transit/service/TripTimesHelper.java @@ -14,7 +14,7 @@ public class TripTimesHelper { * Always returns {@code true} if the trip times is deleted. */ public static boolean skipByTripCancellationOrDeletion( - TripTimes tripTimes, + TripTimes tripTimes, boolean includeCancellations ) { if (tripTimes.isDeleted()) { diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/GtfsRealtimeFuzzyTripMatcher.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/GtfsRealtimeFuzzyTripMatcher.java index 79405d536d0..e86d3be87a7 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/GtfsRealtimeFuzzyTripMatcher.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/GtfsRealtimeFuzzyTripMatcher.java @@ -91,7 +91,7 @@ public synchronized Trip getTrip( if (pattern.getDirection() != direction) { continue; } - for (TripTimes times : pattern.getScheduledTimetable().getTripTimes()) { + for (TripTimes times : pattern.getScheduledTimetable().getTripTimes()) { if ( times.getScheduledDepartureTime(0) == startTime && servicesRunningForDate.contains(times.getServiceCode()) diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/StopPositionMapper.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/StopPositionMapper.java index 27e5e6622d6..ff532bae204 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/StopPositionMapper.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/StopPositionMapper.java @@ -18,10 +18,10 @@ class StopPositionMapper { private final FeedScopedId tripId; - private final TripTimes tripTimes; + private final TripTimes tripTimes; private final List stopIds; - StopPositionMapper(FeedScopedId tripId, TripTimes tripTimes, Timetable timetable) { + StopPositionMapper(FeedScopedId tripId, TripTimes tripTimes, Timetable timetable) { this.tripId = tripId; this.tripTimes = tripTimes; this.stopIds = timetable diff --git a/application/src/main/java/org/opentripplanner/updater/trip/siri/ModifiedTripBuilder.java b/application/src/main/java/org/opentripplanner/updater/trip/siri/ModifiedTripBuilder.java index 6b0c38738fb..b30ac447825 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/siri/ModifiedTripBuilder.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/siri/ModifiedTripBuilder.java @@ -33,7 +33,7 @@ */ class ModifiedTripBuilder { - private final TripTimes existingTripTimes; + private final TripTimes existingTripTimes; private final TripPattern pattern; private final LocalDate serviceDate; private final ZoneId zoneId; @@ -50,7 +50,7 @@ class ModifiedTripBuilder { private final String vehicleRef; public ModifiedTripBuilder( - TripTimes existingTripTimes, + TripTimes existingTripTimes, TripPattern pattern, EstimatedVehicleJourneyWrapper journey, LocalDate serviceDate, @@ -76,7 +76,7 @@ public ModifiedTripBuilder( * Constructor for tests */ public ModifiedTripBuilder( - TripTimes existingTripTimes, + TripTimes existingTripTimes, TripPattern pattern, LocalDate serviceDate, ZoneId zoneId, diff --git a/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriFuzzyTripMatcher.java b/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriFuzzyTripMatcher.java index 87c8d48ca17..b4a840c3b92 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriFuzzyTripMatcher.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriFuzzyTripMatcher.java @@ -21,7 +21,6 @@ import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.timetable.Timetable; import org.opentripplanner.transit.model.timetable.Trip; -import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.transit.service.TransitService; import org.opentripplanner.updater.spi.UpdateErrorType; import org.opentripplanner.updater.spi.UpdateException; @@ -227,7 +226,7 @@ private TripAndPattern getTripAndPatternForJourney( continue; } - TripTimes times = getCurrentTimetable.apply(tripPattern, serviceDate).getTripTimes(trip); + var times = getCurrentTimetable.apply(tripPattern, serviceDate).getTripTimes(trip); if (times != null && times.getScheduledDepartureTime(0) == departureInSecondsSinceMidnight) { // Found matches possibleTrips.add(new TripAndPattern(times.getTrip(), tripPattern)); diff --git a/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriFuzzyTripMatcherCache.java b/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriFuzzyTripMatcherCache.java index 4396b8d4291..b614069097c 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriFuzzyTripMatcherCache.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriFuzzyTripMatcherCache.java @@ -5,7 +5,6 @@ import org.opentripplanner.transit.model.basic.TransitMode; 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.DefaultTransitService; import org.opentripplanner.transit.service.TransitRepository; import org.opentripplanner.transit.service.TransitService; @@ -51,7 +50,7 @@ public static SiriFuzzyTripMatcherCache create(TransitRepository transitReposito } String lastStopId = tripPattern.lastStop().getId().getId(); - TripTimes tripTimes = tripPattern.getScheduledTimetable().getTripTimes(trip); + var tripTimes = tripPattern.getScheduledTimetable().getTripTimes(trip); if (tripTimes != null) { int arrivalTime = tripTimes.getArrivalTime(tripTimes.getNumStops() - 1); startStopTrips.put(startStopKey(lastStopId, arrivalTime), trip); diff --git a/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriRealTimeUpdateHandler.java b/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriRealTimeUpdateHandler.java index a29fde66d7c..9ca6810e74b 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriRealTimeUpdateHandler.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriRealTimeUpdateHandler.java @@ -17,7 +17,6 @@ import org.opentripplanner.transit.model.timetable.RealTimeTripUpdate; import org.opentripplanner.transit.model.timetable.Timetable; import org.opentripplanner.transit.model.timetable.Trip; -import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.transit.repository.TimetableRepository; import org.opentripplanner.transit.service.TransitService; import org.opentripplanner.updater.spi.DataValidationExceptionMapper; @@ -237,7 +236,7 @@ private TripUpdate handleModifiedTrip( } Timetable currentTimetable = getCurrentTimetable(pattern, serviceDate); - TripTimes existingTripTimes = currentTimetable.getTripTimes(trip); + var existingTripTimes = currentTimetable.getTripTimes(trip); if (existingTripTimes == null) { LOG.debug("tripId {} not found in pattern.", trip.getId()); throw UpdateException.of(trip.getId(), TRIP_NOT_FOUND_IN_PATTERN); @@ -292,7 +291,7 @@ private TripUpdate handleExtraCall( } Timetable currentTimetable = getCurrentTimetable(pattern, serviceDate); - TripTimes existingTripTimes = currentTimetable.getTripTimes(trip); + var existingTripTimes = currentTimetable.getTripTimes(trip); if (existingTripTimes == null) { LOG.debug("tripId {} not found in pattern.", trip.getId()); throw UpdateException.of(trip.getId(), TRIP_NOT_FOUND_IN_PATTERN); diff --git a/application/src/main/java/org/opentripplanner/updater/trip/siri/TripUpdate.java b/application/src/main/java/org/opentripplanner/updater/trip/siri/TripUpdate.java index 12c5fdbb8ef..454f7d12b3b 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/siri/TripUpdate.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/siri/TripUpdate.java @@ -28,7 +28,7 @@ */ record TripUpdate( StopPattern stopPattern, - TripTimes tripTimes, + TripTimes tripTimes, LocalDate serviceDate, @Nullable TripOnServiceDate addedTripOnServiceDate, @Nullable TripPattern addedTripPattern, 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 6bf8aff9aa8..83cc771b451 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 @@ -416,7 +416,7 @@ private PatternAndRealtimeVehicle toRealtimeVehicle( } @Nullable - private static TripTimes matchFrequencyTripTimes( + private static TripTimes matchFrequencyTripTimes( VehiclePosition vehiclePosition, Timetable scheduledTimetable ) { 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 80905d112f9..6bf9c5496fa 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java @@ -120,7 +120,6 @@ import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.RealTimeTripUpdate; import org.opentripplanner.transit.model.timetable.Trip; -import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.transit.model.timetable.TripTimesFactory; import org.opentripplanner.transit.repository.DefaultTimetableRepository; import org.opentripplanner.transit.service.DefaultTransitService; @@ -599,7 +598,7 @@ private static Itinerary add10MinuteDelay(Itinerary i1) { .copyOf() .transformTransitLegs(tl -> { if (tl instanceof ScheduledTransitLeg stl) { - TripTimes scheduledTimes = stl.tripTimes(); + var scheduledTimes = stl.tripTimes(); var builder = scheduledTimes.createRealTimeFromScheduledTimes(); for (var i = 0; i < scheduledTimes.getNumStops(); i++) { diff --git a/application/src/test/java/org/opentripplanner/model/TripTimeOnDateTest.java b/application/src/test/java/org/opentripplanner/model/TripTimeOnDateTest.java index 56c4c9c2e6a..32b4a8ab141 100644 --- a/application/src/test/java/org/opentripplanner/model/TripTimeOnDateTest.java +++ b/application/src/test/java/org/opentripplanner/model/TripTimeOnDateTest.java @@ -264,7 +264,7 @@ void testScheduledStopForExtraCall() { assertEquals(stopC, third.getScheduledStop(shorterScheduledPattern)); } - private static TripTimes tripTimesFor(int stops) { + private static TripTimes tripTimesFor(int stops) { var trip = TransitRepositoryForTest.trip("123").build(); var stopTimes = TEST_MODEL.stopTimesEvery5Minutes(stops, trip, "11:00"); return TripTimesFactory.tripTimes(trip, stopTimes, new Deduplicator()); 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 34db7626b13..e34e2d2e14c 100644 --- a/application/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java +++ b/application/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java @@ -44,7 +44,6 @@ import org.opentripplanner.transit.model.network.StopPattern; 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.model.timetable.TripTimesFactory; import org.opentripplanner.utils.lang.IntUtils; import org.opentripplanner.utils.time.TimeUtils; @@ -550,7 +549,7 @@ public TestItineraryBuilder transit( stopTimes.add(toStopTime); StopPattern stopPattern = new StopPattern(stopTimes); - final TripTimes tripTimes = TripTimesFactory.tripTimes(trip, stopTimes, new Deduplicator()); + final var tripTimes = TripTimesFactory.tripTimes(trip, stopTimes, new Deduplicator()); TripPattern tripPattern = TripPattern.of(route.getId()) .withRoute(route) .withStopPattern(stopPattern) diff --git a/application/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java index 2c84b88e7f2..e34c7940e2e 100644 --- a/application/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java +++ b/application/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java @@ -20,7 +20,6 @@ import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripAlteration; import org.opentripplanner.transit.model.timetable.TripOnServiceDate; -import org.opentripplanner.transit.model.timetable.TripTimes; import org.rutebanken.netex.model.DatedServiceJourney; import org.rutebanken.netex.model.DatedServiceJourneyRefStructure; import org.rutebanken.netex.model.OperatingDay; @@ -79,7 +78,7 @@ void testMapTripPattern() { assertEquals(1, r.tripPattern().getScheduledTimetable().getTripTimes().size()); - TripTimes tripTimes = r.tripPattern().getScheduledTimetable().getTripTimes().get(0); + var tripTimes = r.tripPattern().getScheduledTimetable().getTripTimes().get(0); assertEquals(4, tripTimes.getNumStops()); diff --git a/application/src/test/java/org/opentripplanner/raptorlegacy/_data/transit/TestTripSchedule.java b/application/src/test/java/org/opentripplanner/raptorlegacy/_data/transit/TestTripSchedule.java index 00295029c25..808b1e8da28 100644 --- a/application/src/test/java/org/opentripplanner/raptorlegacy/_data/transit/TestTripSchedule.java +++ b/application/src/test/java/org/opentripplanner/raptorlegacy/_data/transit/TestTripSchedule.java @@ -31,7 +31,7 @@ public class TestTripSchedule implements TripSchedule { private final int transitReluctanceIndex; private final Accessibility wheelchairBoarding; private final TripPattern originalPattern; - private final TripTimes tripTimes; + private final TripTimes tripTimes; protected TestTripSchedule( TestTripPattern pattern, @@ -40,7 +40,7 @@ protected TestTripSchedule( int transitReluctanceIndex, Accessibility wheelchairBoarding, TripPattern originalPattern, - TripTimes tripTimes + TripTimes tripTimes ) { this.pattern = pattern; this.arrivalTimes = arrivalTimes; @@ -124,7 +124,7 @@ public LocalDate getServiceDate() { } @Override - public TripTimes getOriginalTripTimes() { + public TripTimes getOriginalTripTimes() { return tripTimes; } @@ -160,7 +160,7 @@ public TestTripSchedule.Builder originalPattern(TripPattern pattern) { return this; } - public TestTripSchedule.Builder withTripTimes(TripTimes tripTimes) { + public TestTripSchedule.Builder withTripTimes(TripTimes tripTimes) { this.tripTimes = tripTimes; return this; } 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 49ed9146ad2..54b94a1199a 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 @@ -266,7 +266,7 @@ void isSearchWindowAware() { assertTrue(itinerary.isSearchWindowAware()); } - private TripTimes buildTripTimes(TripPattern originalPattern) { + private TripTimes buildTripTimes(TripPattern originalPattern) { var trip = TransitRepositoryForTest.trip("test").build(); var stopTimes = new ArrayList(); for (int i = 0; i < originalPattern.numberOfStops(); i++) { diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TripPatternForDateMapperTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TripPatternForDateMapperTest.java index cbdc26a1705..694e5d80152 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TripPatternForDateMapperTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TripPatternForDateMapperTest.java @@ -71,7 +71,7 @@ void testTimetableWithServiceCodesRunningForDateShouldReturnTripPatternForDate() //Each of the mapped trip times should be in the original timetable. (For this specific date) //Can't simply do a check by index, as the trip times for date are sorted during mapping. - for (TripTimes times : mappedPattern.tripTimes()) { + for (TripTimes times : mappedPattern.tripTimes()) { boolean timeTableContainsTimes = timetable.getTripTimes().contains(times); assertTrue(timeTableContainsTimes); } diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilterTest.java index ed91a537ff7..5d71b0511d1 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilterTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilterTest.java @@ -903,7 +903,7 @@ private TripPatternForDate createTestTripPatternForDate() { .build() .getRoutingTripPattern(); - TripTimes tripTimes = TripTimesFactory.tripTimes( + var tripTimes = TripTimesFactory.tripTimes( TransitRepositoryForTest.trip("1").withRoute(route).build(), List.of(new StopTime()), new Deduplicator() @@ -948,8 +948,8 @@ private List combinedFilterForModesAndBannedAgencies( ); } - private record PatternAndTimes(TripPattern pattern, TripTimes tripTimes) { - public PatternAndTimes withTimes(TripTimes tripTimes) { + private record PatternAndTimes(TripPattern pattern, TripTimes tripTimes) { + public PatternAndTimes withTimes(TripTimes tripTimes) { return new PatternAndTimes(pattern, tripTimes); } } @@ -1014,11 +1014,7 @@ private PatternAndTimes createPatternAndTimes( .withContainsMultipleModes(multipleSubmodes) .build(); - TripTimes tripTimes = TripTimesFactory.tripTimes( - trip, - List.of(new StopTime()), - new Deduplicator() - ); + var tripTimes = TripTimesFactory.tripTimes(trip, List.of(new StopTime()), new Deduplicator()); return new PatternAndTimes(tripPattern, tripTimes); } @@ -1066,11 +1062,7 @@ private PatternAndTimes createPatternAndTimes( .withContainsMultipleModes(containsMultipleModes) .build(); - TripTimes tripTimes = TripTimesFactory.tripTimes( - trip, - List.of(new StopTime()), - new Deduplicator() - ); + var tripTimes = TripTimesFactory.tripTimes(trip, List.of(new StopTime()), new Deduplicator()); return new PatternAndTimes(tripPattern, tripTimes); } 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 0d383e65733..a3edff2eee1 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 @@ -45,7 +45,7 @@ public void testMergeTripPatterns() { ZonedDateTime startOfTime = ServiceDateUtils.asStartOfService(second, ZoneIds.LONDON); - List tripTimes = List.of(createTripTimesForTest()); + List> tripTimes = List.of(createTripTimesForTest()); // Total available trip patterns RoutingTripPattern tripPattern1 = createTripPattern(TP_ID_1); @@ -98,7 +98,7 @@ public void testMergeTripPatterns() { @Test public void testCreateTripPatterns() { var date = LocalDate.of(2025, 10, 10); - List tripTimes = List.of( + List> tripTimes = List.of( ScheduledTripTimes.of() .withTrip(TransitRepositoryForTest.trip("Test").build()) .withDepartureTimes("23:45 23:55") 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 6ae35a125fc..ac995926de6 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 @@ -36,7 +36,7 @@ public class TestRouteData { private final Route route; private final List trips; private final Map> stopTimesByTrip = new HashMap<>(); - private final Map tripTimesByTrip = new HashMap<>(); + private final Map> tripTimesByTrip = new HashMap<>(); private final Map tripSchedulesByTrip = new HashMap<>(); private final RaptorTimeTable timetable; private final TripPattern tripPattern; @@ -52,7 +52,7 @@ public TestRouteData(Route route, List stops, List times) { List stopTimesFistTrip = firstTrip().getStopTimes(); // Get TripTimes in same order as the trips - List tripTimes = trips + List> tripTimes = trips .stream() .map(tripTimesByTrip::get) .collect(Collectors.toList()); From c224103df9c48e3b294d114651a19859b92af5e1 Mon Sep 17 00:00:00 2001 From: Max Gosau Date: Mon, 21 Sep 2026 11:21:09 +0200 Subject: [PATCH 26/68] remove redundant cast --- .../apis/gtfs/datafetchers/TripOnServiceDateImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripOnServiceDateImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripOnServiceDateImpl.java index b8b8825f6f3..0511bf96af7 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripOnServiceDateImpl.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripOnServiceDateImpl.java @@ -138,7 +138,7 @@ public DataFetcher vehicleId() { } var tripTimes = arguments.timetable().getTripTimes(arguments.trip()); return Optional.ofNullable(tripTimes) - .flatMap(t -> ((TripTimes) t).getVehicleId()) + .flatMap(TripTimes::getVehicleId) .map(FeedScopedId::toString) .orElse(null); }; From d7edc12b4832231281d9ca13d98d68d855b4c8f1 Mon Sep 17 00:00:00 2001 From: Max Gosau Date: Mon, 21 Sep 2026 11:44:37 +0200 Subject: [PATCH 27/68] Remove unchecked cast suppressions and raw type usage of `TripTimes` --- .../algorithm/raptoradapter/transit/TripPatternForDate.java | 4 +--- .../opentripplanner/transit/model/timetable/Timetable.java | 3 +-- .../transit/model/timetable/TimetableBuilder.java | 3 +-- .../raptorlegacy/_data/transit/TestTripSchedule.java | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) 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 f95a30bdc6e..0e691ced995 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 @@ -63,9 +63,7 @@ public TripPatternForDate( LocalDate serviceDate ) { this.tripPattern = tripPattern; - @SuppressWarnings("unchecked") - TripTimes[] arr = tripTimes.toArray(TripTimes[]::new); - this.tripTimes = arr; + this.tripTimes = tripTimes.toArray(TripTimes[]::new); this.frequencies = frequencies.toArray(new FrequencyEntry[0]); this.serviceDate = serviceDate; diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/Timetable.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/Timetable.java index 5cca84a07ac..b3d44cbb4e5 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/Timetable.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/Timetable.java @@ -201,9 +201,8 @@ public Timetable copyForServiceDate(LocalDate date) { return copyOf().withServiceDate(date).build(); } - @SuppressWarnings({ "unchecked", "rawtypes" }) private static TripTimes withServiceCode(TripTimes tt, int serviceCode) { - return ((TripTimes) tt).withServiceCode(serviceCode); + return tt.withServiceCode(serviceCode); } /** diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/TimetableBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TimetableBuilder.java index c397d4a17eb..92156675a1f 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/TimetableBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/TimetableBuilder.java @@ -95,9 +95,8 @@ public TimetableBuilder withAdjustedTimes(Duration timeshift) { return this; } - @SuppressWarnings({ "unchecked", "rawtypes" }) private static TripTimes withAdjustedTimes(TripTimes tt, Duration timeshift) { - return ((TripTimes) tt).withAdjustedTimes(timeshift); + return tt.withAdjustedTimes(timeshift); } public TimetableBuilder addFrequencyEntry(FrequencyEntry frequencyEntry) { diff --git a/application/src/test/java/org/opentripplanner/raptorlegacy/_data/transit/TestTripSchedule.java b/application/src/test/java/org/opentripplanner/raptorlegacy/_data/transit/TestTripSchedule.java index 808b1e8da28..b9db94856b4 100644 --- a/application/src/test/java/org/opentripplanner/raptorlegacy/_data/transit/TestTripSchedule.java +++ b/application/src/test/java/org/opentripplanner/raptorlegacy/_data/transit/TestTripSchedule.java @@ -148,7 +148,7 @@ public static class Builder { private int transitReluctanceIndex = 0; private Accessibility wheelchairBoarding = NO_INFORMATION; private TripPattern originalPattern; - private TripTimes tripTimes; + private TripTimes tripTimes; public TestTripSchedule.Builder pattern(TestTripPattern pattern) { this.pattern = pattern; From 52292e4c8c776e454ebb9faff5e4cf21ad0f936a Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 14 Sep 2026 16:28:04 +0200 Subject: [PATCH 28/68] refactor: prepare for a new raptor module by moving existing code into router sub-module --- ARCHITECTURE.md | 12 ++-- CLAUDE.md | 7 +- application/pom.xml | 2 +- raptor/pom.xml | 59 ++-------------- raptor/router/pom.xml | 68 +++++++++++++++++++ .../opentripplanner/raptor/RaptorService.java | 0 .../opentripplanner/raptor/RaptorTimeLine.svg | 0 .../raptor/api/debug/DebugEvent.java | 0 .../raptor/api/debug/DebugLogger.java | 0 .../raptor/api/debug/DebugTopic.java | 0 .../raptor/api/debug/RaptorTimers.java | 0 .../model/AbstractAccessEgressDecorator.java | 0 .../raptor/api/model/DominanceFunction.java | 0 .../model/GeneralizedCostRelaxFunction.java | 0 .../raptor/api/model/RaptorAccessEgress.java | 0 .../api/model/RaptorStartOnBoardAccess.java | 0 .../model/RaptorTripScheduleStopPosition.java | 0 .../raptor/api/model/RaptorValue.java | 0 .../api/model/RaptorValueFormatter.java | 0 .../raptor/api/model/RaptorValueType.java | 0 .../raptor/api/model/RelaxFunction.java | 0 .../raptor/api/path/AccessPathLeg.java | 0 .../raptor/api/path/EgressPathLeg.java | 0 .../raptor/api/path/PathLeg.java | 0 .../raptor/api/path/PathStringBuilder.java | 0 .../raptor/api/path/RaptorPath.java | 0 .../raptor/api/path/TransferPathLeg.java | 0 .../raptor/api/path/TransitPathLeg.java | 0 .../raptor/api/request/DebugRequest.java | 0 .../api/request/DebugRequestBuilder.java | 0 .../DynamicSearchWindowCoefficients.java | 0 .../api/request/MultiCriteriaRequest.java | 0 .../raptor/api/request/Optimization.java | 0 .../raptor/api/request/RaptorEnvironment.java | 0 .../raptor/api/request/RaptorProfile.java | 0 .../raptor/api/request/RaptorRequest.java | 0 .../api/request/RaptorRequestBuilder.java | 0 .../RaptorTransitGroupPriorityCalculator.java | 0 .../api/request/RaptorTuningParameters.java | 0 .../raptor/api/request/SearchParams.java | 0 .../api/request/SearchParamsBuilder.java | 0 .../via/AbstractViaLocationBuilder.java | 0 .../via/PassThroughLocationBuilder.java | 0 .../via/RaptorPassThroughViaConnection.java | 0 .../via/RaptorTransferViaConnection.java | 0 .../api/request/via/RaptorViaLocation.java | 0 .../via/RaptorVisitStopViaConnection.java | 0 .../raptor/api/request/via/ViaConnection.java | 0 .../request/via/ViaVisitLocationBuilder.java | 0 .../raptor/api/response/RaptorResponse.java | 0 .../raptor/api/response/StopArrivals.java | 0 .../raptor/api/view/AccessPathView.java | 0 .../raptor/api/view/ArrivalView.java | 0 .../raptor/api/view/EgressPathView.java | 0 .../raptor/api/view/PathLegType.java | 0 .../raptor/api/view/PatternRideView.java | 0 .../raptor/api/view/TransitArrival.java | 0 .../raptor/api/view/TransitPathView.java | 0 .../raptor/configure/RaptorConfig.java | 0 .../api/RaptorDirectTransitRequest.java | 0 .../RaptorDirectTransitRequestBuilder.java | 0 .../configure/DirectTransitSearchFactory.java | 0 .../direct/service/DirectTransitSearch.java | 0 .../extrasearch/ExtraMcRouterSearch.java | 0 .../org/opentripplanner/raptor/package.md | 0 .../org/opentripplanner/raptor/path/Path.java | 0 .../raptor/path/PathBuilder.java | 0 .../raptor/path/PathBuilderLeg.java | 0 .../raptor/rangeraptor/CompositeResult.java | 0 .../ConcurrentCompositeRaptorRouter.java | 0 .../rangeraptor/DefaultRangeRaptorWorker.java | 0 .../raptor/rangeraptor/RangeRaptor.java | 0 .../RangeRaptorWorkerComposite.java | 0 .../rangeraptor/SystemErrDebugLogger.java | 0 .../rangeraptor/context/SearchContext.java | 0 .../context/SearchContextBuilder.java | 0 .../context/SearchContextViaSegments.java | 0 .../debug/AbstractDebugHandlerAdapter.java | 0 .../debug/DebugHandlerFactory.java | 0 .../debug/DebugHandlerPathAdapter.java | 0 .../debug/DebugHandlerPatternRideAdapter.java | 0 .../debug/DebugHandlerStopArrivalAdapter.java | 0 .../debug/ParetoSetDebugHandlerAdapter.java | 0 .../rangeraptor/internalapi/DebugHandler.java | 0 .../internalapi/HeuristicAtStop.java | 0 .../rangeraptor/internalapi/Heuristics.java | 0 .../internalapi/OnTripAccessArrival.java | 0 .../internalapi/OnTripAccessArrivals.java | 0 .../internalapi/ParetoSetCost.java | 0 .../internalapi/ParetoSetTime.java | 0 .../internalapi/RangeRaptorWorker.java | 0 .../rangeraptor/internalapi/RaptorRouter.java | 0 .../internalapi/RaptorRouterResult.java | 0 .../internalapi/RaptorWorkerState.java | 0 .../internalapi/RoutingStrategy.java | 0 .../SingleCriteriaStopArrivals.java | 0 .../internalapi/SlackProvider.java | 0 .../internalapi/WorkerLifeCycle.java | 0 .../lifecycle/LifeCycleEventPublisher.java | 0 .../lifecycle/LifeCycleSubscriptions.java | 0 .../McRangeRaptorWorkerState.java | 0 .../multicriteria/McRaptorRouterResult.java | 0 .../MultiCriteriaRoutingStrategy.java | 0 ...ViaConnectionStopArrivalEventListener.java | 0 .../CalculateTransferToDestination.java | 0 .../arrivals/DebugStopArrivalsStatistics.java | 0 .../McArrivalsEventListenerFactory.java | 0 .../arrivals/McStopArrivals.java | 0 ...psWithArriveByTransitCriteriaResolver.java | 0 .../arrivals/stop/AbstractStopArrivalC2.java | 0 .../arrivals/stop/AccessStopArrival.java | 0 .../arrivals/stop/AccessStopArrivalC2.java | 0 .../ArrivalParetoSetComparatorFactory.java | 0 .../arrivals/stop/McStopArrival.java | 0 .../arrivals/stop/McStopArrivalFactory.java | 0 .../arrivals/stop/StopArrivalFactoryC1.java | 0 .../arrivals/stop/StopArrivalFactoryC2.java | 0 .../arrivals/stop/TransferStopArrival.java | 0 .../arrivals/stop/TransferStopArrivalC2.java | 0 .../arrivals/stop/TransitStopArrival.java | 0 .../arrivals/stop/TransitStopArrivalC2.java | 0 .../configure/McRangeRaptorConfig.java | 0 .../heuristic/HeuristicsProvider.java | 0 .../ride/AbstractPatternRide.java | 0 .../multicriteria/ride/PatternRideC1.java | 0 .../multicriteria/ride/PatternRideC2.java | 0 .../ride/PatternRideFactory.java | 0 .../ride/TransitGroupPriorityRideFactory.java | 0 .../path/BoardAndAlightTimeSearch.java | 0 .../rangeraptor/path/DestinationArrival.java | 0 .../path/DestinationArrivalPaths.java | 0 .../rangeraptor/path/ForwardPathMapper.java | 0 .../raptor/rangeraptor/path/PathMapper.java | 0 .../path/PathParetoSetComparators.java | 0 .../rangeraptor/path/ReversePathMapper.java | 0 .../path/configure/PathConfig.java | 0 .../standard/ArrivalTimeRoutingStrategy.java | 0 .../MinTravelDurationRoutingStrategy.java | 0 .../standard/StdRangeRaptorWorkerState.java | 0 .../standard/StdRaptorRouterResult.java | 0 .../standard/StdTransferEarlyPruning.java | 0 .../rangeraptor/standard/StdWorkerState.java | 0 .../standard/besttimes/BestTimes.java | 0 .../BestTimesOnlyStopArrivalsState.java | 0 .../SimpleArrivedAtDestinationCheck.java | 0 .../SimpleBestNumberOfTransfers.java | 0 .../standard/besttimes/UnknownPath.java | 0 .../besttimes/UnknownPathFactory.java | 0 .../configure/StdRangeRaptorConfig.java | 0 .../configure/VerifyRequestIsValid.java | 0 .../debug/DebugStopArrivalsState.java | 0 .../standard/debug/StateDebugger.java | 0 .../heuristics/HeuristicsAdapter.java | 0 .../ArrivedAtDestinationCheck.java | 0 .../internalapi/BestNumberOfTransfers.java | 0 .../DestinationArrivalListener.java | 0 .../internalapi/StopArrivalsState.java | 0 .../stoparrivals/AccessStopArrivalState.java | 0 .../stoparrivals/DefaultStopArrivalState.java | 0 .../stoparrivals/EgressStopArrivalState.java | 0 .../stoparrivals/StdStopArrivals.java | 0 .../stoparrivals/StdStopArrivalsState.java | 0 .../stoparrivals/StopArrivalState.java | 0 .../path/EgressArrivalToPathAdapter.java | 0 .../standard/stoparrivals/view/Access.java | 0 .../view/StopArrivalViewAdapter.java | 0 .../stoparrivals/view/StopsCursor.java | 0 .../standard/stoparrivals/view/Transfer.java | 0 .../standard/stoparrivals/view/Transit.java | 0 .../IntArraySingleCriteriaArrivals.java | 0 .../support/RouterResultPathAggregator.java | 0 .../support/TimeBasedBoardingSupport.java | 0 .../transit/AccessEgressFunctions.java | 0 .../rangeraptor/transit/AccessPaths.java | 0 .../transit/AccessWithPenalty.java | 0 .../rangeraptor/transit/EgressPaths.java | 0 .../transit/EgressWithPenalty.java | 0 .../ForwardRaptorTransitCalculator.java | 0 .../transit/ForwardTimeCalculator.java | 0 .../transit/ForwardTransitCalculator.java | 0 .../transit/RaptorSearchWindowCalculator.java | 0 .../transit/RaptorTransitCalculator.java | 0 .../ReverseRaptorTransitCalculator.java | 0 .../transit/ReverseTimeCalculator.java | 0 .../transit/ReverseTransitCalculator.java | 0 .../rangeraptor/transit/RoundTracker.java | 0 .../transit/SlackProviderAdapter.java | 0 .../rangeraptor/transit/TimeCalculator.java | 0 .../transit/TransitCalculator.java | 0 .../transit/TripScheduleExactMatchSearch.java | 0 .../rangeraptor/transit/TripTimesSearch.java | 0 .../rangeraptor/transit/ViaConnections.java | 0 .../raptor/service/DebugHeuristics.java | 0 .../raptor/service/DefaultStopArrivals.java | 0 .../DestinationNotReachedException.java | 0 .../raptor/service/HeuristicSearchTask.java | 0 .../service/HeuristicToRunResolver.java | 0 .../service/RangeRaptorDynamicSearch.java | 0 .../raptor/spi/BitSetIterator.java | 0 .../raptor/spi/BoardAndAlightTime.java | 0 .../raptor/spi/EmptyBoardOrAlightEvent.java | 0 .../opentripplanner/raptor/spi/Flyweight.java | 0 .../raptor/spi/IntIterator.java | 0 .../raptor/spi/IntIterators.java | 0 .../raptor/spi/RaptorBoardOrAlightEvent.java | 0 .../raptor/spi/RaptorConstants.java | 0 .../spi/RaptorConstrainedBoardingSearch.java | 0 .../raptor/spi/RaptorConstrainedTransfer.java | 0 .../raptor/spi/RaptorCostCalculator.java | 0 .../raptor/spi/RaptorCostConverter.java | 0 .../RaptorPathConstrainedTransferSearch.java | 0 .../raptor/spi/RaptorRoute.java | 0 .../raptor/spi/RaptorSlackProvider.java | 0 .../raptor/spi/RaptorStopNameResolver.java | 0 .../raptor/spi/RaptorTimeTable.java | 0 .../raptor/spi/RaptorTransfer.java | 0 .../raptor/spi/RaptorTransferConstraint.java | 0 .../raptor/spi/RaptorTransitDataProvider.java | 0 .../raptor/spi/RaptorTripPattern.java | 0 .../raptor/spi/RaptorTripSchedule.java | 0 .../spi/RaptorTripScheduleReference.java | 0 .../raptor/spi/RaptorTripScheduleSearch.java | 0 .../raptor/spi/SearchDirection.java | 0 .../raptor/util/CompareIntArrays.java | 0 .../raptor/util/composite/CompositeUtil.java | 0 .../util/paretoset/ParetoComparator.java | 0 .../util/paretoset/ParetoDominance.java | 0 .../raptor/util/paretoset/ParetoSet.java | 0 .../paretoset/ParetoSetEventListener.java | 0 .../ParetoSetEventListenerComposite.java | 0 .../util/paretoset/ParetoSetWithListener.java | 0 .../RaptorAccessEgressToStringParser.java | 0 .../request/TestGroupPriorityCalculator.java | 0 .../raptor/configure/RaptorTestFactory.java | 0 .../raptor/spi/TestSlackProvider.java | 0 .../raptor/RaptorArchitectureTest.java | 0 .../raptor/_data/RaptorTestConstants.java | 0 .../raptor/_data/api/PathUtils.java | 0 .../raptor/_data/api/TestPathBuilder.java | 0 .../_data/api/TestPathBuilderTestRaptor.java | 0 .../raptor/_data/api/TestRaptorPath.java | 0 .../stoparrival/AbstractStopArrival.java | 0 .../raptor/_data/stoparrival/Access.java | 0 ...AndEgressWithOpeningHoursPathTestCase.java | 0 .../_data/stoparrival/BasicPathTestCase.java | 0 .../raptor/_data/stoparrival/Egress.java | 0 .../_data/stoparrival/TestArrivals.java | 0 .../raptor/_data/stoparrival/Transfer.java | 0 .../raptor/_data/stoparrival/Transit.java | 0 .../transit/BoardAlightRestrictions.java | 0 .../_data/transit/TestAccessEgress.java | 0 .../TestConstrainedBoardingSearch.java | 0 .../transit/TestConstrainedTransfer.java | 0 .../_data/transit/TestCostCalculator.java | 0 .../transit/TestRaptorStartOnBoardAccess.java | 0 .../raptor/_data/transit/TestRoute.java | 0 .../raptor/_data/transit/TestTransfer.java | 0 .../_data/transit/TestTransferConstraint.java | 0 .../raptor/_data/transit/TestTransitData.java | 0 .../raptor/_data/transit/TestTripPattern.java | 0 .../_data/transit/TestTripSchedule.java | 0 .../_data/transit/TestTripScheduleSearch.java | 0 .../transit/TestTripScheduleSearchTest.java | 0 .../_data/transit/TestTripScheduleTest.java | 0 .../raptor/_support/arch/ArchComponent.java | 0 .../raptor/_support/arch/Module.java | 0 .../raptor/_support/arch/Package.java | 0 .../AbstractAccessEgressDecoratorTest.java | 0 .../GeneralizedCostRelaxFunctionTest.java | 0 .../RaptorAccessEgressToStringParserTest.java | 0 .../RaptorTripScheduleStopPositionTest.java | 0 .../api/model/RaptorValueFormatterTest.java | 0 .../raptor/api/model/RaptorValueTest.java | 0 .../raptor/api/path/PathTest.java | 0 .../raptor/api/path/RaptorPathTest.java | 0 .../api/request/MultiCriteriaRequestTest.java | 0 .../raptor/api/request/RaptorRequestTest.java | 0 .../raptor/api/request/SearchParamsTest.java | 0 .../RaptorPassThroughViaConnectionTest.java | 0 .../via/RaptorTransferViaConnectionTest.java | 0 .../request/via/RaptorViaLocationTest.java | 0 .../via/RaptorVisitStopViaConnectionTest.java | 0 .../api/view/BoardAndAlightTimeTest.java | 0 .../service/DirectTransitSearchTest.java | 0 .../moduletests/A01_SingleRouteTest.java | 0 .../raptor/moduletests/A04_BoardingTest.java | 0 .../raptor/moduletests/B01_AccessTest.java | 0 .../raptor/moduletests/B02_EgressTest.java | 0 .../moduletests/B03_AccessEgressTest.java | 0 .../B04_AccessEgressBoardingTest.java | 0 ...EgressStopBoardAlightTransferCostTest.java | 0 .../C01_TransferBoardAndAlightSlackTest.java | 0 .../C02_OnStreetTransfersTest.java | 0 ...3_OnBoardArrivalDominateTransfersTest.java | 0 ...SingeRouteBoardAlightRestrictionsTest.java | 0 .../moduletests/D02_EarlyBoardingMatters.java | 0 .../E01_StaySeatedTransferTest.java | 0 .../E02_GuaranteedWalkTransferTest.java | 0 ...E03_NotAllowedConstrainedTransferTest.java | 0 .../moduletests/F01_AccessWithRidesTest.java | 0 .../moduletests/F02_EgressWithRidesTest.java | 0 ...gressWithRidesBoardAndAlightSlackTest.java | 0 ...04_AccessEgressWithRidesNoTransitTest.java | 0 ...5_OnBoardAccessEgressAndTransfersTest.java | 0 ...cessWithRidesMultipleOptimalPathsTest.java | 0 ...ressWithRidesMultipleOptimalPathsTest.java | 0 .../G01_AccessWithOpeningHoursTest.java | 0 .../G02_EgressWithOpeningHoursTest.java | 0 ...ssWithOpeningHoursMultipleOptionsTest.java | 0 ...ssWithOpeningHoursMultipleOptionsTest.java | 0 .../G05_ClosedAccessOpeningHoursTest.java | 0 .../G06_ClosedEgressOpeningHoursTest.java | 0 ..._GuaranteedTransferWithFlexAccessTest.java | 0 .../raptor/moduletests/I01_HeuristicTest.java | 0 .../I02_C2DestinationPruningTest.java | 0 .../moduletests/J01_PassThroughTest.java | 0 .../moduletests/J02_ViaStopSearchTest.java | 0 .../J03_ViaTransferSearchTest.java | 0 .../J04_ViaVisitWithAccessTest.java | 0 .../J05_ViaVisitWithEgressTest.java | 0 ...ransferArrivalAtViaConnectionStopTest.java | 0 .../J07_PassThroughWithTransfersTest.java | 0 ...assThroughWithConstrainedTransferTest.java | 0 .../moduletests/K01_TransitPriorityTest.java | 0 .../K02_TransitPriorityDestinationTest.java | 0 .../L01_TimePenaltyAccessTest.java | 0 .../L01_TimePenaltyEgressTest.java | 0 ...ectTransitWithRoutesWithinRelaxC1Test.java | 0 ...ectTransitWithTripsInSearchWindowTest.java | 0 .../M03_DirectTransitSearchWindowTest.java | 0 .../M04_DirectTransitCostLimitTest.java | 0 ...ectTransitBoardAlightRestrictionsTest.java | 0 .../moduletests/N01_OnBoardAccessTest.java | 0 .../raptor/moduletests/images/F11.svg | 0 .../raptor/moduletests/images/F12.svg | 0 .../moduletests/images/Samples.excalidraw | 0 .../raptor/moduletests/package-info.md | 0 .../moduletests/support/ExpectedList.java | 0 .../support/GroupPriorityCalculatorTest.java | 0 .../support/RaptorModuleTestCase.java | 0 .../support/RaptorModuleTestCaseFactory.java | 0 .../support/RaptorModuleTestConfig.java | 0 .../RaptorModuleTestConfigSetBuilder.java | 0 .../opentripplanner/raptor/package-info.md | 0 .../context/SearchContextTest.java | 0 .../StopArrivalStateParetoSetTest.java | 0 ...thArriveByTransitCriteriaResolverTest.java | 0 .../stop/AccessStopArrivalC2Test.java | 0 .../arrivals/stop/AccessStopArrivalTest.java | 0 ...ArrivalParetoSetComparatorFactoryTest.java | 0 .../stop/StopArrivalFactoryC1Test.java | 0 .../stop/StopArrivalFactoryC2Test.java | 0 .../arrivals/stop/TestStopArivalFactory.java | 0 .../stop/TransferStopArrivalC2Test.java | 0 .../stop/TransferStopArrivalTest.java | 0 .../stop/TransitStopArrivalC2Test.java | 0 .../arrivals/stop/TransitStopArrivalTest.java | 0 .../multicriteria/ride/PatternRideC1Test.java | 0 .../multicriteria/ride/PatternRideC2Test.java | 0 .../path/DestinationArrivalTest.java | 0 .../rangeraptor/path/PathMapperTest.java | 0 .../path/PathParetoSetComparatorsTest.java | 0 .../standard/StdTransferEarlyPruningTest.java | 0 .../SimpleArrivedAtDestinationCheckTest.java | 0 .../standard/besttimes/UnknownPathTest.java | 0 .../IntArraySingleCriteriaArrivalsTest.java | 0 .../transit/AccessEgressFunctionsTest.java | 0 .../rangeraptor/transit/AccessPathsTest.java | 0 .../transit/AccessWithPenaltyTest.java | 0 .../rangeraptor/transit/EgressPathsTest.java | 0 .../transit/EgressWithPenaltyTest.java | 0 .../ForwardRaptorTransitCalculatorTest.java | 0 .../transit/ForwardTimeCalculatorTest.java | 0 .../transit/ForwardTransitCalculatorTest.java | 0 .../RaptorSearchWindowCalculatorTest.java | 0 .../ReverseRaptorTransitCalculatorTest.java | 0 .../transit/ReverseTimeCalculatorTest.java | 0 .../transit/ReverseTransitCalculatorTest.java | 0 .../rangeraptor/transit/RoundTrackerTest.java | 0 .../transit/SlackProviderAdapterTest.java | 0 .../TripScheduleExactMatchSearchTest.java | 0 .../transit/TripTimesSearchTest.java | 0 .../service/HeuristicToRunResolverTest.java | 0 .../raptor/spi/BitSetIteratorTest.java | 0 .../spi/EmptyBoardOrAlightEventTest.java | 0 .../raptor/spi/IntIteratorsTest.java | 0 .../raptor/spi/RaptorCostConverterTest.java | 0 .../raptor/spi/RaptorSlackProviderTest.java | 0 .../raptor/spi/RaptorTripPatternTest.java | 0 .../spi/RaptorTripScheduleReferenceTest.java | 0 .../raptor/spi/RaptorTripScheduleTest.java | 0 .../raptor/util/PathStringBuilderTest.java | 0 .../util/composite/CompositeUtilTest.java | 0 .../util/paretoset/ParetoComparatorTest.java | 0 .../util/paretoset/ParetoDominanceTest.java | 0 .../ParetoSetEventListenerCompositeTest.java | 0 .../paretoset/ParetoSetEventListenerTest.java | 0 .../raptor/util/paretoset/ParetoSetTest.java | 0 .../paretoset/ParetoSetWithMarkerTest.java | 0 .../paretoset/TestParetoSetEventListener.java | 0 .../raptor/util/paretoset/TestVector.java | 0 401 files changed, 83 insertions(+), 65 deletions(-) create mode 100644 raptor/router/pom.xml rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/RaptorService.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/RaptorTimeLine.svg (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/debug/DebugEvent.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/debug/DebugLogger.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/debug/DebugTopic.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/debug/RaptorTimers.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecorator.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/model/DominanceFunction.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/model/GeneralizedCostRelaxFunction.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/model/RaptorStartOnBoardAccess.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/model/RaptorTripScheduleStopPosition.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/model/RaptorValue.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/model/RaptorValueFormatter.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/model/RaptorValueType.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/model/RelaxFunction.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/path/AccessPathLeg.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/path/EgressPathLeg.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/path/PathLeg.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/path/PathStringBuilder.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/path/RaptorPath.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/path/TransferPathLeg.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/path/TransitPathLeg.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/request/DebugRequest.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/request/DebugRequestBuilder.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/request/DynamicSearchWindowCoefficients.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequest.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/request/Optimization.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/request/RaptorEnvironment.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/request/RaptorProfile.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/request/RaptorRequest.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/request/RaptorRequestBuilder.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/request/RaptorTransitGroupPriorityCalculator.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/request/RaptorTuningParameters.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/request/SearchParams.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/request/SearchParamsBuilder.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/request/via/AbstractViaLocationBuilder.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/request/via/PassThroughLocationBuilder.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/request/via/RaptorPassThroughViaConnection.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/request/via/RaptorTransferViaConnection.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/request/via/RaptorViaLocation.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/request/via/RaptorVisitStopViaConnection.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/request/via/ViaConnection.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/request/via/ViaVisitLocationBuilder.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/response/RaptorResponse.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/response/StopArrivals.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/view/AccessPathView.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/view/ArrivalView.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/view/EgressPathView.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/view/PathLegType.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/view/PatternRideView.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/view/TransitArrival.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/api/view/TransitPathView.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/configure/RaptorConfig.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/extensions/direct/api/RaptorDirectTransitRequest.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/extensions/direct/api/RaptorDirectTransitRequestBuilder.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/extensions/direct/configure/DirectTransitSearchFactory.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/extensions/direct/service/DirectTransitSearch.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/extensions/extrasearch/ExtraMcRouterSearch.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/package.md (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/path/Path.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/path/PathBuilder.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/path/PathBuilderLeg.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/CompositeResult.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/ConcurrentCompositeRaptorRouter.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/RangeRaptor.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/RangeRaptorWorkerComposite.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/SystemErrDebugLogger.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContext.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextBuilder.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextViaSegments.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/AbstractDebugHandlerAdapter.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerFactory.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerPathAdapter.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerPatternRideAdapter.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerStopArrivalAdapter.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/ParetoSetDebugHandlerAdapter.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/DebugHandler.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/HeuristicAtStop.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/Heuristics.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/OnTripAccessArrival.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/OnTripAccessArrivals.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/ParetoSetCost.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/ParetoSetTime.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RangeRaptorWorker.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorRouter.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorRouterResult.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorWorkerState.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RoutingStrategy.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/SingleCriteriaStopArrivals.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/SlackProvider.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/WorkerLifeCycle.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/lifecycle/LifeCycleEventPublisher.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/lifecycle/LifeCycleSubscriptions.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McRangeRaptorWorkerState.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McRaptorRouterResult.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/MultiCriteriaRoutingStrategy.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ViaConnectionStopArrivalEventListener.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/CalculateTransferToDestination.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/DebugStopArrivalsStatistics.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/McArrivalsEventListenerFactory.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/McStopArrivals.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/StopsWithArriveByTransitCriteriaResolver.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/AbstractStopArrivalC2.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/AccessStopArrival.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/AccessStopArrivalC2.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/ArrivalParetoSetComparatorFactory.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/McStopArrival.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/McStopArrivalFactory.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/StopArrivalFactoryC1.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/StopArrivalFactoryC2.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransferStopArrival.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransferStopArrivalC2.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransitStopArrival.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransitStopArrivalC2.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/configure/McRangeRaptorConfig.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/heuristic/HeuristicsProvider.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/AbstractPatternRide.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideC1.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideC2.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideFactory.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/TransitGroupPriorityRideFactory.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/path/BoardAndAlightTimeSearch.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrival.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalPaths.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/path/ForwardPathMapper.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/path/PathMapper.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/path/PathParetoSetComparators.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/path/ReversePathMapper.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/path/configure/PathConfig.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/ArrivalTimeRoutingStrategy.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/MinTravelDurationRoutingStrategy.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdRangeRaptorWorkerState.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdRaptorRouterResult.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdTransferEarlyPruning.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdWorkerState.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/BestTimes.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/BestTimesOnlyStopArrivalsState.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleArrivedAtDestinationCheck.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleBestNumberOfTransfers.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/UnknownPath.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/UnknownPathFactory.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/configure/StdRangeRaptorConfig.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/configure/VerifyRequestIsValid.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/debug/DebugStopArrivalsState.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/debug/StateDebugger.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/heuristics/HeuristicsAdapter.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/ArrivedAtDestinationCheck.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/BestNumberOfTransfers.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/DestinationArrivalListener.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/StopArrivalsState.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/AccessStopArrivalState.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/DefaultStopArrivalState.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/EgressStopArrivalState.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StdStopArrivals.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StdStopArrivalsState.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StopArrivalState.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/path/EgressArrivalToPathAdapter.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Access.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/StopArrivalViewAdapter.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/StopsCursor.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Transfer.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Transit.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/support/IntArraySingleCriteriaArrivals.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/support/RouterResultPathAggregator.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/support/TimeBasedBoardingSupport.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctions.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPaths.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculator.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTimeCalculator.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTransitCalculator.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorSearchWindowCalculator.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorTransitCalculator.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculator.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTimeCalculator.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTransitCalculator.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RoundTracker.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/SlackProviderAdapter.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TimeCalculator.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TransitCalculator.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripScheduleExactMatchSearch.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearch.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ViaConnections.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/service/DebugHeuristics.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/service/DefaultStopArrivals.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/service/DestinationNotReachedException.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/service/HeuristicSearchTask.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/service/HeuristicToRunResolver.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/service/RangeRaptorDynamicSearch.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/spi/BitSetIterator.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/spi/BoardAndAlightTime.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/spi/EmptyBoardOrAlightEvent.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/spi/Flyweight.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/spi/IntIterator.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/spi/IntIterators.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/spi/RaptorBoardOrAlightEvent.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/spi/RaptorConstants.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/spi/RaptorConstrainedBoardingSearch.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/spi/RaptorConstrainedTransfer.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/spi/RaptorCostCalculator.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/spi/RaptorCostConverter.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/spi/RaptorPathConstrainedTransferSearch.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/spi/RaptorRoute.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/spi/RaptorSlackProvider.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/spi/RaptorStopNameResolver.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/spi/RaptorTimeTable.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/spi/RaptorTransfer.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/spi/RaptorTransferConstraint.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/spi/RaptorTransitDataProvider.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/spi/RaptorTripPattern.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/spi/RaptorTripSchedule.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/spi/RaptorTripScheduleReference.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/spi/RaptorTripScheduleSearch.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/spi/SearchDirection.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/util/CompareIntArrays.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/util/composite/CompositeUtil.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoComparator.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoDominance.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSet.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListener.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerComposite.java (100%) rename raptor/{ => router}/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetWithListener.java (100%) rename raptor/{ => router}/src/test-fixtures/java/org/opentripplanner/raptor/api/model/RaptorAccessEgressToStringParser.java (100%) rename raptor/{ => router}/src/test-fixtures/java/org/opentripplanner/raptor/api/request/TestGroupPriorityCalculator.java (100%) rename raptor/{ => router}/src/test-fixtures/java/org/opentripplanner/raptor/configure/RaptorTestFactory.java (100%) rename raptor/{ => router}/src/test-fixtures/java/org/opentripplanner/raptor/spi/TestSlackProvider.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/RaptorArchitectureTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/RaptorTestConstants.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/api/PathUtils.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilder.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilderTestRaptor.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/api/TestRaptorPath.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/stoparrival/AbstractStopArrival.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Access.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/stoparrival/AccessAndEgressWithOpeningHoursPathTestCase.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/stoparrival/BasicPathTestCase.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Egress.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/stoparrival/TestArrivals.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Transfer.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Transit.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/transit/BoardAlightRestrictions.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedBoardingSearch.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedTransfer.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/transit/TestCostCalculator.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/transit/TestRaptorStartOnBoardAccess.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/transit/TestRoute.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransfer.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransferConstraint.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransitData.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripPattern.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripSchedule.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripScheduleSearch.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripScheduleSearchTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripScheduleTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_support/arch/ArchComponent.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_support/arch/Module.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/_support/arch/Package.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecoratorTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/api/model/GeneralizedCostRelaxFunctionTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/api/model/RaptorAccessEgressToStringParserTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/api/model/RaptorTripScheduleStopPositionTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/api/model/RaptorValueFormatterTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/api/model/RaptorValueTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/api/path/PathTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/api/path/RaptorPathTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequestTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/api/request/RaptorRequestTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/api/request/SearchParamsTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/api/request/via/RaptorPassThroughViaConnectionTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/api/request/via/RaptorTransferViaConnectionTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/api/request/via/RaptorViaLocationTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/api/request/via/RaptorVisitStopViaConnectionTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/api/view/BoardAndAlightTimeTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/extensions/direct/service/DirectTransitSearchTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/A01_SingleRouteTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/A04_BoardingTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/B01_AccessTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/B02_EgressTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/B03_AccessEgressTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/B04_AccessEgressBoardingTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/B05_EgressStopBoardAlightTransferCostTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/C01_TransferBoardAndAlightSlackTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/C02_OnStreetTransfersTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/C03_OnBoardArrivalDominateTransfersTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/D01_SingeRouteBoardAlightRestrictionsTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/D02_EarlyBoardingMatters.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/E01_StaySeatedTransferTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/E02_GuaranteedWalkTransferTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/E03_NotAllowedConstrainedTransferTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/F01_AccessWithRidesTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/F02_EgressWithRidesTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/F03_AccessEgressWithRidesBoardAndAlightSlackTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/F04_AccessEgressWithRidesNoTransitTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/F05_OnBoardAccessEgressAndTransfersTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/F11_AccessWithRidesMultipleOptimalPathsTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/F12_EgressWithRidesMultipleOptimalPathsTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/G01_AccessWithOpeningHoursTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/G02_EgressWithOpeningHoursTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/G03_AccessWithOpeningHoursMultipleOptionsTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/G04_EgressWithOpeningHoursMultipleOptionsTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/G05_ClosedAccessOpeningHoursTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/G06_ClosedEgressOpeningHoursTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/H11_GuaranteedTransferWithFlexAccessTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/I01_HeuristicTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/I02_C2DestinationPruningTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/J01_PassThroughTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/J02_ViaStopSearchTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/J03_ViaTransferSearchTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/J04_ViaVisitWithAccessTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/J05_ViaVisitWithEgressTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/J06_TransitAndTransferArrivalAtViaConnectionStopTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/J07_PassThroughWithTransfersTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/J08_PassThroughWithConstrainedTransferTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/K01_TransitPriorityTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/K02_TransitPriorityDestinationTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyAccessTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyEgressTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/M01_DirectTransitWithRoutesWithinRelaxC1Test.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/M02_DirectTransitWithTripsInSearchWindowTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/M03_DirectTransitSearchWindowTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/M04_DirectTransitCostLimitTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/M05_DirectTransitBoardAlightRestrictionsTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/N01_OnBoardAccessTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/images/F11.svg (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/images/F12.svg (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/images/Samples.excalidraw (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/package-info.md (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/support/ExpectedList.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/support/GroupPriorityCalculatorTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestCase.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestCaseFactory.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestConfig.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestConfigSetBuilder.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/package-info.md (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/StopArrivalStateParetoSetTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/StopsWithArriveByTransitCriteriaResolverTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/AccessStopArrivalC2Test.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/AccessStopArrivalTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/ArrivalParetoSetComparatorFactoryTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/StopArrivalFactoryC1Test.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/StopArrivalFactoryC2Test.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TestStopArivalFactory.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransferStopArrivalC2Test.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransferStopArrivalTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransitStopArrivalC2Test.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransitStopArrivalTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideC1Test.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideC2Test.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/path/PathMapperTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/path/PathParetoSetComparatorsTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/standard/StdTransferEarlyPruningTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleArrivedAtDestinationCheckTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/UnknownPathTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/support/IntArraySingleCriteriaArrivalsTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctionsTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenaltyTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPathsTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenaltyTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculatorTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTimeCalculatorTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTransitCalculatorTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorSearchWindowCalculatorTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculatorTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTimeCalculatorTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTransitCalculatorTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/RoundTrackerTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/SlackProviderAdapterTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/TripScheduleExactMatchSearchTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearchTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/service/HeuristicToRunResolverTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/spi/BitSetIteratorTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/spi/EmptyBoardOrAlightEventTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/spi/IntIteratorsTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/spi/RaptorCostConverterTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/spi/RaptorSlackProviderTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/spi/RaptorTripPatternTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/spi/RaptorTripScheduleReferenceTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/spi/RaptorTripScheduleTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/util/PathStringBuilderTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/util/composite/CompositeUtilTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoComparatorTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoDominanceTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerCompositeTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetWithMarkerTest.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/util/paretoset/TestParetoSetEventListener.java (100%) rename raptor/{ => router}/src/test/java/org/opentripplanner/raptor/util/paretoset/TestVector.java (100%) diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md index 746c6d6aa7d..47df80c4682 100644 --- a/ARCHITECTURE.md +++ b/ARCHITECTURE.md @@ -54,7 +54,7 @@ Used to import NeTEx transit data files. ### Transit Routing -#### [Raptor Transit Routing](raptor/src/main/java/org/opentripplanner/raptor/package.md) +#### [Raptor Transit Routing](raptor/router/src/main/java/org/opentripplanner/raptor/package.md) This is the OTP2 new transit routing engine implemented using the Raptor algorithm. It explains how Raptor works, the important concepts and the design. It might be worth reading even if you are not a @@ -70,11 +70,11 @@ quality. OTP provides transit data to Raptor by implementing the _raptor/spi_. The [RoutingService](application/src/main/java/org/opentripplanner/routing/service/DefaultRoutingService.java) is responsible for mapping from the OTP context to a -[RaptorRequest](raptor/src/main/java/org/opentripplanner/raptor/api/request/RaptorRequest.java) and -then mapping the result, -[Raptor Path](raptor/src/main/java/org/opentripplanner/raptor/api/path/RaptorPath.java), back to the -OTP internal domain. This might seem like a lot of unnecessary mapping, but mapping is simple - -routing is not. +[RaptorRequest](raptor/router/src/main/java/org/opentripplanner/raptor/api/request/RaptorRequest.java) +and then mapping the result, +[Raptor Path](raptor/router/src/main/java/org/opentripplanner/raptor/api/path/RaptorPath.java), back +to the OTP internal domain. This might seem like a lot of unnecessary mapping, but mapping is +simple - routing is not. The performance of Raptor is important, and we care about every millisecond. All changes to the existing Raptor code should be tested with the diff --git a/CLAUDE.md b/CLAUDE.md index 3d9f7c76a86..706faac2699 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -80,9 +80,8 @@ Multi-module Maven project (root `pom.xml` ``): - **utils**: low-level utilities shared by all modules - **domain-core**: core domain primitives (`org.opentripplanner.core`) — `FeedScopedId`, `Cost`, `Distance`, `I18NString`, `Accessibility`, plus framework (deduplicator, DI, resources) -- **raptor**: transit routing engine — `raptor/src/main/java/org/opentripplanner/raptor/`. Isolated: - **zero dependencies on OTP code** (only utilities). Performance-critical; data is supplied via the - SPI in `raptor/spi`. +- **raptor**: transit routing engine — `raptor/router/src`. Isolated: **zero dependencies on OTP + code** (only utilities). Performance-critical; data is supplied via the SPI in `raptor/spi`. - **astar**: generic A\* shortest-path engine — `astar/src/main/java/org/opentripplanner/astar/` (`AStar`, `AStarBuilder`, `spi/`, `strategy/`, `model/`) - **street**: street graph model, linking and search — @@ -98,7 +97,7 @@ Multi-module Maven project (root `pom.xml` ``): ### Key Components -**Transit Routing (Raptor)** — `raptor/src/main/java/org/opentripplanner/raptor/` +**Transit Routing (Raptor)** — `raptor/router/src` - Range Raptor with multi-criteria pareto-optimal search; isolated from OTP (data supplied via SPI in `raptor/spi`). Test all changes with SpeedTest (see Performance Testing). diff --git a/application/pom.xml b/application/pom.xml index 3189df0011e..d853b1a8ec3 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -25,7 +25,7 @@ ${project.groupId} - raptor + raptor-router ${project.version} diff --git a/raptor/pom.xml b/raptor/pom.xml index a08de319d08..b478be081a3 100644 --- a/raptor/pom.xml +++ b/raptor/pom.xml @@ -9,60 +9,11 @@ 2.11.0-SNAPSHOT - raptor + raptor-root OpenTripPlanner - Raptor + pom - - - - com.diffplug.spotless - spotless-maven-plugin - - - - - - - - - ${project.groupId} - utils - ${project.version} - - - - - - - com.google.code.findbugs - jsr305 - - - net.sf.trove4j - trove4j - - - - org.slf4j - slf4j-api - - - - - - org.junit.jupiter - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-params - test - - - com.tngtech.archunit - archunit - test - - + + router + diff --git a/raptor/router/pom.xml b/raptor/router/pom.xml new file mode 100644 index 00000000000..c93bf4e3b87 --- /dev/null +++ b/raptor/router/pom.xml @@ -0,0 +1,68 @@ + + + 4.0.0 + + org.opentripplanner + raptor-root + 2.11.0-SNAPSHOT + + + raptor-router + OpenTripPlanner - Raptor Router + + + + + com.diffplug.spotless + spotless-maven-plugin + + + + + + + + + ${project.groupId} + utils + ${project.version} + + + + + + + com.google.code.findbugs + jsr305 + + + net.sf.trove4j + trove4j + + + + org.slf4j + slf4j-api + + + + + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-params + test + + + com.tngtech.archunit + archunit + test + + + diff --git a/raptor/src/main/java/org/opentripplanner/raptor/RaptorService.java b/raptor/router/src/main/java/org/opentripplanner/raptor/RaptorService.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/RaptorService.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/RaptorService.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/RaptorTimeLine.svg b/raptor/router/src/main/java/org/opentripplanner/raptor/RaptorTimeLine.svg similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/RaptorTimeLine.svg rename to raptor/router/src/main/java/org/opentripplanner/raptor/RaptorTimeLine.svg diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/debug/DebugEvent.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/debug/DebugEvent.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/debug/DebugEvent.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/debug/DebugEvent.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/debug/DebugLogger.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/debug/DebugLogger.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/debug/DebugLogger.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/debug/DebugLogger.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/debug/DebugTopic.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/debug/DebugTopic.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/debug/DebugTopic.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/debug/DebugTopic.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/debug/RaptorTimers.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/debug/RaptorTimers.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/debug/RaptorTimers.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/debug/RaptorTimers.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecorator.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecorator.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecorator.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecorator.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/model/DominanceFunction.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/model/DominanceFunction.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/model/DominanceFunction.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/model/DominanceFunction.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/model/GeneralizedCostRelaxFunction.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/model/GeneralizedCostRelaxFunction.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/model/GeneralizedCostRelaxFunction.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/model/GeneralizedCostRelaxFunction.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/model/RaptorStartOnBoardAccess.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/model/RaptorStartOnBoardAccess.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/model/RaptorStartOnBoardAccess.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/model/RaptorStartOnBoardAccess.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/model/RaptorTripScheduleStopPosition.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/model/RaptorTripScheduleStopPosition.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/model/RaptorTripScheduleStopPosition.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/model/RaptorTripScheduleStopPosition.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/model/RaptorValue.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/model/RaptorValue.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/model/RaptorValue.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/model/RaptorValue.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/model/RaptorValueFormatter.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/model/RaptorValueFormatter.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/model/RaptorValueFormatter.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/model/RaptorValueFormatter.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/model/RaptorValueType.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/model/RaptorValueType.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/model/RaptorValueType.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/model/RaptorValueType.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/model/RelaxFunction.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/model/RelaxFunction.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/model/RelaxFunction.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/model/RelaxFunction.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/path/AccessPathLeg.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/path/AccessPathLeg.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/path/AccessPathLeg.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/path/AccessPathLeg.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/path/EgressPathLeg.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/path/EgressPathLeg.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/path/EgressPathLeg.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/path/EgressPathLeg.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/path/PathLeg.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/path/PathLeg.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/path/PathLeg.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/path/PathLeg.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/path/PathStringBuilder.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/path/PathStringBuilder.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/path/PathStringBuilder.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/path/PathStringBuilder.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/path/RaptorPath.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/path/RaptorPath.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/path/RaptorPath.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/path/RaptorPath.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/path/TransferPathLeg.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/path/TransferPathLeg.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/path/TransferPathLeg.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/path/TransferPathLeg.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/path/TransitPathLeg.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/path/TransitPathLeg.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/path/TransitPathLeg.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/path/TransitPathLeg.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/request/DebugRequest.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/request/DebugRequest.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/request/DebugRequest.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/request/DebugRequest.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/request/DebugRequestBuilder.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/request/DebugRequestBuilder.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/request/DebugRequestBuilder.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/request/DebugRequestBuilder.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/request/DynamicSearchWindowCoefficients.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/request/DynamicSearchWindowCoefficients.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/request/DynamicSearchWindowCoefficients.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/request/DynamicSearchWindowCoefficients.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequest.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequest.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequest.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequest.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/request/Optimization.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/request/Optimization.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/request/Optimization.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/request/Optimization.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/request/RaptorEnvironment.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/request/RaptorEnvironment.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/request/RaptorEnvironment.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/request/RaptorEnvironment.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/request/RaptorProfile.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/request/RaptorProfile.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/request/RaptorProfile.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/request/RaptorProfile.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/request/RaptorRequest.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/request/RaptorRequest.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/request/RaptorRequest.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/request/RaptorRequest.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/request/RaptorRequestBuilder.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/request/RaptorRequestBuilder.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/request/RaptorRequestBuilder.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/request/RaptorRequestBuilder.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/request/RaptorTransitGroupPriorityCalculator.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/request/RaptorTransitGroupPriorityCalculator.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/request/RaptorTransitGroupPriorityCalculator.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/request/RaptorTransitGroupPriorityCalculator.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/request/RaptorTuningParameters.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/request/RaptorTuningParameters.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/request/RaptorTuningParameters.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/request/RaptorTuningParameters.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/request/SearchParams.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/request/SearchParams.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/request/SearchParams.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/request/SearchParams.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/request/SearchParamsBuilder.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/request/SearchParamsBuilder.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/request/SearchParamsBuilder.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/request/SearchParamsBuilder.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/request/via/AbstractViaLocationBuilder.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/request/via/AbstractViaLocationBuilder.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/request/via/AbstractViaLocationBuilder.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/request/via/AbstractViaLocationBuilder.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/request/via/PassThroughLocationBuilder.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/request/via/PassThroughLocationBuilder.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/request/via/PassThroughLocationBuilder.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/request/via/PassThroughLocationBuilder.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/request/via/RaptorPassThroughViaConnection.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/request/via/RaptorPassThroughViaConnection.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/request/via/RaptorPassThroughViaConnection.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/request/via/RaptorPassThroughViaConnection.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/request/via/RaptorTransferViaConnection.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/request/via/RaptorTransferViaConnection.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/request/via/RaptorTransferViaConnection.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/request/via/RaptorTransferViaConnection.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/request/via/RaptorViaLocation.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/request/via/RaptorViaLocation.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/request/via/RaptorViaLocation.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/request/via/RaptorViaLocation.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/request/via/RaptorVisitStopViaConnection.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/request/via/RaptorVisitStopViaConnection.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/request/via/RaptorVisitStopViaConnection.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/request/via/RaptorVisitStopViaConnection.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/request/via/ViaConnection.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/request/via/ViaConnection.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/request/via/ViaConnection.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/request/via/ViaConnection.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/request/via/ViaVisitLocationBuilder.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/request/via/ViaVisitLocationBuilder.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/request/via/ViaVisitLocationBuilder.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/request/via/ViaVisitLocationBuilder.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/response/RaptorResponse.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/response/RaptorResponse.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/response/RaptorResponse.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/response/RaptorResponse.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/response/StopArrivals.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/response/StopArrivals.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/response/StopArrivals.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/response/StopArrivals.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/view/AccessPathView.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/view/AccessPathView.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/view/AccessPathView.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/view/AccessPathView.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/view/ArrivalView.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/view/ArrivalView.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/view/ArrivalView.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/view/ArrivalView.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/view/EgressPathView.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/view/EgressPathView.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/view/EgressPathView.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/view/EgressPathView.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/view/PathLegType.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/view/PathLegType.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/view/PathLegType.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/view/PathLegType.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/view/PatternRideView.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/view/PatternRideView.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/view/PatternRideView.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/view/PatternRideView.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/view/TransitArrival.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/view/TransitArrival.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/view/TransitArrival.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/view/TransitArrival.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/api/view/TransitPathView.java b/raptor/router/src/main/java/org/opentripplanner/raptor/api/view/TransitPathView.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/api/view/TransitPathView.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/api/view/TransitPathView.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/configure/RaptorConfig.java b/raptor/router/src/main/java/org/opentripplanner/raptor/configure/RaptorConfig.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/configure/RaptorConfig.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/configure/RaptorConfig.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/extensions/direct/api/RaptorDirectTransitRequest.java b/raptor/router/src/main/java/org/opentripplanner/raptor/extensions/direct/api/RaptorDirectTransitRequest.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/extensions/direct/api/RaptorDirectTransitRequest.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/extensions/direct/api/RaptorDirectTransitRequest.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/extensions/direct/api/RaptorDirectTransitRequestBuilder.java b/raptor/router/src/main/java/org/opentripplanner/raptor/extensions/direct/api/RaptorDirectTransitRequestBuilder.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/extensions/direct/api/RaptorDirectTransitRequestBuilder.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/extensions/direct/api/RaptorDirectTransitRequestBuilder.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/extensions/direct/configure/DirectTransitSearchFactory.java b/raptor/router/src/main/java/org/opentripplanner/raptor/extensions/direct/configure/DirectTransitSearchFactory.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/extensions/direct/configure/DirectTransitSearchFactory.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/extensions/direct/configure/DirectTransitSearchFactory.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/extensions/direct/service/DirectTransitSearch.java b/raptor/router/src/main/java/org/opentripplanner/raptor/extensions/direct/service/DirectTransitSearch.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/extensions/direct/service/DirectTransitSearch.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/extensions/direct/service/DirectTransitSearch.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/extensions/extrasearch/ExtraMcRouterSearch.java b/raptor/router/src/main/java/org/opentripplanner/raptor/extensions/extrasearch/ExtraMcRouterSearch.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/extensions/extrasearch/ExtraMcRouterSearch.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/extensions/extrasearch/ExtraMcRouterSearch.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/package.md b/raptor/router/src/main/java/org/opentripplanner/raptor/package.md similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/package.md rename to raptor/router/src/main/java/org/opentripplanner/raptor/package.md diff --git a/raptor/src/main/java/org/opentripplanner/raptor/path/Path.java b/raptor/router/src/main/java/org/opentripplanner/raptor/path/Path.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/path/Path.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/path/Path.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/path/PathBuilder.java b/raptor/router/src/main/java/org/opentripplanner/raptor/path/PathBuilder.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/path/PathBuilder.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/path/PathBuilder.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/path/PathBuilderLeg.java b/raptor/router/src/main/java/org/opentripplanner/raptor/path/PathBuilderLeg.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/path/PathBuilderLeg.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/path/PathBuilderLeg.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/CompositeResult.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/CompositeResult.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/CompositeResult.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/CompositeResult.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/ConcurrentCompositeRaptorRouter.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/ConcurrentCompositeRaptorRouter.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/ConcurrentCompositeRaptorRouter.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/ConcurrentCompositeRaptorRouter.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/RangeRaptor.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/RangeRaptor.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/RangeRaptor.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/RangeRaptor.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/RangeRaptorWorkerComposite.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/RangeRaptorWorkerComposite.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/RangeRaptorWorkerComposite.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/RangeRaptorWorkerComposite.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/SystemErrDebugLogger.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/SystemErrDebugLogger.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/SystemErrDebugLogger.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/SystemErrDebugLogger.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContext.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContext.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContext.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContext.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextBuilder.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextBuilder.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextBuilder.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextBuilder.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextViaSegments.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextViaSegments.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextViaSegments.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextViaSegments.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/AbstractDebugHandlerAdapter.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/AbstractDebugHandlerAdapter.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/AbstractDebugHandlerAdapter.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/AbstractDebugHandlerAdapter.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerFactory.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerFactory.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerFactory.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerFactory.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerPathAdapter.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerPathAdapter.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerPathAdapter.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerPathAdapter.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerPatternRideAdapter.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerPatternRideAdapter.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerPatternRideAdapter.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerPatternRideAdapter.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerStopArrivalAdapter.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerStopArrivalAdapter.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerStopArrivalAdapter.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/DebugHandlerStopArrivalAdapter.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/ParetoSetDebugHandlerAdapter.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/ParetoSetDebugHandlerAdapter.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/ParetoSetDebugHandlerAdapter.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/debug/ParetoSetDebugHandlerAdapter.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/DebugHandler.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/DebugHandler.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/DebugHandler.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/DebugHandler.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/HeuristicAtStop.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/HeuristicAtStop.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/HeuristicAtStop.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/HeuristicAtStop.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/Heuristics.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/Heuristics.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/Heuristics.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/Heuristics.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/OnTripAccessArrival.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/OnTripAccessArrival.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/OnTripAccessArrival.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/OnTripAccessArrival.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/OnTripAccessArrivals.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/OnTripAccessArrivals.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/OnTripAccessArrivals.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/OnTripAccessArrivals.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/ParetoSetCost.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/ParetoSetCost.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/ParetoSetCost.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/ParetoSetCost.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/ParetoSetTime.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/ParetoSetTime.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/ParetoSetTime.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/ParetoSetTime.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RangeRaptorWorker.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RangeRaptorWorker.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RangeRaptorWorker.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RangeRaptorWorker.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorRouter.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorRouter.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorRouter.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorRouter.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorRouterResult.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorRouterResult.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorRouterResult.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorRouterResult.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorWorkerState.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorWorkerState.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorWorkerState.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RaptorWorkerState.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RoutingStrategy.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RoutingStrategy.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RoutingStrategy.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/RoutingStrategy.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/SingleCriteriaStopArrivals.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/SingleCriteriaStopArrivals.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/SingleCriteriaStopArrivals.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/SingleCriteriaStopArrivals.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/SlackProvider.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/SlackProvider.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/SlackProvider.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/SlackProvider.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/WorkerLifeCycle.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/WorkerLifeCycle.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/WorkerLifeCycle.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/internalapi/WorkerLifeCycle.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/lifecycle/LifeCycleEventPublisher.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/lifecycle/LifeCycleEventPublisher.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/lifecycle/LifeCycleEventPublisher.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/lifecycle/LifeCycleEventPublisher.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/lifecycle/LifeCycleSubscriptions.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/lifecycle/LifeCycleSubscriptions.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/lifecycle/LifeCycleSubscriptions.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/lifecycle/LifeCycleSubscriptions.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McRangeRaptorWorkerState.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McRangeRaptorWorkerState.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McRangeRaptorWorkerState.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McRangeRaptorWorkerState.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McRaptorRouterResult.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McRaptorRouterResult.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McRaptorRouterResult.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McRaptorRouterResult.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/MultiCriteriaRoutingStrategy.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/MultiCriteriaRoutingStrategy.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/MultiCriteriaRoutingStrategy.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/MultiCriteriaRoutingStrategy.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ViaConnectionStopArrivalEventListener.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ViaConnectionStopArrivalEventListener.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ViaConnectionStopArrivalEventListener.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ViaConnectionStopArrivalEventListener.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/CalculateTransferToDestination.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/CalculateTransferToDestination.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/CalculateTransferToDestination.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/CalculateTransferToDestination.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/DebugStopArrivalsStatistics.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/DebugStopArrivalsStatistics.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/DebugStopArrivalsStatistics.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/DebugStopArrivalsStatistics.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/McArrivalsEventListenerFactory.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/McArrivalsEventListenerFactory.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/McArrivalsEventListenerFactory.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/McArrivalsEventListenerFactory.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/McStopArrivals.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/McStopArrivals.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/McStopArrivals.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/McStopArrivals.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/StopsWithArriveByTransitCriteriaResolver.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/StopsWithArriveByTransitCriteriaResolver.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/StopsWithArriveByTransitCriteriaResolver.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/StopsWithArriveByTransitCriteriaResolver.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/AbstractStopArrivalC2.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/AbstractStopArrivalC2.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/AbstractStopArrivalC2.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/AbstractStopArrivalC2.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/AccessStopArrival.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/AccessStopArrival.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/AccessStopArrival.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/AccessStopArrival.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/AccessStopArrivalC2.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/AccessStopArrivalC2.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/AccessStopArrivalC2.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/AccessStopArrivalC2.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/ArrivalParetoSetComparatorFactory.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/ArrivalParetoSetComparatorFactory.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/ArrivalParetoSetComparatorFactory.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/ArrivalParetoSetComparatorFactory.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/McStopArrival.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/McStopArrival.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/McStopArrival.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/McStopArrival.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/McStopArrivalFactory.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/McStopArrivalFactory.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/McStopArrivalFactory.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/McStopArrivalFactory.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/StopArrivalFactoryC1.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/StopArrivalFactoryC1.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/StopArrivalFactoryC1.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/StopArrivalFactoryC1.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/StopArrivalFactoryC2.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/StopArrivalFactoryC2.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/StopArrivalFactoryC2.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/StopArrivalFactoryC2.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransferStopArrival.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransferStopArrival.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransferStopArrival.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransferStopArrival.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransferStopArrivalC2.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransferStopArrivalC2.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransferStopArrivalC2.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransferStopArrivalC2.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransitStopArrival.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransitStopArrival.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransitStopArrival.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransitStopArrival.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransitStopArrivalC2.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransitStopArrivalC2.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransitStopArrivalC2.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransitStopArrivalC2.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/configure/McRangeRaptorConfig.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/configure/McRangeRaptorConfig.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/configure/McRangeRaptorConfig.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/configure/McRangeRaptorConfig.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/heuristic/HeuristicsProvider.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/heuristic/HeuristicsProvider.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/heuristic/HeuristicsProvider.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/heuristic/HeuristicsProvider.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/AbstractPatternRide.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/AbstractPatternRide.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/AbstractPatternRide.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/AbstractPatternRide.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideC1.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideC1.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideC1.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideC1.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideC2.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideC2.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideC2.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideC2.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideFactory.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideFactory.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideFactory.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideFactory.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/TransitGroupPriorityRideFactory.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/TransitGroupPriorityRideFactory.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/TransitGroupPriorityRideFactory.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/TransitGroupPriorityRideFactory.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/path/BoardAndAlightTimeSearch.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/path/BoardAndAlightTimeSearch.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/path/BoardAndAlightTimeSearch.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/path/BoardAndAlightTimeSearch.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrival.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrival.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrival.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrival.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalPaths.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalPaths.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalPaths.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalPaths.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/path/ForwardPathMapper.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/path/ForwardPathMapper.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/path/ForwardPathMapper.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/path/ForwardPathMapper.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/path/PathMapper.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/path/PathMapper.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/path/PathMapper.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/path/PathMapper.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/path/PathParetoSetComparators.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/path/PathParetoSetComparators.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/path/PathParetoSetComparators.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/path/PathParetoSetComparators.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/path/ReversePathMapper.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/path/ReversePathMapper.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/path/ReversePathMapper.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/path/ReversePathMapper.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/path/configure/PathConfig.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/path/configure/PathConfig.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/path/configure/PathConfig.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/path/configure/PathConfig.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/ArrivalTimeRoutingStrategy.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/ArrivalTimeRoutingStrategy.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/ArrivalTimeRoutingStrategy.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/ArrivalTimeRoutingStrategy.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/MinTravelDurationRoutingStrategy.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/MinTravelDurationRoutingStrategy.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/MinTravelDurationRoutingStrategy.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/MinTravelDurationRoutingStrategy.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdRangeRaptorWorkerState.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdRangeRaptorWorkerState.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdRangeRaptorWorkerState.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdRangeRaptorWorkerState.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdRaptorRouterResult.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdRaptorRouterResult.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdRaptorRouterResult.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdRaptorRouterResult.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdTransferEarlyPruning.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdTransferEarlyPruning.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdTransferEarlyPruning.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdTransferEarlyPruning.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdWorkerState.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdWorkerState.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdWorkerState.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/StdWorkerState.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/BestTimes.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/BestTimes.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/BestTimes.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/BestTimes.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/BestTimesOnlyStopArrivalsState.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/BestTimesOnlyStopArrivalsState.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/BestTimesOnlyStopArrivalsState.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/BestTimesOnlyStopArrivalsState.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleArrivedAtDestinationCheck.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleArrivedAtDestinationCheck.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleArrivedAtDestinationCheck.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleArrivedAtDestinationCheck.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleBestNumberOfTransfers.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleBestNumberOfTransfers.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleBestNumberOfTransfers.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleBestNumberOfTransfers.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/UnknownPath.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/UnknownPath.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/UnknownPath.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/UnknownPath.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/UnknownPathFactory.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/UnknownPathFactory.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/UnknownPathFactory.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/UnknownPathFactory.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/configure/StdRangeRaptorConfig.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/configure/StdRangeRaptorConfig.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/configure/StdRangeRaptorConfig.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/configure/StdRangeRaptorConfig.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/configure/VerifyRequestIsValid.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/configure/VerifyRequestIsValid.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/configure/VerifyRequestIsValid.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/configure/VerifyRequestIsValid.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/debug/DebugStopArrivalsState.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/debug/DebugStopArrivalsState.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/debug/DebugStopArrivalsState.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/debug/DebugStopArrivalsState.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/debug/StateDebugger.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/debug/StateDebugger.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/debug/StateDebugger.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/debug/StateDebugger.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/heuristics/HeuristicsAdapter.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/heuristics/HeuristicsAdapter.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/heuristics/HeuristicsAdapter.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/heuristics/HeuristicsAdapter.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/ArrivedAtDestinationCheck.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/ArrivedAtDestinationCheck.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/ArrivedAtDestinationCheck.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/ArrivedAtDestinationCheck.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/BestNumberOfTransfers.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/BestNumberOfTransfers.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/BestNumberOfTransfers.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/BestNumberOfTransfers.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/DestinationArrivalListener.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/DestinationArrivalListener.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/DestinationArrivalListener.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/DestinationArrivalListener.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/StopArrivalsState.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/StopArrivalsState.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/StopArrivalsState.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/internalapi/StopArrivalsState.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/AccessStopArrivalState.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/AccessStopArrivalState.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/AccessStopArrivalState.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/AccessStopArrivalState.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/DefaultStopArrivalState.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/DefaultStopArrivalState.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/DefaultStopArrivalState.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/DefaultStopArrivalState.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/EgressStopArrivalState.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/EgressStopArrivalState.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/EgressStopArrivalState.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/EgressStopArrivalState.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StdStopArrivals.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StdStopArrivals.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StdStopArrivals.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StdStopArrivals.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StdStopArrivalsState.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StdStopArrivalsState.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StdStopArrivalsState.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StdStopArrivalsState.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StopArrivalState.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StopArrivalState.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StopArrivalState.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/StopArrivalState.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/path/EgressArrivalToPathAdapter.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/path/EgressArrivalToPathAdapter.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/path/EgressArrivalToPathAdapter.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/path/EgressArrivalToPathAdapter.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Access.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Access.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Access.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Access.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/StopArrivalViewAdapter.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/StopArrivalViewAdapter.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/StopArrivalViewAdapter.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/StopArrivalViewAdapter.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/StopsCursor.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/StopsCursor.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/StopsCursor.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/StopsCursor.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Transfer.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Transfer.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Transfer.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Transfer.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Transit.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Transit.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Transit.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/standard/stoparrivals/view/Transit.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/support/IntArraySingleCriteriaArrivals.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/support/IntArraySingleCriteriaArrivals.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/support/IntArraySingleCriteriaArrivals.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/support/IntArraySingleCriteriaArrivals.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/support/RouterResultPathAggregator.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/support/RouterResultPathAggregator.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/support/RouterResultPathAggregator.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/support/RouterResultPathAggregator.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/support/TimeBasedBoardingSupport.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/support/TimeBasedBoardingSupport.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/support/TimeBasedBoardingSupport.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/support/TimeBasedBoardingSupport.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctions.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctions.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctions.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctions.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPaths.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPaths.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPaths.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPaths.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculator.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculator.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculator.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculator.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTimeCalculator.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTimeCalculator.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTimeCalculator.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTimeCalculator.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTransitCalculator.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTransitCalculator.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTransitCalculator.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTransitCalculator.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorSearchWindowCalculator.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorSearchWindowCalculator.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorSearchWindowCalculator.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorSearchWindowCalculator.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorTransitCalculator.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorTransitCalculator.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorTransitCalculator.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorTransitCalculator.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculator.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculator.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculator.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculator.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTimeCalculator.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTimeCalculator.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTimeCalculator.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTimeCalculator.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTransitCalculator.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTransitCalculator.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTransitCalculator.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTransitCalculator.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RoundTracker.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RoundTracker.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RoundTracker.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RoundTracker.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/SlackProviderAdapter.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/SlackProviderAdapter.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/SlackProviderAdapter.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/SlackProviderAdapter.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TimeCalculator.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TimeCalculator.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TimeCalculator.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TimeCalculator.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TransitCalculator.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TransitCalculator.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TransitCalculator.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TransitCalculator.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripScheduleExactMatchSearch.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripScheduleExactMatchSearch.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripScheduleExactMatchSearch.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripScheduleExactMatchSearch.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearch.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearch.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearch.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearch.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ViaConnections.java b/raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ViaConnections.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ViaConnections.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ViaConnections.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/service/DebugHeuristics.java b/raptor/router/src/main/java/org/opentripplanner/raptor/service/DebugHeuristics.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/service/DebugHeuristics.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/service/DebugHeuristics.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/service/DefaultStopArrivals.java b/raptor/router/src/main/java/org/opentripplanner/raptor/service/DefaultStopArrivals.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/service/DefaultStopArrivals.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/service/DefaultStopArrivals.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/service/DestinationNotReachedException.java b/raptor/router/src/main/java/org/opentripplanner/raptor/service/DestinationNotReachedException.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/service/DestinationNotReachedException.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/service/DestinationNotReachedException.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/service/HeuristicSearchTask.java b/raptor/router/src/main/java/org/opentripplanner/raptor/service/HeuristicSearchTask.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/service/HeuristicSearchTask.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/service/HeuristicSearchTask.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/service/HeuristicToRunResolver.java b/raptor/router/src/main/java/org/opentripplanner/raptor/service/HeuristicToRunResolver.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/service/HeuristicToRunResolver.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/service/HeuristicToRunResolver.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/service/RangeRaptorDynamicSearch.java b/raptor/router/src/main/java/org/opentripplanner/raptor/service/RangeRaptorDynamicSearch.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/service/RangeRaptorDynamicSearch.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/service/RangeRaptorDynamicSearch.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/spi/BitSetIterator.java b/raptor/router/src/main/java/org/opentripplanner/raptor/spi/BitSetIterator.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/spi/BitSetIterator.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/spi/BitSetIterator.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/spi/BoardAndAlightTime.java b/raptor/router/src/main/java/org/opentripplanner/raptor/spi/BoardAndAlightTime.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/spi/BoardAndAlightTime.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/spi/BoardAndAlightTime.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/spi/EmptyBoardOrAlightEvent.java b/raptor/router/src/main/java/org/opentripplanner/raptor/spi/EmptyBoardOrAlightEvent.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/spi/EmptyBoardOrAlightEvent.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/spi/EmptyBoardOrAlightEvent.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/spi/Flyweight.java b/raptor/router/src/main/java/org/opentripplanner/raptor/spi/Flyweight.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/spi/Flyweight.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/spi/Flyweight.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/spi/IntIterator.java b/raptor/router/src/main/java/org/opentripplanner/raptor/spi/IntIterator.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/spi/IntIterator.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/spi/IntIterator.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/spi/IntIterators.java b/raptor/router/src/main/java/org/opentripplanner/raptor/spi/IntIterators.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/spi/IntIterators.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/spi/IntIterators.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorBoardOrAlightEvent.java b/raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorBoardOrAlightEvent.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorBoardOrAlightEvent.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorBoardOrAlightEvent.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorConstants.java b/raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorConstants.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorConstants.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorConstants.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorConstrainedBoardingSearch.java b/raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorConstrainedBoardingSearch.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorConstrainedBoardingSearch.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorConstrainedBoardingSearch.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorConstrainedTransfer.java b/raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorConstrainedTransfer.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorConstrainedTransfer.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorConstrainedTransfer.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorCostCalculator.java b/raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorCostCalculator.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorCostCalculator.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorCostCalculator.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorCostConverter.java b/raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorCostConverter.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorCostConverter.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorCostConverter.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorPathConstrainedTransferSearch.java b/raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorPathConstrainedTransferSearch.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorPathConstrainedTransferSearch.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorPathConstrainedTransferSearch.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorRoute.java b/raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorRoute.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorRoute.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorRoute.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorSlackProvider.java b/raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorSlackProvider.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorSlackProvider.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorSlackProvider.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorStopNameResolver.java b/raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorStopNameResolver.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorStopNameResolver.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorStopNameResolver.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorTimeTable.java b/raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorTimeTable.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorTimeTable.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorTimeTable.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorTransfer.java b/raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorTransfer.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorTransfer.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorTransfer.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorTransferConstraint.java b/raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorTransferConstraint.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorTransferConstraint.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorTransferConstraint.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorTransitDataProvider.java b/raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorTransitDataProvider.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorTransitDataProvider.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorTransitDataProvider.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorTripPattern.java b/raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorTripPattern.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorTripPattern.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorTripPattern.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorTripSchedule.java b/raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorTripSchedule.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorTripSchedule.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorTripSchedule.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorTripScheduleReference.java b/raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorTripScheduleReference.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorTripScheduleReference.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorTripScheduleReference.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorTripScheduleSearch.java b/raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorTripScheduleSearch.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/spi/RaptorTripScheduleSearch.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/spi/RaptorTripScheduleSearch.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/spi/SearchDirection.java b/raptor/router/src/main/java/org/opentripplanner/raptor/spi/SearchDirection.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/spi/SearchDirection.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/spi/SearchDirection.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/util/CompareIntArrays.java b/raptor/router/src/main/java/org/opentripplanner/raptor/util/CompareIntArrays.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/util/CompareIntArrays.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/util/CompareIntArrays.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/util/composite/CompositeUtil.java b/raptor/router/src/main/java/org/opentripplanner/raptor/util/composite/CompositeUtil.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/util/composite/CompositeUtil.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/util/composite/CompositeUtil.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoComparator.java b/raptor/router/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoComparator.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoComparator.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoComparator.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoDominance.java b/raptor/router/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoDominance.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoDominance.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoDominance.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSet.java b/raptor/router/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSet.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSet.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSet.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListener.java b/raptor/router/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListener.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListener.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListener.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerComposite.java b/raptor/router/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerComposite.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerComposite.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerComposite.java diff --git a/raptor/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetWithListener.java b/raptor/router/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetWithListener.java similarity index 100% rename from raptor/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetWithListener.java rename to raptor/router/src/main/java/org/opentripplanner/raptor/util/paretoset/ParetoSetWithListener.java diff --git a/raptor/src/test-fixtures/java/org/opentripplanner/raptor/api/model/RaptorAccessEgressToStringParser.java b/raptor/router/src/test-fixtures/java/org/opentripplanner/raptor/api/model/RaptorAccessEgressToStringParser.java similarity index 100% rename from raptor/src/test-fixtures/java/org/opentripplanner/raptor/api/model/RaptorAccessEgressToStringParser.java rename to raptor/router/src/test-fixtures/java/org/opentripplanner/raptor/api/model/RaptorAccessEgressToStringParser.java diff --git a/raptor/src/test-fixtures/java/org/opentripplanner/raptor/api/request/TestGroupPriorityCalculator.java b/raptor/router/src/test-fixtures/java/org/opentripplanner/raptor/api/request/TestGroupPriorityCalculator.java similarity index 100% rename from raptor/src/test-fixtures/java/org/opentripplanner/raptor/api/request/TestGroupPriorityCalculator.java rename to raptor/router/src/test-fixtures/java/org/opentripplanner/raptor/api/request/TestGroupPriorityCalculator.java diff --git a/raptor/src/test-fixtures/java/org/opentripplanner/raptor/configure/RaptorTestFactory.java b/raptor/router/src/test-fixtures/java/org/opentripplanner/raptor/configure/RaptorTestFactory.java similarity index 100% rename from raptor/src/test-fixtures/java/org/opentripplanner/raptor/configure/RaptorTestFactory.java rename to raptor/router/src/test-fixtures/java/org/opentripplanner/raptor/configure/RaptorTestFactory.java diff --git a/raptor/src/test-fixtures/java/org/opentripplanner/raptor/spi/TestSlackProvider.java b/raptor/router/src/test-fixtures/java/org/opentripplanner/raptor/spi/TestSlackProvider.java similarity index 100% rename from raptor/src/test-fixtures/java/org/opentripplanner/raptor/spi/TestSlackProvider.java rename to raptor/router/src/test-fixtures/java/org/opentripplanner/raptor/spi/TestSlackProvider.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/RaptorArchitectureTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/RaptorArchitectureTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/RaptorArchitectureTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/RaptorArchitectureTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/RaptorTestConstants.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/RaptorTestConstants.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/RaptorTestConstants.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/RaptorTestConstants.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/api/PathUtils.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/api/PathUtils.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/api/PathUtils.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/api/PathUtils.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilder.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilder.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilder.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilder.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilderTestRaptor.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilderTestRaptor.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilderTestRaptor.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilderTestRaptor.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/api/TestRaptorPath.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/api/TestRaptorPath.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/api/TestRaptorPath.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/api/TestRaptorPath.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/stoparrival/AbstractStopArrival.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/stoparrival/AbstractStopArrival.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/stoparrival/AbstractStopArrival.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/stoparrival/AbstractStopArrival.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Access.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Access.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Access.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Access.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/stoparrival/AccessAndEgressWithOpeningHoursPathTestCase.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/stoparrival/AccessAndEgressWithOpeningHoursPathTestCase.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/stoparrival/AccessAndEgressWithOpeningHoursPathTestCase.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/stoparrival/AccessAndEgressWithOpeningHoursPathTestCase.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/stoparrival/BasicPathTestCase.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/stoparrival/BasicPathTestCase.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/stoparrival/BasicPathTestCase.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/stoparrival/BasicPathTestCase.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Egress.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Egress.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Egress.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Egress.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/stoparrival/TestArrivals.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/stoparrival/TestArrivals.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/stoparrival/TestArrivals.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/stoparrival/TestArrivals.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Transfer.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Transfer.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Transfer.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Transfer.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Transit.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Transit.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Transit.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/stoparrival/Transit.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/transit/BoardAlightRestrictions.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/BoardAlightRestrictions.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/transit/BoardAlightRestrictions.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/BoardAlightRestrictions.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedBoardingSearch.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedBoardingSearch.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedBoardingSearch.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedBoardingSearch.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedTransfer.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedTransfer.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedTransfer.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestConstrainedTransfer.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestCostCalculator.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestCostCalculator.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestCostCalculator.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestCostCalculator.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestRaptorStartOnBoardAccess.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestRaptorStartOnBoardAccess.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestRaptorStartOnBoardAccess.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestRaptorStartOnBoardAccess.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestRoute.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestRoute.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestRoute.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestRoute.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransfer.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransfer.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransfer.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransfer.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransferConstraint.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransferConstraint.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransferConstraint.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransferConstraint.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransitData.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransitData.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransitData.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransitData.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripPattern.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripPattern.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripPattern.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripPattern.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripSchedule.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripSchedule.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripSchedule.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripSchedule.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripScheduleSearch.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripScheduleSearch.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripScheduleSearch.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripScheduleSearch.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripScheduleSearchTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripScheduleSearchTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripScheduleSearchTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripScheduleSearchTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripScheduleTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripScheduleTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripScheduleTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_data/transit/TestTripScheduleTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_support/arch/ArchComponent.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_support/arch/ArchComponent.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_support/arch/ArchComponent.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_support/arch/ArchComponent.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_support/arch/Module.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_support/arch/Module.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_support/arch/Module.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_support/arch/Module.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/_support/arch/Package.java b/raptor/router/src/test/java/org/opentripplanner/raptor/_support/arch/Package.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/_support/arch/Package.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/_support/arch/Package.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecoratorTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecoratorTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecoratorTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecoratorTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/api/model/GeneralizedCostRelaxFunctionTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/api/model/GeneralizedCostRelaxFunctionTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/api/model/GeneralizedCostRelaxFunctionTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/api/model/GeneralizedCostRelaxFunctionTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/api/model/RaptorAccessEgressToStringParserTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/api/model/RaptorAccessEgressToStringParserTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/api/model/RaptorAccessEgressToStringParserTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/api/model/RaptorAccessEgressToStringParserTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/api/model/RaptorTripScheduleStopPositionTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/api/model/RaptorTripScheduleStopPositionTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/api/model/RaptorTripScheduleStopPositionTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/api/model/RaptorTripScheduleStopPositionTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/api/model/RaptorValueFormatterTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/api/model/RaptorValueFormatterTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/api/model/RaptorValueFormatterTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/api/model/RaptorValueFormatterTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/api/model/RaptorValueTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/api/model/RaptorValueTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/api/model/RaptorValueTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/api/model/RaptorValueTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/api/path/PathTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/api/path/PathTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/api/path/PathTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/api/path/PathTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/api/path/RaptorPathTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/api/path/RaptorPathTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/api/path/RaptorPathTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/api/path/RaptorPathTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequestTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequestTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequestTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequestTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/api/request/RaptorRequestTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/api/request/RaptorRequestTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/api/request/RaptorRequestTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/api/request/RaptorRequestTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/api/request/SearchParamsTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/api/request/SearchParamsTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/api/request/SearchParamsTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/api/request/SearchParamsTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/api/request/via/RaptorPassThroughViaConnectionTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/api/request/via/RaptorPassThroughViaConnectionTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/api/request/via/RaptorPassThroughViaConnectionTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/api/request/via/RaptorPassThroughViaConnectionTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/api/request/via/RaptorTransferViaConnectionTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/api/request/via/RaptorTransferViaConnectionTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/api/request/via/RaptorTransferViaConnectionTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/api/request/via/RaptorTransferViaConnectionTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/api/request/via/RaptorViaLocationTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/api/request/via/RaptorViaLocationTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/api/request/via/RaptorViaLocationTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/api/request/via/RaptorViaLocationTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/api/request/via/RaptorVisitStopViaConnectionTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/api/request/via/RaptorVisitStopViaConnectionTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/api/request/via/RaptorVisitStopViaConnectionTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/api/request/via/RaptorVisitStopViaConnectionTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/api/view/BoardAndAlightTimeTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/api/view/BoardAndAlightTimeTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/api/view/BoardAndAlightTimeTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/api/view/BoardAndAlightTimeTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/extensions/direct/service/DirectTransitSearchTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/extensions/direct/service/DirectTransitSearchTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/extensions/direct/service/DirectTransitSearchTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/extensions/direct/service/DirectTransitSearchTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/A01_SingleRouteTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/A01_SingleRouteTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/A01_SingleRouteTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/A01_SingleRouteTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/A04_BoardingTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/A04_BoardingTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/A04_BoardingTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/A04_BoardingTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/B01_AccessTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/B01_AccessTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/B01_AccessTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/B01_AccessTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/B02_EgressTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/B02_EgressTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/B02_EgressTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/B02_EgressTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/B03_AccessEgressTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/B03_AccessEgressTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/B03_AccessEgressTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/B03_AccessEgressTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/B04_AccessEgressBoardingTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/B04_AccessEgressBoardingTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/B04_AccessEgressBoardingTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/B04_AccessEgressBoardingTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/B05_EgressStopBoardAlightTransferCostTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/B05_EgressStopBoardAlightTransferCostTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/B05_EgressStopBoardAlightTransferCostTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/B05_EgressStopBoardAlightTransferCostTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/C01_TransferBoardAndAlightSlackTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/C01_TransferBoardAndAlightSlackTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/C01_TransferBoardAndAlightSlackTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/C01_TransferBoardAndAlightSlackTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/C02_OnStreetTransfersTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/C02_OnStreetTransfersTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/C02_OnStreetTransfersTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/C02_OnStreetTransfersTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/C03_OnBoardArrivalDominateTransfersTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/C03_OnBoardArrivalDominateTransfersTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/C03_OnBoardArrivalDominateTransfersTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/C03_OnBoardArrivalDominateTransfersTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/D01_SingeRouteBoardAlightRestrictionsTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/D01_SingeRouteBoardAlightRestrictionsTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/D01_SingeRouteBoardAlightRestrictionsTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/D01_SingeRouteBoardAlightRestrictionsTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/D02_EarlyBoardingMatters.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/D02_EarlyBoardingMatters.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/D02_EarlyBoardingMatters.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/D02_EarlyBoardingMatters.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/E01_StaySeatedTransferTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/E01_StaySeatedTransferTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/E01_StaySeatedTransferTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/E01_StaySeatedTransferTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/E02_GuaranteedWalkTransferTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/E02_GuaranteedWalkTransferTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/E02_GuaranteedWalkTransferTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/E02_GuaranteedWalkTransferTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/E03_NotAllowedConstrainedTransferTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/E03_NotAllowedConstrainedTransferTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/E03_NotAllowedConstrainedTransferTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/E03_NotAllowedConstrainedTransferTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/F01_AccessWithRidesTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/F01_AccessWithRidesTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/F01_AccessWithRidesTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/F01_AccessWithRidesTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/F02_EgressWithRidesTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/F02_EgressWithRidesTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/F02_EgressWithRidesTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/F02_EgressWithRidesTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/F03_AccessEgressWithRidesBoardAndAlightSlackTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/F03_AccessEgressWithRidesBoardAndAlightSlackTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/F03_AccessEgressWithRidesBoardAndAlightSlackTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/F03_AccessEgressWithRidesBoardAndAlightSlackTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/F04_AccessEgressWithRidesNoTransitTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/F04_AccessEgressWithRidesNoTransitTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/F04_AccessEgressWithRidesNoTransitTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/F04_AccessEgressWithRidesNoTransitTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/F05_OnBoardAccessEgressAndTransfersTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/F05_OnBoardAccessEgressAndTransfersTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/F05_OnBoardAccessEgressAndTransfersTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/F05_OnBoardAccessEgressAndTransfersTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/F11_AccessWithRidesMultipleOptimalPathsTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/F11_AccessWithRidesMultipleOptimalPathsTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/F11_AccessWithRidesMultipleOptimalPathsTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/F11_AccessWithRidesMultipleOptimalPathsTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/F12_EgressWithRidesMultipleOptimalPathsTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/F12_EgressWithRidesMultipleOptimalPathsTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/F12_EgressWithRidesMultipleOptimalPathsTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/F12_EgressWithRidesMultipleOptimalPathsTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/G01_AccessWithOpeningHoursTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/G01_AccessWithOpeningHoursTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/G01_AccessWithOpeningHoursTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/G01_AccessWithOpeningHoursTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/G02_EgressWithOpeningHoursTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/G02_EgressWithOpeningHoursTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/G02_EgressWithOpeningHoursTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/G02_EgressWithOpeningHoursTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/G03_AccessWithOpeningHoursMultipleOptionsTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/G03_AccessWithOpeningHoursMultipleOptionsTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/G03_AccessWithOpeningHoursMultipleOptionsTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/G03_AccessWithOpeningHoursMultipleOptionsTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/G04_EgressWithOpeningHoursMultipleOptionsTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/G04_EgressWithOpeningHoursMultipleOptionsTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/G04_EgressWithOpeningHoursMultipleOptionsTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/G04_EgressWithOpeningHoursMultipleOptionsTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/G05_ClosedAccessOpeningHoursTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/G05_ClosedAccessOpeningHoursTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/G05_ClosedAccessOpeningHoursTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/G05_ClosedAccessOpeningHoursTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/G06_ClosedEgressOpeningHoursTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/G06_ClosedEgressOpeningHoursTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/G06_ClosedEgressOpeningHoursTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/G06_ClosedEgressOpeningHoursTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/H11_GuaranteedTransferWithFlexAccessTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/H11_GuaranteedTransferWithFlexAccessTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/H11_GuaranteedTransferWithFlexAccessTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/H11_GuaranteedTransferWithFlexAccessTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/I01_HeuristicTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/I01_HeuristicTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/I01_HeuristicTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/I01_HeuristicTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/I02_C2DestinationPruningTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/I02_C2DestinationPruningTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/I02_C2DestinationPruningTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/I02_C2DestinationPruningTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/J01_PassThroughTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/J01_PassThroughTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/J01_PassThroughTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/J01_PassThroughTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/J02_ViaStopSearchTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/J02_ViaStopSearchTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/J02_ViaStopSearchTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/J02_ViaStopSearchTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/J03_ViaTransferSearchTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/J03_ViaTransferSearchTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/J03_ViaTransferSearchTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/J03_ViaTransferSearchTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/J04_ViaVisitWithAccessTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/J04_ViaVisitWithAccessTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/J04_ViaVisitWithAccessTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/J04_ViaVisitWithAccessTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/J05_ViaVisitWithEgressTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/J05_ViaVisitWithEgressTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/J05_ViaVisitWithEgressTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/J05_ViaVisitWithEgressTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/J06_TransitAndTransferArrivalAtViaConnectionStopTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/J06_TransitAndTransferArrivalAtViaConnectionStopTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/J06_TransitAndTransferArrivalAtViaConnectionStopTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/J06_TransitAndTransferArrivalAtViaConnectionStopTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/J07_PassThroughWithTransfersTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/J07_PassThroughWithTransfersTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/J07_PassThroughWithTransfersTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/J07_PassThroughWithTransfersTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/J08_PassThroughWithConstrainedTransferTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/J08_PassThroughWithConstrainedTransferTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/J08_PassThroughWithConstrainedTransferTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/J08_PassThroughWithConstrainedTransferTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/K01_TransitPriorityTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/K01_TransitPriorityTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/K01_TransitPriorityTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/K01_TransitPriorityTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/K02_TransitPriorityDestinationTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/K02_TransitPriorityDestinationTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/K02_TransitPriorityDestinationTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/K02_TransitPriorityDestinationTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyAccessTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyAccessTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyAccessTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyAccessTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyEgressTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyEgressTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyEgressTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyEgressTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/M01_DirectTransitWithRoutesWithinRelaxC1Test.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/M01_DirectTransitWithRoutesWithinRelaxC1Test.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/M01_DirectTransitWithRoutesWithinRelaxC1Test.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/M01_DirectTransitWithRoutesWithinRelaxC1Test.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/M02_DirectTransitWithTripsInSearchWindowTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/M02_DirectTransitWithTripsInSearchWindowTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/M02_DirectTransitWithTripsInSearchWindowTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/M02_DirectTransitWithTripsInSearchWindowTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/M03_DirectTransitSearchWindowTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/M03_DirectTransitSearchWindowTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/M03_DirectTransitSearchWindowTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/M03_DirectTransitSearchWindowTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/M04_DirectTransitCostLimitTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/M04_DirectTransitCostLimitTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/M04_DirectTransitCostLimitTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/M04_DirectTransitCostLimitTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/M05_DirectTransitBoardAlightRestrictionsTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/M05_DirectTransitBoardAlightRestrictionsTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/M05_DirectTransitBoardAlightRestrictionsTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/M05_DirectTransitBoardAlightRestrictionsTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/N01_OnBoardAccessTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/N01_OnBoardAccessTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/N01_OnBoardAccessTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/N01_OnBoardAccessTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/images/F11.svg b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/images/F11.svg similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/images/F11.svg rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/images/F11.svg diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/images/F12.svg b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/images/F12.svg similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/images/F12.svg rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/images/F12.svg diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/images/Samples.excalidraw b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/images/Samples.excalidraw similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/images/Samples.excalidraw rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/images/Samples.excalidraw diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/package-info.md b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/package-info.md similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/package-info.md rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/package-info.md diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/support/ExpectedList.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/support/ExpectedList.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/support/ExpectedList.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/support/ExpectedList.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/support/GroupPriorityCalculatorTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/support/GroupPriorityCalculatorTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/support/GroupPriorityCalculatorTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/support/GroupPriorityCalculatorTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestCase.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestCase.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestCase.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestCase.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestCaseFactory.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestCaseFactory.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestCaseFactory.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestCaseFactory.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestConfig.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestConfig.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestConfig.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestConfig.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestConfigSetBuilder.java b/raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestConfigSetBuilder.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestConfigSetBuilder.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/moduletests/support/RaptorModuleTestConfigSetBuilder.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/package-info.md b/raptor/router/src/test/java/org/opentripplanner/raptor/package-info.md similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/package-info.md rename to raptor/router/src/test/java/org/opentripplanner/raptor/package-info.md diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/context/SearchContextTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/StopArrivalStateParetoSetTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/StopArrivalStateParetoSetTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/StopArrivalStateParetoSetTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/StopArrivalStateParetoSetTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/StopsWithArriveByTransitCriteriaResolverTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/StopsWithArriveByTransitCriteriaResolverTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/StopsWithArriveByTransitCriteriaResolverTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/StopsWithArriveByTransitCriteriaResolverTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/AccessStopArrivalC2Test.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/AccessStopArrivalC2Test.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/AccessStopArrivalC2Test.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/AccessStopArrivalC2Test.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/AccessStopArrivalTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/AccessStopArrivalTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/AccessStopArrivalTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/AccessStopArrivalTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/ArrivalParetoSetComparatorFactoryTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/ArrivalParetoSetComparatorFactoryTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/ArrivalParetoSetComparatorFactoryTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/ArrivalParetoSetComparatorFactoryTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/StopArrivalFactoryC1Test.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/StopArrivalFactoryC1Test.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/StopArrivalFactoryC1Test.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/StopArrivalFactoryC1Test.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/StopArrivalFactoryC2Test.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/StopArrivalFactoryC2Test.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/StopArrivalFactoryC2Test.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/StopArrivalFactoryC2Test.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TestStopArivalFactory.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TestStopArivalFactory.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TestStopArivalFactory.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TestStopArivalFactory.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransferStopArrivalC2Test.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransferStopArrivalC2Test.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransferStopArrivalC2Test.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransferStopArrivalC2Test.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransferStopArrivalTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransferStopArrivalTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransferStopArrivalTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransferStopArrivalTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransitStopArrivalC2Test.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransitStopArrivalC2Test.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransitStopArrivalC2Test.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransitStopArrivalC2Test.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransitStopArrivalTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransitStopArrivalTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransitStopArrivalTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/arrivals/stop/TransitStopArrivalTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideC1Test.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideC1Test.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideC1Test.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideC1Test.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideC2Test.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideC2Test.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideC2Test.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/PatternRideC2Test.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/path/PathMapperTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/path/PathMapperTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/path/PathMapperTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/path/PathMapperTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/path/PathParetoSetComparatorsTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/path/PathParetoSetComparatorsTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/path/PathParetoSetComparatorsTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/path/PathParetoSetComparatorsTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/standard/StdTransferEarlyPruningTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/standard/StdTransferEarlyPruningTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/standard/StdTransferEarlyPruningTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/standard/StdTransferEarlyPruningTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleArrivedAtDestinationCheckTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleArrivedAtDestinationCheckTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleArrivedAtDestinationCheckTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/SimpleArrivedAtDestinationCheckTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/UnknownPathTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/UnknownPathTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/UnknownPathTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/standard/besttimes/UnknownPathTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/support/IntArraySingleCriteriaArrivalsTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/support/IntArraySingleCriteriaArrivalsTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/support/IntArraySingleCriteriaArrivalsTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/support/IntArraySingleCriteriaArrivalsTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctionsTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctionsTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctionsTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctionsTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenaltyTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenaltyTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenaltyTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenaltyTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPathsTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPathsTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPathsTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPathsTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenaltyTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenaltyTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenaltyTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenaltyTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculatorTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculatorTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculatorTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculatorTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTimeCalculatorTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTimeCalculatorTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTimeCalculatorTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTimeCalculatorTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTransitCalculatorTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTransitCalculatorTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTransitCalculatorTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardTransitCalculatorTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorSearchWindowCalculatorTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorSearchWindowCalculatorTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorSearchWindowCalculatorTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorSearchWindowCalculatorTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculatorTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculatorTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculatorTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculatorTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTimeCalculatorTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTimeCalculatorTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTimeCalculatorTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTimeCalculatorTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTransitCalculatorTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTransitCalculatorTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTransitCalculatorTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseTransitCalculatorTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/RoundTrackerTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/RoundTrackerTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/RoundTrackerTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/RoundTrackerTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/SlackProviderAdapterTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/SlackProviderAdapterTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/SlackProviderAdapterTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/SlackProviderAdapterTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/TripScheduleExactMatchSearchTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/TripScheduleExactMatchSearchTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/TripScheduleExactMatchSearchTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/TripScheduleExactMatchSearchTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearchTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearchTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearchTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/TripTimesSearchTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/service/HeuristicToRunResolverTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/service/HeuristicToRunResolverTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/service/HeuristicToRunResolverTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/service/HeuristicToRunResolverTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/spi/BitSetIteratorTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/spi/BitSetIteratorTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/spi/BitSetIteratorTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/spi/BitSetIteratorTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/spi/EmptyBoardOrAlightEventTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/spi/EmptyBoardOrAlightEventTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/spi/EmptyBoardOrAlightEventTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/spi/EmptyBoardOrAlightEventTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/spi/IntIteratorsTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/spi/IntIteratorsTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/spi/IntIteratorsTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/spi/IntIteratorsTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/spi/RaptorCostConverterTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/spi/RaptorCostConverterTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/spi/RaptorCostConverterTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/spi/RaptorCostConverterTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/spi/RaptorSlackProviderTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/spi/RaptorSlackProviderTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/spi/RaptorSlackProviderTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/spi/RaptorSlackProviderTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/spi/RaptorTripPatternTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/spi/RaptorTripPatternTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/spi/RaptorTripPatternTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/spi/RaptorTripPatternTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/spi/RaptorTripScheduleReferenceTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/spi/RaptorTripScheduleReferenceTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/spi/RaptorTripScheduleReferenceTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/spi/RaptorTripScheduleReferenceTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/spi/RaptorTripScheduleTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/spi/RaptorTripScheduleTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/spi/RaptorTripScheduleTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/spi/RaptorTripScheduleTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/util/PathStringBuilderTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/util/PathStringBuilderTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/util/PathStringBuilderTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/util/PathStringBuilderTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/util/composite/CompositeUtilTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/util/composite/CompositeUtilTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/util/composite/CompositeUtilTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/util/composite/CompositeUtilTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoComparatorTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoComparatorTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoComparatorTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoComparatorTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoDominanceTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoDominanceTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoDominanceTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoDominanceTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerCompositeTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerCompositeTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerCompositeTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerCompositeTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetEventListenerTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetWithMarkerTest.java b/raptor/router/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetWithMarkerTest.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetWithMarkerTest.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/util/paretoset/ParetoSetWithMarkerTest.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/util/paretoset/TestParetoSetEventListener.java b/raptor/router/src/test/java/org/opentripplanner/raptor/util/paretoset/TestParetoSetEventListener.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/util/paretoset/TestParetoSetEventListener.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/util/paretoset/TestParetoSetEventListener.java diff --git a/raptor/src/test/java/org/opentripplanner/raptor/util/paretoset/TestVector.java b/raptor/router/src/test/java/org/opentripplanner/raptor/util/paretoset/TestVector.java similarity index 100% rename from raptor/src/test/java/org/opentripplanner/raptor/util/paretoset/TestVector.java rename to raptor/router/src/test/java/org/opentripplanner/raptor/util/paretoset/TestVector.java From 4d222b717ce288ccd13a5b10f4778f06293dd153 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 10 Sep 2026 17:45:32 +0200 Subject: [PATCH 29/68] refactor: Add empty transit module scaffold No code moved yet - this just wires the module into the build ahead of the transit-domain extraction. --- pom.xml | 1 + transit/pom.xml | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 transit/pom.xml diff --git a/pom.xml b/pom.xml index d190b38db2b..5382222bbc4 100644 --- a/pom.xml +++ b/pom.xml @@ -101,6 +101,7 @@ utils domain-core + transit raptor astar gtfs-realtime-protobuf diff --git a/transit/pom.xml b/transit/pom.xml new file mode 100644 index 00000000000..8d920afc588 --- /dev/null +++ b/transit/pom.xml @@ -0,0 +1,52 @@ + + + 4.0.0 + + org.opentripplanner + otp-root + 2.10.0-SNAPSHOT + + + transit + OpenTripPlanner - Transit + + + + + com.diffplug.spotless + spotless-maven-plugin + + + + + + + + ${project.groupId} + domain-core + ${project.version} + + + + + org.slf4j + slf4j-api + + + + + org.junit.jupiter + junit-jupiter + ${junit.version} + test + + + com.google.truth + truth + test + + + + From 565cdd80c8aed805a56c56a32114859e17050684 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 17 Sep 2026 17:27:24 +0200 Subject: [PATCH 30/68] Restructure maven modules --- application/pom.xml | 2 +- astar/pom.xml | 2 +- {domain-core => core/domain}/pom.xml | 6 +- .../deduplicator/DeduplicatorNoop.java | 0 .../deduplicator/DeduplicatorService.java | 0 .../framework/di/TransitServicePeriod.java | 0 .../resources/ResourceBundleAdaptor.java | 0 .../resources/ResourceBundleSingleton.java | 0 .../model/accessibility/Accessibility.java | 0 .../core/model/basic/Cost.java | 0 .../core/model/basic/Distance.java | 0 .../core/model/basic/NormalizedCost.java | 0 .../core/model/basic/Ratio.java | 0 .../core/model/doc/DocumentedEnum.java | 0 .../core/model/i18n/I18NString.java | 0 .../core/model/i18n/I18NStringMapper.java | 0 .../core/model/i18n/LocalizedString.java | 0 .../model/i18n/LocalizedStringFormat.java | 0 .../core/model/i18n/NonLocalizedString.java | 0 .../core/model/i18n/TranslatedString.java | 0 .../core/model/id/FeedScopedId.java | 0 .../core/model/time/LocalDateRange.java | 0 .../core/model/time/TimePeriod.java | 0 .../src/main/resources/Message.properties | 0 .../src/main/resources/Message_de.properties | 0 .../src/main/resources/Message_es.properties | 0 .../src/main/resources/Message_fr.properties | 0 .../src/main/resources/Message_hu.properties | 0 .../src/main/resources/Message_nl.properties | 0 .../main/resources/WayProperties.properties | 0 .../resources/WayProperties_de.properties | 0 .../resources/WayProperties_fi.properties | 0 .../resources/WayProperties_fr.properties | 0 .../resources/WayProperties_hu.properties | 0 .../resources/WayProperties_nl.properties | 0 .../resources/WayProperties_no.properties | 0 .../resources/WayProperties_sv.properties | 0 .../src/main/resources/internals.properties | 0 .../main/resources/internals_de.properties | 0 .../main/resources/internals_fi.properties | 0 .../main/resources/internals_fr.properties | 0 .../main/resources/internals_hu.properties | 0 .../main/resources/internals_no.properties | 0 .../main/resources/internals_sv.properties | 0 .../core/model/i18n/I18NStringTest.java | 0 .../core/model/i18n/LocalizedStringTest.java | 0 .../core/model/i18n/TranslatedStringTest.java | 0 .../core/model/id/FeedScopedIdTest.java | 0 .../core/model/time/LocalDateRangeTest.java | 0 .../core/model/time/TimePeriodTest.java | 0 core/framework/pom.xml | 55 +++++++++++++++++++ core/pom.xml | 20 +++++++ gtfs-realtime-protobuf/pom.xml | 2 +- otp-shaded/pom.xml | 2 +- pom.xml | 4 +- raptor/data/pom.xml | 54 ++++++++++++++++++ raptor/pom.xml | 5 +- raptor/router/pom.xml | 2 +- street/pom.xml | 4 +- test/integration/pom.xml | 2 +- transit/pom.xml | 6 +- utils/pom.xml | 2 +- 62 files changed, 149 insertions(+), 19 deletions(-) rename {domain-core => core/domain}/pom.xml (92%) rename {domain-core => core/domain}/src/main/java/org/opentripplanner/core/framework/deduplicator/DeduplicatorNoop.java (100%) rename {domain-core => core/domain}/src/main/java/org/opentripplanner/core/framework/deduplicator/DeduplicatorService.java (100%) rename {domain-core => core/domain}/src/main/java/org/opentripplanner/core/framework/di/TransitServicePeriod.java (100%) rename {domain-core => core/domain}/src/main/java/org/opentripplanner/core/framework/resources/ResourceBundleAdaptor.java (100%) rename {domain-core => core/domain}/src/main/java/org/opentripplanner/core/framework/resources/ResourceBundleSingleton.java (100%) rename {domain-core => core/domain}/src/main/java/org/opentripplanner/core/model/accessibility/Accessibility.java (100%) rename {domain-core => core/domain}/src/main/java/org/opentripplanner/core/model/basic/Cost.java (100%) rename {domain-core => core/domain}/src/main/java/org/opentripplanner/core/model/basic/Distance.java (100%) rename {domain-core => core/domain}/src/main/java/org/opentripplanner/core/model/basic/NormalizedCost.java (100%) rename {domain-core => core/domain}/src/main/java/org/opentripplanner/core/model/basic/Ratio.java (100%) rename {domain-core => core/domain}/src/main/java/org/opentripplanner/core/model/doc/DocumentedEnum.java (100%) rename {domain-core => core/domain}/src/main/java/org/opentripplanner/core/model/i18n/I18NString.java (100%) rename {domain-core => core/domain}/src/main/java/org/opentripplanner/core/model/i18n/I18NStringMapper.java (100%) rename {domain-core => core/domain}/src/main/java/org/opentripplanner/core/model/i18n/LocalizedString.java (100%) rename {domain-core => core/domain}/src/main/java/org/opentripplanner/core/model/i18n/LocalizedStringFormat.java (100%) rename {domain-core => core/domain}/src/main/java/org/opentripplanner/core/model/i18n/NonLocalizedString.java (100%) rename {domain-core => core/domain}/src/main/java/org/opentripplanner/core/model/i18n/TranslatedString.java (100%) rename {domain-core => core/domain}/src/main/java/org/opentripplanner/core/model/id/FeedScopedId.java (100%) rename {domain-core => core/domain}/src/main/java/org/opentripplanner/core/model/time/LocalDateRange.java (100%) rename {domain-core => core/domain}/src/main/java/org/opentripplanner/core/model/time/TimePeriod.java (100%) rename {domain-core => core/domain}/src/main/resources/Message.properties (100%) rename {domain-core => core/domain}/src/main/resources/Message_de.properties (100%) rename {domain-core => core/domain}/src/main/resources/Message_es.properties (100%) rename {domain-core => core/domain}/src/main/resources/Message_fr.properties (100%) rename {domain-core => core/domain}/src/main/resources/Message_hu.properties (100%) rename {domain-core => core/domain}/src/main/resources/Message_nl.properties (100%) rename {domain-core => core/domain}/src/main/resources/WayProperties.properties (100%) rename {domain-core => core/domain}/src/main/resources/WayProperties_de.properties (100%) rename {domain-core => core/domain}/src/main/resources/WayProperties_fi.properties (100%) rename {domain-core => core/domain}/src/main/resources/WayProperties_fr.properties (100%) rename {domain-core => core/domain}/src/main/resources/WayProperties_hu.properties (100%) rename {domain-core => core/domain}/src/main/resources/WayProperties_nl.properties (100%) rename {domain-core => core/domain}/src/main/resources/WayProperties_no.properties (100%) rename {domain-core => core/domain}/src/main/resources/WayProperties_sv.properties (100%) rename {domain-core => core/domain}/src/main/resources/internals.properties (100%) rename {domain-core => core/domain}/src/main/resources/internals_de.properties (100%) rename {domain-core => core/domain}/src/main/resources/internals_fi.properties (100%) rename {domain-core => core/domain}/src/main/resources/internals_fr.properties (100%) rename {domain-core => core/domain}/src/main/resources/internals_hu.properties (100%) rename {domain-core => core/domain}/src/main/resources/internals_no.properties (100%) rename {domain-core => core/domain}/src/main/resources/internals_sv.properties (100%) rename {domain-core => core/domain}/src/test/java/org/opentripplanner/core/model/i18n/I18NStringTest.java (100%) rename {domain-core => core/domain}/src/test/java/org/opentripplanner/core/model/i18n/LocalizedStringTest.java (100%) rename {domain-core => core/domain}/src/test/java/org/opentripplanner/core/model/i18n/TranslatedStringTest.java (100%) rename {domain-core => core/domain}/src/test/java/org/opentripplanner/core/model/id/FeedScopedIdTest.java (100%) rename {domain-core => core/domain}/src/test/java/org/opentripplanner/core/model/time/LocalDateRangeTest.java (100%) rename {domain-core => core/domain}/src/test/java/org/opentripplanner/core/model/time/TimePeriodTest.java (100%) create mode 100644 core/framework/pom.xml create mode 100644 core/pom.xml create mode 100644 raptor/data/pom.xml diff --git a/application/pom.xml b/application/pom.xml index d853b1a8ec3..92435131cba 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.opentripplanner - otp-root + otp 2.11.0-SNAPSHOT application diff --git a/astar/pom.xml b/astar/pom.xml index de67202c39b..575037e281f 100644 --- a/astar/pom.xml +++ b/astar/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.opentripplanner - otp-root + otp 2.11.0-SNAPSHOT diff --git a/domain-core/pom.xml b/core/domain/pom.xml similarity index 92% rename from domain-core/pom.xml rename to core/domain/pom.xml index ff4d933371e..a066bce643e 100644 --- a/domain-core/pom.xml +++ b/core/domain/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.opentripplanner - otp-root + core 2.11.0-SNAPSHOT - domain-core - OpenTripPlanner - Domain Core + core-domain + OpenTripPlanner - Core Domain diff --git a/domain-core/src/main/java/org/opentripplanner/core/framework/deduplicator/DeduplicatorNoop.java b/core/domain/src/main/java/org/opentripplanner/core/framework/deduplicator/DeduplicatorNoop.java similarity index 100% rename from domain-core/src/main/java/org/opentripplanner/core/framework/deduplicator/DeduplicatorNoop.java rename to core/domain/src/main/java/org/opentripplanner/core/framework/deduplicator/DeduplicatorNoop.java diff --git a/domain-core/src/main/java/org/opentripplanner/core/framework/deduplicator/DeduplicatorService.java b/core/domain/src/main/java/org/opentripplanner/core/framework/deduplicator/DeduplicatorService.java similarity index 100% rename from domain-core/src/main/java/org/opentripplanner/core/framework/deduplicator/DeduplicatorService.java rename to core/domain/src/main/java/org/opentripplanner/core/framework/deduplicator/DeduplicatorService.java diff --git a/domain-core/src/main/java/org/opentripplanner/core/framework/di/TransitServicePeriod.java b/core/domain/src/main/java/org/opentripplanner/core/framework/di/TransitServicePeriod.java similarity index 100% rename from domain-core/src/main/java/org/opentripplanner/core/framework/di/TransitServicePeriod.java rename to core/domain/src/main/java/org/opentripplanner/core/framework/di/TransitServicePeriod.java diff --git a/domain-core/src/main/java/org/opentripplanner/core/framework/resources/ResourceBundleAdaptor.java b/core/domain/src/main/java/org/opentripplanner/core/framework/resources/ResourceBundleAdaptor.java similarity index 100% rename from domain-core/src/main/java/org/opentripplanner/core/framework/resources/ResourceBundleAdaptor.java rename to core/domain/src/main/java/org/opentripplanner/core/framework/resources/ResourceBundleAdaptor.java diff --git a/domain-core/src/main/java/org/opentripplanner/core/framework/resources/ResourceBundleSingleton.java b/core/domain/src/main/java/org/opentripplanner/core/framework/resources/ResourceBundleSingleton.java similarity index 100% rename from domain-core/src/main/java/org/opentripplanner/core/framework/resources/ResourceBundleSingleton.java rename to core/domain/src/main/java/org/opentripplanner/core/framework/resources/ResourceBundleSingleton.java diff --git a/domain-core/src/main/java/org/opentripplanner/core/model/accessibility/Accessibility.java b/core/domain/src/main/java/org/opentripplanner/core/model/accessibility/Accessibility.java similarity index 100% rename from domain-core/src/main/java/org/opentripplanner/core/model/accessibility/Accessibility.java rename to core/domain/src/main/java/org/opentripplanner/core/model/accessibility/Accessibility.java diff --git a/domain-core/src/main/java/org/opentripplanner/core/model/basic/Cost.java b/core/domain/src/main/java/org/opentripplanner/core/model/basic/Cost.java similarity index 100% rename from domain-core/src/main/java/org/opentripplanner/core/model/basic/Cost.java rename to core/domain/src/main/java/org/opentripplanner/core/model/basic/Cost.java diff --git a/domain-core/src/main/java/org/opentripplanner/core/model/basic/Distance.java b/core/domain/src/main/java/org/opentripplanner/core/model/basic/Distance.java similarity index 100% rename from domain-core/src/main/java/org/opentripplanner/core/model/basic/Distance.java rename to core/domain/src/main/java/org/opentripplanner/core/model/basic/Distance.java diff --git a/domain-core/src/main/java/org/opentripplanner/core/model/basic/NormalizedCost.java b/core/domain/src/main/java/org/opentripplanner/core/model/basic/NormalizedCost.java similarity index 100% rename from domain-core/src/main/java/org/opentripplanner/core/model/basic/NormalizedCost.java rename to core/domain/src/main/java/org/opentripplanner/core/model/basic/NormalizedCost.java diff --git a/domain-core/src/main/java/org/opentripplanner/core/model/basic/Ratio.java b/core/domain/src/main/java/org/opentripplanner/core/model/basic/Ratio.java similarity index 100% rename from domain-core/src/main/java/org/opentripplanner/core/model/basic/Ratio.java rename to core/domain/src/main/java/org/opentripplanner/core/model/basic/Ratio.java diff --git a/domain-core/src/main/java/org/opentripplanner/core/model/doc/DocumentedEnum.java b/core/domain/src/main/java/org/opentripplanner/core/model/doc/DocumentedEnum.java similarity index 100% rename from domain-core/src/main/java/org/opentripplanner/core/model/doc/DocumentedEnum.java rename to core/domain/src/main/java/org/opentripplanner/core/model/doc/DocumentedEnum.java diff --git a/domain-core/src/main/java/org/opentripplanner/core/model/i18n/I18NString.java b/core/domain/src/main/java/org/opentripplanner/core/model/i18n/I18NString.java similarity index 100% rename from domain-core/src/main/java/org/opentripplanner/core/model/i18n/I18NString.java rename to core/domain/src/main/java/org/opentripplanner/core/model/i18n/I18NString.java diff --git a/domain-core/src/main/java/org/opentripplanner/core/model/i18n/I18NStringMapper.java b/core/domain/src/main/java/org/opentripplanner/core/model/i18n/I18NStringMapper.java similarity index 100% rename from domain-core/src/main/java/org/opentripplanner/core/model/i18n/I18NStringMapper.java rename to core/domain/src/main/java/org/opentripplanner/core/model/i18n/I18NStringMapper.java diff --git a/domain-core/src/main/java/org/opentripplanner/core/model/i18n/LocalizedString.java b/core/domain/src/main/java/org/opentripplanner/core/model/i18n/LocalizedString.java similarity index 100% rename from domain-core/src/main/java/org/opentripplanner/core/model/i18n/LocalizedString.java rename to core/domain/src/main/java/org/opentripplanner/core/model/i18n/LocalizedString.java diff --git a/domain-core/src/main/java/org/opentripplanner/core/model/i18n/LocalizedStringFormat.java b/core/domain/src/main/java/org/opentripplanner/core/model/i18n/LocalizedStringFormat.java similarity index 100% rename from domain-core/src/main/java/org/opentripplanner/core/model/i18n/LocalizedStringFormat.java rename to core/domain/src/main/java/org/opentripplanner/core/model/i18n/LocalizedStringFormat.java diff --git a/domain-core/src/main/java/org/opentripplanner/core/model/i18n/NonLocalizedString.java b/core/domain/src/main/java/org/opentripplanner/core/model/i18n/NonLocalizedString.java similarity index 100% rename from domain-core/src/main/java/org/opentripplanner/core/model/i18n/NonLocalizedString.java rename to core/domain/src/main/java/org/opentripplanner/core/model/i18n/NonLocalizedString.java diff --git a/domain-core/src/main/java/org/opentripplanner/core/model/i18n/TranslatedString.java b/core/domain/src/main/java/org/opentripplanner/core/model/i18n/TranslatedString.java similarity index 100% rename from domain-core/src/main/java/org/opentripplanner/core/model/i18n/TranslatedString.java rename to core/domain/src/main/java/org/opentripplanner/core/model/i18n/TranslatedString.java diff --git a/domain-core/src/main/java/org/opentripplanner/core/model/id/FeedScopedId.java b/core/domain/src/main/java/org/opentripplanner/core/model/id/FeedScopedId.java similarity index 100% rename from domain-core/src/main/java/org/opentripplanner/core/model/id/FeedScopedId.java rename to core/domain/src/main/java/org/opentripplanner/core/model/id/FeedScopedId.java diff --git a/domain-core/src/main/java/org/opentripplanner/core/model/time/LocalDateRange.java b/core/domain/src/main/java/org/opentripplanner/core/model/time/LocalDateRange.java similarity index 100% rename from domain-core/src/main/java/org/opentripplanner/core/model/time/LocalDateRange.java rename to core/domain/src/main/java/org/opentripplanner/core/model/time/LocalDateRange.java diff --git a/domain-core/src/main/java/org/opentripplanner/core/model/time/TimePeriod.java b/core/domain/src/main/java/org/opentripplanner/core/model/time/TimePeriod.java similarity index 100% rename from domain-core/src/main/java/org/opentripplanner/core/model/time/TimePeriod.java rename to core/domain/src/main/java/org/opentripplanner/core/model/time/TimePeriod.java diff --git a/domain-core/src/main/resources/Message.properties b/core/domain/src/main/resources/Message.properties similarity index 100% rename from domain-core/src/main/resources/Message.properties rename to core/domain/src/main/resources/Message.properties diff --git a/domain-core/src/main/resources/Message_de.properties b/core/domain/src/main/resources/Message_de.properties similarity index 100% rename from domain-core/src/main/resources/Message_de.properties rename to core/domain/src/main/resources/Message_de.properties diff --git a/domain-core/src/main/resources/Message_es.properties b/core/domain/src/main/resources/Message_es.properties similarity index 100% rename from domain-core/src/main/resources/Message_es.properties rename to core/domain/src/main/resources/Message_es.properties diff --git a/domain-core/src/main/resources/Message_fr.properties b/core/domain/src/main/resources/Message_fr.properties similarity index 100% rename from domain-core/src/main/resources/Message_fr.properties rename to core/domain/src/main/resources/Message_fr.properties diff --git a/domain-core/src/main/resources/Message_hu.properties b/core/domain/src/main/resources/Message_hu.properties similarity index 100% rename from domain-core/src/main/resources/Message_hu.properties rename to core/domain/src/main/resources/Message_hu.properties diff --git a/domain-core/src/main/resources/Message_nl.properties b/core/domain/src/main/resources/Message_nl.properties similarity index 100% rename from domain-core/src/main/resources/Message_nl.properties rename to core/domain/src/main/resources/Message_nl.properties diff --git a/domain-core/src/main/resources/WayProperties.properties b/core/domain/src/main/resources/WayProperties.properties similarity index 100% rename from domain-core/src/main/resources/WayProperties.properties rename to core/domain/src/main/resources/WayProperties.properties diff --git a/domain-core/src/main/resources/WayProperties_de.properties b/core/domain/src/main/resources/WayProperties_de.properties similarity index 100% rename from domain-core/src/main/resources/WayProperties_de.properties rename to core/domain/src/main/resources/WayProperties_de.properties diff --git a/domain-core/src/main/resources/WayProperties_fi.properties b/core/domain/src/main/resources/WayProperties_fi.properties similarity index 100% rename from domain-core/src/main/resources/WayProperties_fi.properties rename to core/domain/src/main/resources/WayProperties_fi.properties diff --git a/domain-core/src/main/resources/WayProperties_fr.properties b/core/domain/src/main/resources/WayProperties_fr.properties similarity index 100% rename from domain-core/src/main/resources/WayProperties_fr.properties rename to core/domain/src/main/resources/WayProperties_fr.properties diff --git a/domain-core/src/main/resources/WayProperties_hu.properties b/core/domain/src/main/resources/WayProperties_hu.properties similarity index 100% rename from domain-core/src/main/resources/WayProperties_hu.properties rename to core/domain/src/main/resources/WayProperties_hu.properties diff --git a/domain-core/src/main/resources/WayProperties_nl.properties b/core/domain/src/main/resources/WayProperties_nl.properties similarity index 100% rename from domain-core/src/main/resources/WayProperties_nl.properties rename to core/domain/src/main/resources/WayProperties_nl.properties diff --git a/domain-core/src/main/resources/WayProperties_no.properties b/core/domain/src/main/resources/WayProperties_no.properties similarity index 100% rename from domain-core/src/main/resources/WayProperties_no.properties rename to core/domain/src/main/resources/WayProperties_no.properties diff --git a/domain-core/src/main/resources/WayProperties_sv.properties b/core/domain/src/main/resources/WayProperties_sv.properties similarity index 100% rename from domain-core/src/main/resources/WayProperties_sv.properties rename to core/domain/src/main/resources/WayProperties_sv.properties diff --git a/domain-core/src/main/resources/internals.properties b/core/domain/src/main/resources/internals.properties similarity index 100% rename from domain-core/src/main/resources/internals.properties rename to core/domain/src/main/resources/internals.properties diff --git a/domain-core/src/main/resources/internals_de.properties b/core/domain/src/main/resources/internals_de.properties similarity index 100% rename from domain-core/src/main/resources/internals_de.properties rename to core/domain/src/main/resources/internals_de.properties diff --git a/domain-core/src/main/resources/internals_fi.properties b/core/domain/src/main/resources/internals_fi.properties similarity index 100% rename from domain-core/src/main/resources/internals_fi.properties rename to core/domain/src/main/resources/internals_fi.properties diff --git a/domain-core/src/main/resources/internals_fr.properties b/core/domain/src/main/resources/internals_fr.properties similarity index 100% rename from domain-core/src/main/resources/internals_fr.properties rename to core/domain/src/main/resources/internals_fr.properties diff --git a/domain-core/src/main/resources/internals_hu.properties b/core/domain/src/main/resources/internals_hu.properties similarity index 100% rename from domain-core/src/main/resources/internals_hu.properties rename to core/domain/src/main/resources/internals_hu.properties diff --git a/domain-core/src/main/resources/internals_no.properties b/core/domain/src/main/resources/internals_no.properties similarity index 100% rename from domain-core/src/main/resources/internals_no.properties rename to core/domain/src/main/resources/internals_no.properties diff --git a/domain-core/src/main/resources/internals_sv.properties b/core/domain/src/main/resources/internals_sv.properties similarity index 100% rename from domain-core/src/main/resources/internals_sv.properties rename to core/domain/src/main/resources/internals_sv.properties diff --git a/domain-core/src/test/java/org/opentripplanner/core/model/i18n/I18NStringTest.java b/core/domain/src/test/java/org/opentripplanner/core/model/i18n/I18NStringTest.java similarity index 100% rename from domain-core/src/test/java/org/opentripplanner/core/model/i18n/I18NStringTest.java rename to core/domain/src/test/java/org/opentripplanner/core/model/i18n/I18NStringTest.java diff --git a/domain-core/src/test/java/org/opentripplanner/core/model/i18n/LocalizedStringTest.java b/core/domain/src/test/java/org/opentripplanner/core/model/i18n/LocalizedStringTest.java similarity index 100% rename from domain-core/src/test/java/org/opentripplanner/core/model/i18n/LocalizedStringTest.java rename to core/domain/src/test/java/org/opentripplanner/core/model/i18n/LocalizedStringTest.java diff --git a/domain-core/src/test/java/org/opentripplanner/core/model/i18n/TranslatedStringTest.java b/core/domain/src/test/java/org/opentripplanner/core/model/i18n/TranslatedStringTest.java similarity index 100% rename from domain-core/src/test/java/org/opentripplanner/core/model/i18n/TranslatedStringTest.java rename to core/domain/src/test/java/org/opentripplanner/core/model/i18n/TranslatedStringTest.java diff --git a/domain-core/src/test/java/org/opentripplanner/core/model/id/FeedScopedIdTest.java b/core/domain/src/test/java/org/opentripplanner/core/model/id/FeedScopedIdTest.java similarity index 100% rename from domain-core/src/test/java/org/opentripplanner/core/model/id/FeedScopedIdTest.java rename to core/domain/src/test/java/org/opentripplanner/core/model/id/FeedScopedIdTest.java diff --git a/domain-core/src/test/java/org/opentripplanner/core/model/time/LocalDateRangeTest.java b/core/domain/src/test/java/org/opentripplanner/core/model/time/LocalDateRangeTest.java similarity index 100% rename from domain-core/src/test/java/org/opentripplanner/core/model/time/LocalDateRangeTest.java rename to core/domain/src/test/java/org/opentripplanner/core/model/time/LocalDateRangeTest.java diff --git a/domain-core/src/test/java/org/opentripplanner/core/model/time/TimePeriodTest.java b/core/domain/src/test/java/org/opentripplanner/core/model/time/TimePeriodTest.java similarity index 100% rename from domain-core/src/test/java/org/opentripplanner/core/model/time/TimePeriodTest.java rename to core/domain/src/test/java/org/opentripplanner/core/model/time/TimePeriodTest.java diff --git a/core/framework/pom.xml b/core/framework/pom.xml new file mode 100644 index 00000000000..8bed6875d41 --- /dev/null +++ b/core/framework/pom.xml @@ -0,0 +1,55 @@ + + + 4.0.0 + + org.opentripplanner + core + 2.11.0-SNAPSHOT + + + core-framework + OpenTripPlanner - Core Framework + Core framework implementation - the api should be in the core-domain + + + + + com.hubspot.maven.plugins + prettier-maven-plugin + + + + + + + + ${project.groupId} + core-domain + ${project.version} + + + + + net.sf.trove4j + trove4j + + + org.slf4j + slf4j-api + + + + + org.junit.jupiter + junit-jupiter-api + test + + + com.google.truth + truth + test + + + diff --git a/core/pom.xml b/core/pom.xml new file mode 100644 index 00000000000..b3b607c9301 --- /dev/null +++ b/core/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + org.opentripplanner + otp + 2.11.0-SNAPSHOT + + + core + OpenTripPlanner - Core + pom + + + domain + framework + + diff --git a/gtfs-realtime-protobuf/pom.xml b/gtfs-realtime-protobuf/pom.xml index e9042c38b79..000893bf35b 100644 --- a/gtfs-realtime-protobuf/pom.xml +++ b/gtfs-realtime-protobuf/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.opentripplanner - otp-root + otp 2.11.0-SNAPSHOT gtfs-realtime-protobuf diff --git a/otp-shaded/pom.xml b/otp-shaded/pom.xml index 85acf4d8058..fadff337cb2 100644 --- a/otp-shaded/pom.xml +++ b/otp-shaded/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.opentripplanner - otp-root + otp 2.11.0-SNAPSHOT otp-shaded diff --git a/pom.xml b/pom.xml index 5382222bbc4..25ee4317e3d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.opentripplanner - otp-root + otp 2.11.0-SNAPSHOT pom @@ -100,7 +100,7 @@ utils - domain-core + core transit raptor astar diff --git a/raptor/data/pom.xml b/raptor/data/pom.xml new file mode 100644 index 00000000000..d8631b7b2ce --- /dev/null +++ b/raptor/data/pom.xml @@ -0,0 +1,54 @@ + + + 4.0.0 + + org.opentripplanner + raptor + 2.11.0-SNAPSHOT + + + raptor-data + OpenTripPlanner - Raptor Data + + + + + com.hubspot.maven.plugins + prettier-maven-plugin + + + + + + + + ${project.groupId} + raptor-router + ${project.version} + + + + + net.sf.trove4j + trove4j + + + org.slf4j + slf4j-api + + + + + org.junit.jupiter + junit-jupiter-api + test + + + com.google.truth + truth + test + + + diff --git a/raptor/pom.xml b/raptor/pom.xml index b478be081a3..dede1118e6f 100644 --- a/raptor/pom.xml +++ b/raptor/pom.xml @@ -5,15 +5,16 @@ 4.0.0 org.opentripplanner - otp-root + otp 2.11.0-SNAPSHOT - raptor-root + raptor OpenTripPlanner - Raptor pom router + data diff --git a/raptor/router/pom.xml b/raptor/router/pom.xml index c93bf4e3b87..e8d8fabc622 100644 --- a/raptor/router/pom.xml +++ b/raptor/router/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.opentripplanner - raptor-root + raptor 2.11.0-SNAPSHOT diff --git a/street/pom.xml b/street/pom.xml index f593a1f312e..c2c5e66d6a7 100644 --- a/street/pom.xml +++ b/street/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.opentripplanner - otp-root + otp 2.11.0-SNAPSHOT @@ -24,7 +24,7 @@ ${project.groupId} - domain-core + core-domain ${project.version} diff --git a/test/integration/pom.xml b/test/integration/pom.xml index 2ee513f9176..eb647d138b5 100644 --- a/test/integration/pom.xml +++ b/test/integration/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.opentripplanner - otp-root + otp 2.11.0-SNAPSHOT ../../pom.xml diff --git a/transit/pom.xml b/transit/pom.xml index 8d920afc588..f75c7bd1acb 100644 --- a/transit/pom.xml +++ b/transit/pom.xml @@ -5,8 +5,8 @@ 4.0.0 org.opentripplanner - otp-root - 2.10.0-SNAPSHOT + otp + 2.11.0-SNAPSHOT transit @@ -25,7 +25,7 @@ ${project.groupId} - domain-core + core-domain ${project.version} diff --git a/utils/pom.xml b/utils/pom.xml index 18b3ebd2094..b619f022f24 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.opentripplanner - otp-root + otp 2.11.0-SNAPSHOT From df9dd5d7244868a55a9931d6fec7a82fbdd696b2 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 17 Sep 2026 17:32:37 +0200 Subject: [PATCH 31/68] refactor: rename utility classes and update pom.xml module structure --- application/pom.xml | 2 +- astar/pom.xml | 2 +- core/domain/pom.xml | 2 +- core/pom.xml | 1 + {utils => core/utils}/pom.xml | 4 ++-- .../utils/collection/CollectionUtils.java | 0 .../utils/collection/CollectionsView.java | 0 .../utils/collection/CompositeComparator.java | 0 .../utils/collection/EnumSetUtils.java | 0 .../opentripplanner/utils/collection/ListSection.java | 0 .../opentripplanner/utils/collection/ListUtils.java | 0 .../opentripplanner/utils/collection/MapUtils.java | 0 .../org/opentripplanner/utils/collection/MinMap.java | 0 .../org/opentripplanner/utils/collection/Pair.java | 0 .../opentripplanner/utils/collection/SetUtils.java | 0 .../org/opentripplanner/utils/collection/Split.java | 0 .../opentripplanner/utils/collection/StreamUtils.java | 0 .../utils/collection/TwoWayLinearSearch.java | 0 .../org/opentripplanner/utils/lang/ArrayUtils.java | 0 .../org/opentripplanner/utils/lang/BitSetUtils.java | 0 .../main/java/org/opentripplanner/utils/lang/Box.java | 0 .../org/opentripplanner/utils/lang/DoubleRange.java | 0 .../org/opentripplanner/utils/lang/DoubleUtils.java | 0 .../java/org/opentripplanner/utils/lang/IntBox.java | 0 .../java/org/opentripplanner/utils/lang/IntRange.java | 0 .../java/org/opentripplanner/utils/lang/IntUtils.java | 0 .../utils/lang/MemEfficientArrayBuilder.java | 0 .../org/opentripplanner/utils/lang/ObjectUtils.java | 0 .../opentripplanner/utils/lang/OtpNumberFormat.java | 0 .../org/opentripplanner/utils/lang/RunnableUtils.java | 0 .../java/org/opentripplanner/utils/lang/Sandbox.java | 0 .../org/opentripplanner/utils/lang/StringUtils.java | 0 .../java/org/opentripplanner/utils/lang/Units.java | 0 .../utils/logging/PowerOfTwoThrottle.java | 0 .../utils/logging/ProgressTracker.java | 0 .../utils/logging/ProgressTrackerInputStream.java | 0 .../utils/logging/ProgressTrackerOutputStream.java | 0 .../org/opentripplanner/utils/logging/Throttle.java | 0 .../utils/text/CharacterEscapeFormatter.java | 0 .../utils/text/FileSizeToTextConverter.java | 0 .../org/opentripplanner/utils/text/HexString.java | 0 .../opentripplanner/utils/text/MarkdownFormatter.java | 0 .../java/org/opentripplanner/utils/text/Table.java | 0 .../org/opentripplanner/utils/text/TableBuilder.java | 0 .../opentripplanner/utils/text/TableRowFormatter.java | 0 .../utils/text/TextVariablesSubstitution.java | 0 .../opentripplanner/utils/time/CountdownTimer.java | 0 .../org/opentripplanner/utils/time/DateUtils.java | 0 .../org/opentripplanner/utils/time/DurationUtils.java | 0 .../opentripplanner/utils/time/LocalDateUtils.java | 0 .../utils/time/OffsetDateTimeParser.java | 0 .../org/opentripplanner/utils/time/RelativeTime.java | 0 .../opentripplanner/utils/time/ServiceDateUtils.java | 0 .../org/opentripplanner/utils/time/TimeUtils.java | 0 .../utils/tostring/MultiLineToStringBuilder.java | 0 .../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 .../utils/collection/EnumSetUtilsTest.java | 0 .../utils/collection/ListSectionTest.java | 0 .../utils/collection/ListUtilsTest.java | 0 .../utils/collection/MapUtilsTest.java | 0 .../opentripplanner/utils/collection/MinMapTest.java | 0 .../utils/collection/SetUtilsTest.java | 0 .../opentripplanner/utils/collection/SplitTest.java | 0 .../utils/collection/StreamUtilsTest.java | 0 .../utils/collection/TwoWayLinearSearchTest.java | 0 .../opentripplanner/utils/lang/ArrayUtilsTest.java | 0 .../opentripplanner/utils/lang/BitSetUtilsTest.java | 0 .../java/org/opentripplanner/utils/lang/BoxTest.java | 0 .../opentripplanner/utils/lang/DoubleRangeTest.java | 0 .../opentripplanner/utils/lang/DoubleUtilsTest.java | 0 .../org/opentripplanner/utils/lang/IntBoxTest.java | 0 .../org/opentripplanner/utils/lang/IntRangeTest.java | 0 .../org/opentripplanner/utils/lang/IntUtilsTest.java | 0 .../utils/lang/MemEfficientArrayBuilderTest.java | 0 .../opentripplanner/utils/lang/ObjectUtilsTest.java | 0 .../utils/lang/OtpNumberFormatTest.java | 0 .../opentripplanner/utils/lang/RunnableUtilsTest.java | 0 .../opentripplanner/utils/lang/StringUtilsTest.java | 0 .../org/opentripplanner/utils/lang/UnitsTest.java | 0 .../utils/logging/PowerOfTwoThrottleTest.java | 0 .../utils/logging/ProgressTrackerTest.java | 0 .../opentripplanner/utils/logging/ThrottleTest.java | 0 .../utils/text/CharacterEscapeFormatterTest.java | 0 .../utils/text/FileSizeToTextConverterTest.java | 0 .../org/opentripplanner/utils/text/HexStringTest.java | 0 .../utils/text/MarkdownFormatterTest.java | 0 .../org/opentripplanner/utils/text/TableTest.java | 0 .../utils/text/TextVariablesSubstitutionTest.java | 0 .../utils/time/CountdownTimerTest.java | 0 .../org/opentripplanner/utils/time/DateUtilsTest.java | 0 .../opentripplanner/utils/time/DurationUtilsTest.java | 0 .../utils/time/LocalDateUtilsTest.java | 0 .../utils/time/OffsetDateTimeParserTest.java | 0 .../utils/time/ServiceDateUtilsTest.java | 0 .../org/opentripplanner/utils/time/TimeUtilsTest.java | 0 .../java/org/opentripplanner/utils/time/ZoneIds.java | 0 .../utils/tostring/MultiLineToStringBuilderTest.java | 0 .../utils/tostring/ToStringBuilderTest.java | 0 .../tostring/ValueObjectToStringBuilderTest.java | 0 pom.xml | 11 +++++------ raptor/router/pom.xml | 2 +- 105 files changed, 12 insertions(+), 12 deletions(-) rename {utils => core/utils}/pom.xml (95%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/collection/CollectionUtils.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/collection/CollectionsView.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/collection/CompositeComparator.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/collection/EnumSetUtils.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/collection/ListSection.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/collection/ListUtils.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/collection/MapUtils.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/collection/MinMap.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/collection/Pair.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/collection/SetUtils.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/collection/Split.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/collection/StreamUtils.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/collection/TwoWayLinearSearch.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/lang/ArrayUtils.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/lang/BitSetUtils.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/lang/Box.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/lang/DoubleRange.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/lang/DoubleUtils.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/lang/IntBox.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/lang/IntRange.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/lang/IntUtils.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/lang/MemEfficientArrayBuilder.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/lang/ObjectUtils.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/lang/OtpNumberFormat.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/lang/RunnableUtils.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/lang/Sandbox.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/lang/StringUtils.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/lang/Units.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/logging/PowerOfTwoThrottle.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/logging/ProgressTracker.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/logging/ProgressTrackerInputStream.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/logging/ProgressTrackerOutputStream.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/logging/Throttle.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/text/CharacterEscapeFormatter.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/text/FileSizeToTextConverter.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/text/HexString.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/text/MarkdownFormatter.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/text/Table.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/text/TableBuilder.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/text/TableRowFormatter.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/text/TextVariablesSubstitution.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/time/CountdownTimer.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/time/DateUtils.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/time/DurationUtils.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/time/LocalDateUtils.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/time/OffsetDateTimeParser.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/time/RelativeTime.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/time/ServiceDateUtils.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/time/TimeUtils.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/tostring/MultiLineToStringBuilder.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/tostring/ToStringBuilder.java (100%) rename {utils => core/utils}/src/main/java/org/opentripplanner/utils/tostring/ValueObjectToStringBuilder.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/collection/CollectionUtilsTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/collection/CollectionsViewTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/collection/CompositeComparatorTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/collection/EnumSetUtilsTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/collection/ListSectionTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/collection/ListUtilsTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/collection/MapUtilsTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/collection/MinMapTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/collection/SetUtilsTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/collection/SplitTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/collection/StreamUtilsTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/collection/TwoWayLinearSearchTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/lang/ArrayUtilsTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/lang/BitSetUtilsTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/lang/BoxTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/lang/DoubleRangeTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/lang/DoubleUtilsTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/lang/IntBoxTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/lang/IntRangeTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/lang/IntUtilsTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/lang/MemEfficientArrayBuilderTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/lang/ObjectUtilsTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/lang/OtpNumberFormatTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/lang/RunnableUtilsTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/lang/StringUtilsTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/lang/UnitsTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/logging/PowerOfTwoThrottleTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/logging/ProgressTrackerTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/logging/ThrottleTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/text/CharacterEscapeFormatterTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/text/FileSizeToTextConverterTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/text/HexStringTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/text/MarkdownFormatterTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/text/TableTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/text/TextVariablesSubstitutionTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/time/CountdownTimerTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/time/DateUtilsTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/time/DurationUtilsTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/time/LocalDateUtilsTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/time/OffsetDateTimeParserTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/time/ServiceDateUtilsTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/time/TimeUtilsTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/time/ZoneIds.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/tostring/MultiLineToStringBuilderTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/tostring/ToStringBuilderTest.java (100%) rename {utils => core/utils}/src/test/java/org/opentripplanner/utils/tostring/ValueObjectToStringBuilderTest.java (100%) diff --git a/application/pom.xml b/application/pom.xml index 92435131cba..6c4ce50867b 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -20,7 +20,7 @@ ${project.groupId} - utils + core-utils ${project.version} diff --git a/astar/pom.xml b/astar/pom.xml index 575037e281f..f4188e78f1a 100644 --- a/astar/pom.xml +++ b/astar/pom.xml @@ -24,7 +24,7 @@ ${project.groupId} - utils + core-utils ${project.version} diff --git a/core/domain/pom.xml b/core/domain/pom.xml index a066bce643e..a3f951bbb84 100644 --- a/core/domain/pom.xml +++ b/core/domain/pom.xml @@ -24,7 +24,7 @@ ${project.groupId} - utils + core-utils ${project.version} diff --git a/core/pom.xml b/core/pom.xml index b3b607c9301..d072055d661 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -15,6 +15,7 @@ domain + utils framework diff --git a/utils/pom.xml b/core/utils/pom.xml similarity index 95% rename from utils/pom.xml rename to core/utils/pom.xml index b619f022f24..4e3f44eb9fd 100644 --- a/utils/pom.xml +++ b/core/utils/pom.xml @@ -5,11 +5,11 @@ 4.0.0 org.opentripplanner - otp + core 2.11.0-SNAPSHOT - utils + core-utils OpenTripPlanner - Utils diff --git a/utils/src/main/java/org/opentripplanner/utils/collection/CollectionUtils.java b/core/utils/src/main/java/org/opentripplanner/utils/collection/CollectionUtils.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/collection/CollectionUtils.java rename to core/utils/src/main/java/org/opentripplanner/utils/collection/CollectionUtils.java diff --git a/utils/src/main/java/org/opentripplanner/utils/collection/CollectionsView.java b/core/utils/src/main/java/org/opentripplanner/utils/collection/CollectionsView.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/collection/CollectionsView.java rename to core/utils/src/main/java/org/opentripplanner/utils/collection/CollectionsView.java diff --git a/utils/src/main/java/org/opentripplanner/utils/collection/CompositeComparator.java b/core/utils/src/main/java/org/opentripplanner/utils/collection/CompositeComparator.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/collection/CompositeComparator.java rename to core/utils/src/main/java/org/opentripplanner/utils/collection/CompositeComparator.java diff --git a/utils/src/main/java/org/opentripplanner/utils/collection/EnumSetUtils.java b/core/utils/src/main/java/org/opentripplanner/utils/collection/EnumSetUtils.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/collection/EnumSetUtils.java rename to core/utils/src/main/java/org/opentripplanner/utils/collection/EnumSetUtils.java diff --git a/utils/src/main/java/org/opentripplanner/utils/collection/ListSection.java b/core/utils/src/main/java/org/opentripplanner/utils/collection/ListSection.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/collection/ListSection.java rename to core/utils/src/main/java/org/opentripplanner/utils/collection/ListSection.java diff --git a/utils/src/main/java/org/opentripplanner/utils/collection/ListUtils.java b/core/utils/src/main/java/org/opentripplanner/utils/collection/ListUtils.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/collection/ListUtils.java rename to core/utils/src/main/java/org/opentripplanner/utils/collection/ListUtils.java diff --git a/utils/src/main/java/org/opentripplanner/utils/collection/MapUtils.java b/core/utils/src/main/java/org/opentripplanner/utils/collection/MapUtils.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/collection/MapUtils.java rename to core/utils/src/main/java/org/opentripplanner/utils/collection/MapUtils.java diff --git a/utils/src/main/java/org/opentripplanner/utils/collection/MinMap.java b/core/utils/src/main/java/org/opentripplanner/utils/collection/MinMap.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/collection/MinMap.java rename to core/utils/src/main/java/org/opentripplanner/utils/collection/MinMap.java diff --git a/utils/src/main/java/org/opentripplanner/utils/collection/Pair.java b/core/utils/src/main/java/org/opentripplanner/utils/collection/Pair.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/collection/Pair.java rename to core/utils/src/main/java/org/opentripplanner/utils/collection/Pair.java diff --git a/utils/src/main/java/org/opentripplanner/utils/collection/SetUtils.java b/core/utils/src/main/java/org/opentripplanner/utils/collection/SetUtils.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/collection/SetUtils.java rename to core/utils/src/main/java/org/opentripplanner/utils/collection/SetUtils.java diff --git a/utils/src/main/java/org/opentripplanner/utils/collection/Split.java b/core/utils/src/main/java/org/opentripplanner/utils/collection/Split.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/collection/Split.java rename to core/utils/src/main/java/org/opentripplanner/utils/collection/Split.java diff --git a/utils/src/main/java/org/opentripplanner/utils/collection/StreamUtils.java b/core/utils/src/main/java/org/opentripplanner/utils/collection/StreamUtils.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/collection/StreamUtils.java rename to core/utils/src/main/java/org/opentripplanner/utils/collection/StreamUtils.java diff --git a/utils/src/main/java/org/opentripplanner/utils/collection/TwoWayLinearSearch.java b/core/utils/src/main/java/org/opentripplanner/utils/collection/TwoWayLinearSearch.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/collection/TwoWayLinearSearch.java rename to core/utils/src/main/java/org/opentripplanner/utils/collection/TwoWayLinearSearch.java diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/ArrayUtils.java b/core/utils/src/main/java/org/opentripplanner/utils/lang/ArrayUtils.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/lang/ArrayUtils.java rename to core/utils/src/main/java/org/opentripplanner/utils/lang/ArrayUtils.java diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/BitSetUtils.java b/core/utils/src/main/java/org/opentripplanner/utils/lang/BitSetUtils.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/lang/BitSetUtils.java rename to core/utils/src/main/java/org/opentripplanner/utils/lang/BitSetUtils.java diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/Box.java b/core/utils/src/main/java/org/opentripplanner/utils/lang/Box.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/lang/Box.java rename to core/utils/src/main/java/org/opentripplanner/utils/lang/Box.java diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/DoubleRange.java b/core/utils/src/main/java/org/opentripplanner/utils/lang/DoubleRange.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/lang/DoubleRange.java rename to core/utils/src/main/java/org/opentripplanner/utils/lang/DoubleRange.java diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/DoubleUtils.java b/core/utils/src/main/java/org/opentripplanner/utils/lang/DoubleUtils.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/lang/DoubleUtils.java rename to core/utils/src/main/java/org/opentripplanner/utils/lang/DoubleUtils.java diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/IntBox.java b/core/utils/src/main/java/org/opentripplanner/utils/lang/IntBox.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/lang/IntBox.java rename to core/utils/src/main/java/org/opentripplanner/utils/lang/IntBox.java diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/IntRange.java b/core/utils/src/main/java/org/opentripplanner/utils/lang/IntRange.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/lang/IntRange.java rename to core/utils/src/main/java/org/opentripplanner/utils/lang/IntRange.java diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/IntUtils.java b/core/utils/src/main/java/org/opentripplanner/utils/lang/IntUtils.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/lang/IntUtils.java rename to core/utils/src/main/java/org/opentripplanner/utils/lang/IntUtils.java diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/MemEfficientArrayBuilder.java b/core/utils/src/main/java/org/opentripplanner/utils/lang/MemEfficientArrayBuilder.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/lang/MemEfficientArrayBuilder.java rename to core/utils/src/main/java/org/opentripplanner/utils/lang/MemEfficientArrayBuilder.java diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/ObjectUtils.java b/core/utils/src/main/java/org/opentripplanner/utils/lang/ObjectUtils.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/lang/ObjectUtils.java rename to core/utils/src/main/java/org/opentripplanner/utils/lang/ObjectUtils.java diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/OtpNumberFormat.java b/core/utils/src/main/java/org/opentripplanner/utils/lang/OtpNumberFormat.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/lang/OtpNumberFormat.java rename to core/utils/src/main/java/org/opentripplanner/utils/lang/OtpNumberFormat.java diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/RunnableUtils.java b/core/utils/src/main/java/org/opentripplanner/utils/lang/RunnableUtils.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/lang/RunnableUtils.java rename to core/utils/src/main/java/org/opentripplanner/utils/lang/RunnableUtils.java diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/Sandbox.java b/core/utils/src/main/java/org/opentripplanner/utils/lang/Sandbox.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/lang/Sandbox.java rename to core/utils/src/main/java/org/opentripplanner/utils/lang/Sandbox.java diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/StringUtils.java b/core/utils/src/main/java/org/opentripplanner/utils/lang/StringUtils.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/lang/StringUtils.java rename to core/utils/src/main/java/org/opentripplanner/utils/lang/StringUtils.java diff --git a/utils/src/main/java/org/opentripplanner/utils/lang/Units.java b/core/utils/src/main/java/org/opentripplanner/utils/lang/Units.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/lang/Units.java rename to core/utils/src/main/java/org/opentripplanner/utils/lang/Units.java diff --git a/utils/src/main/java/org/opentripplanner/utils/logging/PowerOfTwoThrottle.java b/core/utils/src/main/java/org/opentripplanner/utils/logging/PowerOfTwoThrottle.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/logging/PowerOfTwoThrottle.java rename to core/utils/src/main/java/org/opentripplanner/utils/logging/PowerOfTwoThrottle.java diff --git a/utils/src/main/java/org/opentripplanner/utils/logging/ProgressTracker.java b/core/utils/src/main/java/org/opentripplanner/utils/logging/ProgressTracker.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/logging/ProgressTracker.java rename to core/utils/src/main/java/org/opentripplanner/utils/logging/ProgressTracker.java diff --git a/utils/src/main/java/org/opentripplanner/utils/logging/ProgressTrackerInputStream.java b/core/utils/src/main/java/org/opentripplanner/utils/logging/ProgressTrackerInputStream.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/logging/ProgressTrackerInputStream.java rename to core/utils/src/main/java/org/opentripplanner/utils/logging/ProgressTrackerInputStream.java diff --git a/utils/src/main/java/org/opentripplanner/utils/logging/ProgressTrackerOutputStream.java b/core/utils/src/main/java/org/opentripplanner/utils/logging/ProgressTrackerOutputStream.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/logging/ProgressTrackerOutputStream.java rename to core/utils/src/main/java/org/opentripplanner/utils/logging/ProgressTrackerOutputStream.java diff --git a/utils/src/main/java/org/opentripplanner/utils/logging/Throttle.java b/core/utils/src/main/java/org/opentripplanner/utils/logging/Throttle.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/logging/Throttle.java rename to core/utils/src/main/java/org/opentripplanner/utils/logging/Throttle.java diff --git a/utils/src/main/java/org/opentripplanner/utils/text/CharacterEscapeFormatter.java b/core/utils/src/main/java/org/opentripplanner/utils/text/CharacterEscapeFormatter.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/text/CharacterEscapeFormatter.java rename to core/utils/src/main/java/org/opentripplanner/utils/text/CharacterEscapeFormatter.java diff --git a/utils/src/main/java/org/opentripplanner/utils/text/FileSizeToTextConverter.java b/core/utils/src/main/java/org/opentripplanner/utils/text/FileSizeToTextConverter.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/text/FileSizeToTextConverter.java rename to core/utils/src/main/java/org/opentripplanner/utils/text/FileSizeToTextConverter.java diff --git a/utils/src/main/java/org/opentripplanner/utils/text/HexString.java b/core/utils/src/main/java/org/opentripplanner/utils/text/HexString.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/text/HexString.java rename to core/utils/src/main/java/org/opentripplanner/utils/text/HexString.java diff --git a/utils/src/main/java/org/opentripplanner/utils/text/MarkdownFormatter.java b/core/utils/src/main/java/org/opentripplanner/utils/text/MarkdownFormatter.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/text/MarkdownFormatter.java rename to core/utils/src/main/java/org/opentripplanner/utils/text/MarkdownFormatter.java diff --git a/utils/src/main/java/org/opentripplanner/utils/text/Table.java b/core/utils/src/main/java/org/opentripplanner/utils/text/Table.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/text/Table.java rename to core/utils/src/main/java/org/opentripplanner/utils/text/Table.java diff --git a/utils/src/main/java/org/opentripplanner/utils/text/TableBuilder.java b/core/utils/src/main/java/org/opentripplanner/utils/text/TableBuilder.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/text/TableBuilder.java rename to core/utils/src/main/java/org/opentripplanner/utils/text/TableBuilder.java diff --git a/utils/src/main/java/org/opentripplanner/utils/text/TableRowFormatter.java b/core/utils/src/main/java/org/opentripplanner/utils/text/TableRowFormatter.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/text/TableRowFormatter.java rename to core/utils/src/main/java/org/opentripplanner/utils/text/TableRowFormatter.java diff --git a/utils/src/main/java/org/opentripplanner/utils/text/TextVariablesSubstitution.java b/core/utils/src/main/java/org/opentripplanner/utils/text/TextVariablesSubstitution.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/text/TextVariablesSubstitution.java rename to core/utils/src/main/java/org/opentripplanner/utils/text/TextVariablesSubstitution.java diff --git a/utils/src/main/java/org/opentripplanner/utils/time/CountdownTimer.java b/core/utils/src/main/java/org/opentripplanner/utils/time/CountdownTimer.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/time/CountdownTimer.java rename to core/utils/src/main/java/org/opentripplanner/utils/time/CountdownTimer.java diff --git a/utils/src/main/java/org/opentripplanner/utils/time/DateUtils.java b/core/utils/src/main/java/org/opentripplanner/utils/time/DateUtils.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/time/DateUtils.java rename to core/utils/src/main/java/org/opentripplanner/utils/time/DateUtils.java diff --git a/utils/src/main/java/org/opentripplanner/utils/time/DurationUtils.java b/core/utils/src/main/java/org/opentripplanner/utils/time/DurationUtils.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/time/DurationUtils.java rename to core/utils/src/main/java/org/opentripplanner/utils/time/DurationUtils.java diff --git a/utils/src/main/java/org/opentripplanner/utils/time/LocalDateUtils.java b/core/utils/src/main/java/org/opentripplanner/utils/time/LocalDateUtils.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/time/LocalDateUtils.java rename to core/utils/src/main/java/org/opentripplanner/utils/time/LocalDateUtils.java diff --git a/utils/src/main/java/org/opentripplanner/utils/time/OffsetDateTimeParser.java b/core/utils/src/main/java/org/opentripplanner/utils/time/OffsetDateTimeParser.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/time/OffsetDateTimeParser.java rename to core/utils/src/main/java/org/opentripplanner/utils/time/OffsetDateTimeParser.java diff --git a/utils/src/main/java/org/opentripplanner/utils/time/RelativeTime.java b/core/utils/src/main/java/org/opentripplanner/utils/time/RelativeTime.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/time/RelativeTime.java rename to core/utils/src/main/java/org/opentripplanner/utils/time/RelativeTime.java diff --git a/utils/src/main/java/org/opentripplanner/utils/time/ServiceDateUtils.java b/core/utils/src/main/java/org/opentripplanner/utils/time/ServiceDateUtils.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/time/ServiceDateUtils.java rename to core/utils/src/main/java/org/opentripplanner/utils/time/ServiceDateUtils.java diff --git a/utils/src/main/java/org/opentripplanner/utils/time/TimeUtils.java b/core/utils/src/main/java/org/opentripplanner/utils/time/TimeUtils.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/time/TimeUtils.java rename to core/utils/src/main/java/org/opentripplanner/utils/time/TimeUtils.java diff --git a/utils/src/main/java/org/opentripplanner/utils/tostring/MultiLineToStringBuilder.java b/core/utils/src/main/java/org/opentripplanner/utils/tostring/MultiLineToStringBuilder.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/tostring/MultiLineToStringBuilder.java rename to core/utils/src/main/java/org/opentripplanner/utils/tostring/MultiLineToStringBuilder.java diff --git a/utils/src/main/java/org/opentripplanner/utils/tostring/ToStringBuilder.java b/core/utils/src/main/java/org/opentripplanner/utils/tostring/ToStringBuilder.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/tostring/ToStringBuilder.java rename to core/utils/src/main/java/org/opentripplanner/utils/tostring/ToStringBuilder.java diff --git a/utils/src/main/java/org/opentripplanner/utils/tostring/ValueObjectToStringBuilder.java b/core/utils/src/main/java/org/opentripplanner/utils/tostring/ValueObjectToStringBuilder.java similarity index 100% rename from utils/src/main/java/org/opentripplanner/utils/tostring/ValueObjectToStringBuilder.java rename to core/utils/src/main/java/org/opentripplanner/utils/tostring/ValueObjectToStringBuilder.java diff --git a/utils/src/test/java/org/opentripplanner/utils/collection/CollectionUtilsTest.java b/core/utils/src/test/java/org/opentripplanner/utils/collection/CollectionUtilsTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/collection/CollectionUtilsTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/collection/CollectionUtilsTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/collection/CollectionsViewTest.java b/core/utils/src/test/java/org/opentripplanner/utils/collection/CollectionsViewTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/collection/CollectionsViewTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/collection/CollectionsViewTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/collection/CompositeComparatorTest.java b/core/utils/src/test/java/org/opentripplanner/utils/collection/CompositeComparatorTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/collection/CompositeComparatorTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/collection/CompositeComparatorTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/collection/EnumSetUtilsTest.java b/core/utils/src/test/java/org/opentripplanner/utils/collection/EnumSetUtilsTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/collection/EnumSetUtilsTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/collection/EnumSetUtilsTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/collection/ListSectionTest.java b/core/utils/src/test/java/org/opentripplanner/utils/collection/ListSectionTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/collection/ListSectionTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/collection/ListSectionTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/collection/ListUtilsTest.java b/core/utils/src/test/java/org/opentripplanner/utils/collection/ListUtilsTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/collection/ListUtilsTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/collection/ListUtilsTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/collection/MapUtilsTest.java b/core/utils/src/test/java/org/opentripplanner/utils/collection/MapUtilsTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/collection/MapUtilsTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/collection/MapUtilsTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/collection/MinMapTest.java b/core/utils/src/test/java/org/opentripplanner/utils/collection/MinMapTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/collection/MinMapTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/collection/MinMapTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/collection/SetUtilsTest.java b/core/utils/src/test/java/org/opentripplanner/utils/collection/SetUtilsTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/collection/SetUtilsTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/collection/SetUtilsTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/collection/SplitTest.java b/core/utils/src/test/java/org/opentripplanner/utils/collection/SplitTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/collection/SplitTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/collection/SplitTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/collection/StreamUtilsTest.java b/core/utils/src/test/java/org/opentripplanner/utils/collection/StreamUtilsTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/collection/StreamUtilsTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/collection/StreamUtilsTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/collection/TwoWayLinearSearchTest.java b/core/utils/src/test/java/org/opentripplanner/utils/collection/TwoWayLinearSearchTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/collection/TwoWayLinearSearchTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/collection/TwoWayLinearSearchTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/lang/ArrayUtilsTest.java b/core/utils/src/test/java/org/opentripplanner/utils/lang/ArrayUtilsTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/lang/ArrayUtilsTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/lang/ArrayUtilsTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/lang/BitSetUtilsTest.java b/core/utils/src/test/java/org/opentripplanner/utils/lang/BitSetUtilsTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/lang/BitSetUtilsTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/lang/BitSetUtilsTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/lang/BoxTest.java b/core/utils/src/test/java/org/opentripplanner/utils/lang/BoxTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/lang/BoxTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/lang/BoxTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/lang/DoubleRangeTest.java b/core/utils/src/test/java/org/opentripplanner/utils/lang/DoubleRangeTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/lang/DoubleRangeTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/lang/DoubleRangeTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/lang/DoubleUtilsTest.java b/core/utils/src/test/java/org/opentripplanner/utils/lang/DoubleUtilsTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/lang/DoubleUtilsTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/lang/DoubleUtilsTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/lang/IntBoxTest.java b/core/utils/src/test/java/org/opentripplanner/utils/lang/IntBoxTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/lang/IntBoxTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/lang/IntBoxTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/lang/IntRangeTest.java b/core/utils/src/test/java/org/opentripplanner/utils/lang/IntRangeTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/lang/IntRangeTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/lang/IntRangeTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/lang/IntUtilsTest.java b/core/utils/src/test/java/org/opentripplanner/utils/lang/IntUtilsTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/lang/IntUtilsTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/lang/IntUtilsTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/lang/MemEfficientArrayBuilderTest.java b/core/utils/src/test/java/org/opentripplanner/utils/lang/MemEfficientArrayBuilderTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/lang/MemEfficientArrayBuilderTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/lang/MemEfficientArrayBuilderTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/lang/ObjectUtilsTest.java b/core/utils/src/test/java/org/opentripplanner/utils/lang/ObjectUtilsTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/lang/ObjectUtilsTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/lang/ObjectUtilsTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/lang/OtpNumberFormatTest.java b/core/utils/src/test/java/org/opentripplanner/utils/lang/OtpNumberFormatTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/lang/OtpNumberFormatTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/lang/OtpNumberFormatTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/lang/RunnableUtilsTest.java b/core/utils/src/test/java/org/opentripplanner/utils/lang/RunnableUtilsTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/lang/RunnableUtilsTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/lang/RunnableUtilsTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/lang/StringUtilsTest.java b/core/utils/src/test/java/org/opentripplanner/utils/lang/StringUtilsTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/lang/StringUtilsTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/lang/StringUtilsTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/lang/UnitsTest.java b/core/utils/src/test/java/org/opentripplanner/utils/lang/UnitsTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/lang/UnitsTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/lang/UnitsTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/logging/PowerOfTwoThrottleTest.java b/core/utils/src/test/java/org/opentripplanner/utils/logging/PowerOfTwoThrottleTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/logging/PowerOfTwoThrottleTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/logging/PowerOfTwoThrottleTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/logging/ProgressTrackerTest.java b/core/utils/src/test/java/org/opentripplanner/utils/logging/ProgressTrackerTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/logging/ProgressTrackerTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/logging/ProgressTrackerTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/logging/ThrottleTest.java b/core/utils/src/test/java/org/opentripplanner/utils/logging/ThrottleTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/logging/ThrottleTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/logging/ThrottleTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/text/CharacterEscapeFormatterTest.java b/core/utils/src/test/java/org/opentripplanner/utils/text/CharacterEscapeFormatterTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/text/CharacterEscapeFormatterTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/text/CharacterEscapeFormatterTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/text/FileSizeToTextConverterTest.java b/core/utils/src/test/java/org/opentripplanner/utils/text/FileSizeToTextConverterTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/text/FileSizeToTextConverterTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/text/FileSizeToTextConverterTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/text/HexStringTest.java b/core/utils/src/test/java/org/opentripplanner/utils/text/HexStringTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/text/HexStringTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/text/HexStringTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/text/MarkdownFormatterTest.java b/core/utils/src/test/java/org/opentripplanner/utils/text/MarkdownFormatterTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/text/MarkdownFormatterTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/text/MarkdownFormatterTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/text/TableTest.java b/core/utils/src/test/java/org/opentripplanner/utils/text/TableTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/text/TableTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/text/TableTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/text/TextVariablesSubstitutionTest.java b/core/utils/src/test/java/org/opentripplanner/utils/text/TextVariablesSubstitutionTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/text/TextVariablesSubstitutionTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/text/TextVariablesSubstitutionTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/time/CountdownTimerTest.java b/core/utils/src/test/java/org/opentripplanner/utils/time/CountdownTimerTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/time/CountdownTimerTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/time/CountdownTimerTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/time/DateUtilsTest.java b/core/utils/src/test/java/org/opentripplanner/utils/time/DateUtilsTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/time/DateUtilsTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/time/DateUtilsTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/time/DurationUtilsTest.java b/core/utils/src/test/java/org/opentripplanner/utils/time/DurationUtilsTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/time/DurationUtilsTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/time/DurationUtilsTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/time/LocalDateUtilsTest.java b/core/utils/src/test/java/org/opentripplanner/utils/time/LocalDateUtilsTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/time/LocalDateUtilsTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/time/LocalDateUtilsTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/time/OffsetDateTimeParserTest.java b/core/utils/src/test/java/org/opentripplanner/utils/time/OffsetDateTimeParserTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/time/OffsetDateTimeParserTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/time/OffsetDateTimeParserTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/time/ServiceDateUtilsTest.java b/core/utils/src/test/java/org/opentripplanner/utils/time/ServiceDateUtilsTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/time/ServiceDateUtilsTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/time/ServiceDateUtilsTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/time/TimeUtilsTest.java b/core/utils/src/test/java/org/opentripplanner/utils/time/TimeUtilsTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/time/TimeUtilsTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/time/TimeUtilsTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/time/ZoneIds.java b/core/utils/src/test/java/org/opentripplanner/utils/time/ZoneIds.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/time/ZoneIds.java rename to core/utils/src/test/java/org/opentripplanner/utils/time/ZoneIds.java diff --git a/utils/src/test/java/org/opentripplanner/utils/tostring/MultiLineToStringBuilderTest.java b/core/utils/src/test/java/org/opentripplanner/utils/tostring/MultiLineToStringBuilderTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/tostring/MultiLineToStringBuilderTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/tostring/MultiLineToStringBuilderTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/tostring/ToStringBuilderTest.java b/core/utils/src/test/java/org/opentripplanner/utils/tostring/ToStringBuilderTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/tostring/ToStringBuilderTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/tostring/ToStringBuilderTest.java diff --git a/utils/src/test/java/org/opentripplanner/utils/tostring/ValueObjectToStringBuilderTest.java b/core/utils/src/test/java/org/opentripplanner/utils/tostring/ValueObjectToStringBuilderTest.java similarity index 100% rename from utils/src/test/java/org/opentripplanner/utils/tostring/ValueObjectToStringBuilderTest.java rename to core/utils/src/test/java/org/opentripplanner/utils/tostring/ValueObjectToStringBuilderTest.java diff --git a/pom.xml b/pom.xml index 25ee4317e3d..7f42f7347d0 100644 --- a/pom.xml +++ b/pom.xml @@ -99,16 +99,15 @@ - utils - core - transit - raptor + application astar + core gtfs-realtime-protobuf - application otp-shaded - test/integration + raptor street + test/integration + transit diff --git a/raptor/router/pom.xml b/raptor/router/pom.xml index e8d8fabc622..1df26e318bd 100644 --- a/raptor/router/pom.xml +++ b/raptor/router/pom.xml @@ -26,7 +26,7 @@ ${project.groupId} - utils + core-utils ${project.version} From bac025fbf0b1e502a8bcb46b4ef1ab890c18da99 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 17 Sep 2026 17:36:07 +0200 Subject: [PATCH 32/68] refactor: move core model and framework classes (git mv) --- .../{ => domain}/framework/deduplicator/DeduplicatorNoop.java | 0 .../{ => domain}/framework/deduplicator/DeduplicatorService.java | 0 .../core/{ => domain}/framework/di/TransitServicePeriod.java | 0 .../{ => domain}/framework/resources/ResourceBundleAdaptor.java | 0 .../{ => domain}/framework/resources/ResourceBundleSingleton.java | 0 .../core/{ => domain}/model/accessibility/Accessibility.java | 0 .../org/opentripplanner/core/{ => domain}/model/basic/Cost.java | 0 .../opentripplanner/core/{ => domain}/model/basic/Distance.java | 0 .../core/{ => domain}/model/basic/NormalizedCost.java | 0 .../org/opentripplanner/core/{ => domain}/model/basic/Ratio.java | 0 .../core/{ => domain}/model/doc/DocumentedEnum.java | 0 .../opentripplanner/core/{ => domain}/model/i18n/I18NString.java | 0 .../core/{ => domain}/model/i18n/I18NStringMapper.java | 0 .../core/{ => domain}/model/i18n/LocalizedString.java | 0 .../core/{ => domain}/model/i18n/LocalizedStringFormat.java | 0 .../core/{ => domain}/model/i18n/NonLocalizedString.java | 0 .../core/{ => domain}/model/i18n/TranslatedString.java | 0 .../opentripplanner/core/{ => domain}/model/id/FeedScopedId.java | 0 .../core/{ => domain}/model/time/LocalDateRange.java | 0 .../opentripplanner/core/{ => domain}/model/time/TimePeriod.java | 0 .../core/{ => domain}/model/i18n/I18NStringTest.java | 0 .../core/{ => domain}/model/i18n/LocalizedStringTest.java | 0 .../core/{ => domain}/model/i18n/TranslatedStringTest.java | 0 .../core/{ => domain}/model/id/FeedScopedIdTest.java | 0 .../core/{ => domain}/model/time/LocalDateRangeTest.java | 0 .../core/{ => domain}/model/time/TimePeriodTest.java | 0 26 files changed, 0 insertions(+), 0 deletions(-) rename core/domain/src/main/java/org/opentripplanner/core/{ => domain}/framework/deduplicator/DeduplicatorNoop.java (100%) rename core/domain/src/main/java/org/opentripplanner/core/{ => domain}/framework/deduplicator/DeduplicatorService.java (100%) rename core/domain/src/main/java/org/opentripplanner/core/{ => domain}/framework/di/TransitServicePeriod.java (100%) rename core/domain/src/main/java/org/opentripplanner/core/{ => domain}/framework/resources/ResourceBundleAdaptor.java (100%) rename core/domain/src/main/java/org/opentripplanner/core/{ => domain}/framework/resources/ResourceBundleSingleton.java (100%) rename core/domain/src/main/java/org/opentripplanner/core/{ => domain}/model/accessibility/Accessibility.java (100%) rename core/domain/src/main/java/org/opentripplanner/core/{ => domain}/model/basic/Cost.java (100%) rename core/domain/src/main/java/org/opentripplanner/core/{ => domain}/model/basic/Distance.java (100%) rename core/domain/src/main/java/org/opentripplanner/core/{ => domain}/model/basic/NormalizedCost.java (100%) rename core/domain/src/main/java/org/opentripplanner/core/{ => domain}/model/basic/Ratio.java (100%) rename core/domain/src/main/java/org/opentripplanner/core/{ => domain}/model/doc/DocumentedEnum.java (100%) rename core/domain/src/main/java/org/opentripplanner/core/{ => domain}/model/i18n/I18NString.java (100%) rename core/domain/src/main/java/org/opentripplanner/core/{ => domain}/model/i18n/I18NStringMapper.java (100%) rename core/domain/src/main/java/org/opentripplanner/core/{ => domain}/model/i18n/LocalizedString.java (100%) rename core/domain/src/main/java/org/opentripplanner/core/{ => domain}/model/i18n/LocalizedStringFormat.java (100%) rename core/domain/src/main/java/org/opentripplanner/core/{ => domain}/model/i18n/NonLocalizedString.java (100%) rename core/domain/src/main/java/org/opentripplanner/core/{ => domain}/model/i18n/TranslatedString.java (100%) rename core/domain/src/main/java/org/opentripplanner/core/{ => domain}/model/id/FeedScopedId.java (100%) rename core/domain/src/main/java/org/opentripplanner/core/{ => domain}/model/time/LocalDateRange.java (100%) rename core/domain/src/main/java/org/opentripplanner/core/{ => domain}/model/time/TimePeriod.java (100%) rename core/domain/src/test/java/org/opentripplanner/core/{ => domain}/model/i18n/I18NStringTest.java (100%) rename core/domain/src/test/java/org/opentripplanner/core/{ => domain}/model/i18n/LocalizedStringTest.java (100%) rename core/domain/src/test/java/org/opentripplanner/core/{ => domain}/model/i18n/TranslatedStringTest.java (100%) rename core/domain/src/test/java/org/opentripplanner/core/{ => domain}/model/id/FeedScopedIdTest.java (100%) rename core/domain/src/test/java/org/opentripplanner/core/{ => domain}/model/time/LocalDateRangeTest.java (100%) rename core/domain/src/test/java/org/opentripplanner/core/{ => domain}/model/time/TimePeriodTest.java (100%) diff --git a/core/domain/src/main/java/org/opentripplanner/core/framework/deduplicator/DeduplicatorNoop.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorNoop.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/framework/deduplicator/DeduplicatorNoop.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorNoop.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/framework/deduplicator/DeduplicatorService.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorService.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/framework/deduplicator/DeduplicatorService.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorService.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/framework/di/TransitServicePeriod.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/di/TransitServicePeriod.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/framework/di/TransitServicePeriod.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/framework/di/TransitServicePeriod.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/framework/resources/ResourceBundleAdaptor.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleAdaptor.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/framework/resources/ResourceBundleAdaptor.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleAdaptor.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/framework/resources/ResourceBundleSingleton.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleSingleton.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/framework/resources/ResourceBundleSingleton.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleSingleton.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/model/accessibility/Accessibility.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/accessibility/Accessibility.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/model/accessibility/Accessibility.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/model/accessibility/Accessibility.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/model/basic/Cost.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/Cost.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/model/basic/Cost.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/Cost.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/model/basic/Distance.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/Distance.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/model/basic/Distance.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/Distance.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/model/basic/NormalizedCost.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/NormalizedCost.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/model/basic/NormalizedCost.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/NormalizedCost.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/model/basic/Ratio.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/Ratio.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/model/basic/Ratio.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/Ratio.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/model/doc/DocumentedEnum.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/doc/DocumentedEnum.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/model/doc/DocumentedEnum.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/model/doc/DocumentedEnum.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/model/i18n/I18NString.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NString.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/model/i18n/I18NString.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NString.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/model/i18n/I18NStringMapper.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NStringMapper.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/model/i18n/I18NStringMapper.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NStringMapper.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/model/i18n/LocalizedString.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedString.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/model/i18n/LocalizedString.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedString.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/model/i18n/LocalizedStringFormat.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringFormat.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/model/i18n/LocalizedStringFormat.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringFormat.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/model/i18n/NonLocalizedString.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/NonLocalizedString.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/model/i18n/NonLocalizedString.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/NonLocalizedString.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/model/i18n/TranslatedString.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/TranslatedString.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/model/i18n/TranslatedString.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/TranslatedString.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/model/id/FeedScopedId.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/id/FeedScopedId.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/model/id/FeedScopedId.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/model/id/FeedScopedId.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/model/time/LocalDateRange.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/time/LocalDateRange.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/model/time/LocalDateRange.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/model/time/LocalDateRange.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/model/time/TimePeriod.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/time/TimePeriod.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/model/time/TimePeriod.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/model/time/TimePeriod.java diff --git a/core/domain/src/test/java/org/opentripplanner/core/model/i18n/I18NStringTest.java b/core/domain/src/test/java/org/opentripplanner/core/domain/model/i18n/I18NStringTest.java similarity index 100% rename from core/domain/src/test/java/org/opentripplanner/core/model/i18n/I18NStringTest.java rename to core/domain/src/test/java/org/opentripplanner/core/domain/model/i18n/I18NStringTest.java diff --git a/core/domain/src/test/java/org/opentripplanner/core/model/i18n/LocalizedStringTest.java b/core/domain/src/test/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringTest.java similarity index 100% rename from core/domain/src/test/java/org/opentripplanner/core/model/i18n/LocalizedStringTest.java rename to core/domain/src/test/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringTest.java diff --git a/core/domain/src/test/java/org/opentripplanner/core/model/i18n/TranslatedStringTest.java b/core/domain/src/test/java/org/opentripplanner/core/domain/model/i18n/TranslatedStringTest.java similarity index 100% rename from core/domain/src/test/java/org/opentripplanner/core/model/i18n/TranslatedStringTest.java rename to core/domain/src/test/java/org/opentripplanner/core/domain/model/i18n/TranslatedStringTest.java diff --git a/core/domain/src/test/java/org/opentripplanner/core/model/id/FeedScopedIdTest.java b/core/domain/src/test/java/org/opentripplanner/core/domain/model/id/FeedScopedIdTest.java similarity index 100% rename from core/domain/src/test/java/org/opentripplanner/core/model/id/FeedScopedIdTest.java rename to core/domain/src/test/java/org/opentripplanner/core/domain/model/id/FeedScopedIdTest.java diff --git a/core/domain/src/test/java/org/opentripplanner/core/model/time/LocalDateRangeTest.java b/core/domain/src/test/java/org/opentripplanner/core/domain/model/time/LocalDateRangeTest.java similarity index 100% rename from core/domain/src/test/java/org/opentripplanner/core/model/time/LocalDateRangeTest.java rename to core/domain/src/test/java/org/opentripplanner/core/domain/model/time/LocalDateRangeTest.java diff --git a/core/domain/src/test/java/org/opentripplanner/core/model/time/TimePeriodTest.java b/core/domain/src/test/java/org/opentripplanner/core/domain/model/time/TimePeriodTest.java similarity index 100% rename from core/domain/src/test/java/org/opentripplanner/core/model/time/TimePeriodTest.java rename to core/domain/src/test/java/org/opentripplanner/core/domain/model/time/TimePeriodTest.java From 54c20eaaa740f579fc9b1524ad320936780835dd Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 17 Sep 2026 18:12:32 +0200 Subject: [PATCH 33/68] refactor: move core model and framework classes (fix package/imports) --- .../ext/carpooling/CarpoolTripTestData.java | 2 +- .../PassengerDelayConstraintsTest.java | 2 +- .../DefaultCarpoolingRepositoryTest.java | 2 +- .../model/CarpoolStopBuilderTest.java | 2 +- .../model/CarpoolTripBuilderTest.java | 2 +- .../routing/CarpoolAccessEgressTest.java | 2 +- ...arpoolingServiceCrossLegInsertionTest.java | 2 +- ...DefaultCarpoolingServiceTreeLimitTest.java | 2 +- .../MultiFeedSiriETCarpoolingUpdaterTest.java | 2 +- .../updater/SiriETCarpoolingUpdaterTest.java | 2 +- .../ext/edgenaming/CrosswalkNamerTest.java | 2 +- .../ext/edgenaming/SidewalkNamerTest.java | 2 +- .../ext/emission/EmissionTestData.java | 2 +- .../csvdata/EmissionDataReaderTest.java | 2 +- .../csvdata/route/RouteDataReaderTest.java | 2 +- .../csvdata/trip/EmissionAggregatorTest.java | 2 +- .../csvdata/trip/TripHopMapperTest.java | 2 +- .../EmissionItineraryDecoratorTest.java | 2 +- .../EmpiricalDelayRepositoryTest.java | 2 +- .../EmpiricalDelayServiceTest.java | 2 +- .../EmpiricalDelayTestData.java | 2 +- .../EmpiricalDelayCsvDataReaderTest.java | 2 +- .../delay/TripTimeDelayCsvParserTest.java | 2 +- .../graphbuilder/TripDelaysMapperTest.java | 2 +- .../internal/model/DelayAtStopDtoTest.java | 2 +- .../model/EmpiricalDelaySummaryTest.java | 2 +- .../internal/model/TripDelaysDtoTest.java | 2 +- .../empiricaldelay/model/TripDelaysTest.java | 2 +- .../ext/fares/FareRuleSetTest.java | 2 +- .../ext/fares/model/FareProductTest.java | 2 +- .../v1/custom/AtlantaFareServiceTest.java | 4 +- .../gtfs/v1/custom/HSLFareServiceTest.java | 4 +- ...reInFreeTransferWindowFareServiceTest.java | 4 +- .../gtfs/v1/custom/OrcaFareServiceTest.java | 6 +- .../ext/fares/service/gtfs/v2/AreasTest.java | 2 +- .../gtfs/v2/CostedTransferInNetworkTest.java | 2 +- .../v2/DepartureToArrivalTimeLimitTest.java | 2 +- .../v2/DepartureToDepartureTimeLimitTest.java | 2 +- .../fares/service/gtfs/v2/FlexLegTest.java | 2 +- .../gtfs/v2/FreeTransferInNetworkTest.java | 2 +- .../gtfs/v2/FreeTransferTimeLimitTest.java | 2 +- .../gtfs/v2/GtfsFaresV2ServiceTest.java | 2 +- .../gtfs/v2/OnlyFromTimeframeMatcherTest.java | 2 +- .../gtfs/v2/SameGroupIdPriorityTest.java | 2 +- .../fares/service/gtfs/v2/StopCountTest.java | 2 +- .../service/gtfs/v2/TimeframeMatcherTest.java | 2 +- .../v2/custom/OregonHopFareFactoryTest.java | 2 +- .../flex/AreaStopsToVerticesMapperTest.java | 2 +- .../ext/flex/FlexIndexTest.java | 2 +- .../ext/flex/FlexIntegrationTest.java | 4 +- .../ext/flex/FlexIntegrationTestData.java | 2 +- .../ext/flex/FlexRouterTest.java | 2 +- .../ext/flex/FlexibleTransitLegTest.java | 2 +- .../ext/flex/GtfsFlexTest.java | 2 +- .../ext/flex/filter/FilterMapperTest.java | 2 +- .../ext/flex/template/ClosestTripTest.java | 2 +- .../template/FlexTemplateFactoryTest.java | 2 +- .../ScheduledDeviatedTripIntegrationTest.java | 2 +- .../ext/geocoder/LuceneIndexTest.java | 2 +- .../ext/geocoder/StopClusterMapperTest.java | 2 +- .../ojp/service/CallAtStopServiceTest.java | 2 +- .../service/StopEventParamsMapperTest.java | 2 +- .../StopConsolidationParserTest.java | 2 +- .../TestStopConsolidationModel.java | 2 +- .../model/ConsolidatedStopLegBuilderTest.java | 2 +- .../areastops/AreaStopsLayerBuilderTest.java | 4 +- .../DigitransitStationPropertyMapperTest.java | 2 +- .../layers/stops/RealtimeStopsLayerTest.java | 4 +- .../layers/stops/StopsLayerTest.java | 6 +- .../VehicleParkingGroupsLayerTest.java | 6 +- .../VehicleParkingsLayerTest.java | 4 +- ...ransitRentalVehiclePropertyMapperTest.java | 6 +- ...ehicleRentalStationPropertyMapperTest.java | 6 +- .../bikely/BikelyUpdaterTest.java | 2 +- .../DecorateWithAccessibilityScore.java | 2 +- .../ext/carpooling/CarpoolingRepository.java | 2 +- .../internal/CarpoolItineraryMapper.java | 8 +- .../internal/DefaultCarpoolingRepository.java | 2 +- .../ext/carpooling/model/CarpoolLeg.java | 4 +- .../ext/carpooling/model/CarpoolStop.java | 2 +- .../carpooling/model/CarpoolStopBuilder.java | 2 +- .../carpooling/model/CarpoolTripBuilder.java | 2 +- .../service/DefaultCarpoolingService.java | 2 +- .../carpooling/updater/CarpoolSiriMapper.java | 2 +- .../updater/SiriETCarpoolingUpdater.java | 2 +- .../ext/edgenaming/CrosswalkNamer.java | 4 +- .../ext/edgenaming/PortlandCustomNamer.java | 4 +- .../edgenaming/SidewalkCrosswalkNamer.java | 2 +- .../ext/edgenaming/SidewalkNamer.java | 2 +- .../ext/emission/EmissionRepository.java | 2 +- .../internal/DefaultEmissionRepository.java | 2 +- .../csvdata/route/RouteDataReader.java | 2 +- .../csvdata/trip/EmissionAggregator.java | 2 +- .../internal/csvdata/trip/TripHopMapper.java | 2 +- .../graphbuilder/EmissionGraphBuilder.java | 2 +- .../EmpiricalDelayRepository.java | 2 +- .../empiricaldelay/EmpiricalDelayService.java | 2 +- .../EmpiricalDelayGraphBuilderModule.java | 2 +- .../DefaultEmpiricalDelayRepository.java | 2 +- .../DefaultEmpiricalDelayService.java | 2 +- .../csvinput/EmpiricalDelayCsvDataReader.java | 2 +- .../delay/TripTimeDelayCsvParser.java | 2 +- .../csvinput/delay/TripTimeDelayRow.java | 2 +- .../EmpiricalDelayGraphBuilder.java | 4 +- .../graphbuilder/TripDelaysMapper.java | 4 +- .../internal/model/DelayAtStopDto.java | 2 +- .../internal/model/EmpiricalDelaySummary.java | 2 +- .../internal/model/TripDelaysAgregator.java | 2 +- .../ext/empiricaldelay/model/TripDelays.java | 2 +- .../ext/fares/model/FareAttribute.java | 2 +- .../ext/fares/model/FareAttributeBuilder.java | 2 +- .../ext/fares/model/FareLegRule.java | 2 +- .../ext/fares/model/FareLegRuleBuilder.java | 2 +- .../ext/fares/model/FareRuleSet.java | 2 +- .../ext/fares/model/FareRulesData.java | 2 +- .../ext/fares/model/FareTransferRule.java | 2 +- .../fares/model/FareTransferRuleBuilder.java | 2 +- .../ext/fares/model/Timeframe.java | 2 +- .../ext/fares/model/TimeframeBuilder.java | 2 +- .../service/gtfs/v1/DefaultFareService.java | 2 +- .../ext/fares/service/gtfs/v1/FareAndId.java | 2 +- .../gtfs/v1/GtfsFareServiceFactory.java | 2 +- .../gtfs/v1/custom/AtlantaFareService.java | 2 +- .../v1/custom/AtlantaFareServiceFactory.java | 2 +- .../gtfs/v1/custom/HSLFareServiceFactory.java | 2 +- ...stFareInFreeTransferWindowFareService.java | 2 +- ...nFreeTransferWindowFareServiceFactory.java | 2 +- .../gtfs/v1/custom/OrcaFareFactory.java | 2 +- .../gtfs/v1/custom/OrcaFareService.java | 4 +- .../fares/service/gtfs/v2/AreaMatcher.java | 2 +- .../service/gtfs/v2/FareLookupService.java | 2 +- .../service/gtfs/v2/GtfsFaresV2Service.java | 2 +- .../gtfs/v2/GtfsFaresV2ServiceBuilder.java | 2 +- .../fares/service/gtfs/v2/NetworkMatcher.java | 2 +- .../service/gtfs/v2/TimeframeMatcher.java | 2 +- .../gtfs/v2/custom/OregonHopFareFactory.java | 2 +- .../ext/flex/AreaStopsToVerticesMapper.java | 2 +- .../opentripplanner/ext/flex/FlexIndex.java | 2 +- .../opentripplanner/ext/flex/FlexRouter.java | 2 +- .../ext/flex/FlexibleTransitLeg.java | 4 +- .../ext/flex/edgetype/FlexTripEdge.java | 4 +- .../ext/flex/filter/FilterMapper.java | 2 +- .../flex/template/AbstractFlexTemplate.java | 2 +- .../FlexAccessEgressCallbackAdapter.java | 2 +- .../ext/flex/template/FlexAccessTemplate.java | 2 +- .../flex/template/FlexDirectPathFactory.java | 2 +- .../ext/flex/template/FlexEgressTemplate.java | 2 +- .../ext/flex/trip/FlexTrip.java | 2 +- .../ext/flex/trip/FlexTripBuilder.java | 2 +- .../ext/flex/trip/ScheduledDeviatedTrip.java | 2 +- .../trip/ScheduledDeviatedTripBuilder.java | 2 +- .../ext/flex/trip/UnscheduledTrip.java | 2 +- .../ext/flex/trip/UnscheduledTripBuilder.java | 2 +- .../ext/geocoder/LuceneIndex.java | 4 +- .../ext/geocoder/LuceneStopCluster.java | 2 +- .../ext/geocoder/StopCluster.java | 2 +- .../ext/geocoder/StopClusterMapper.java | 4 +- .../ext/ojp/mapping/FilterMapper.java | 2 +- .../ojp/mapping/StopEventParamsMapper.java | 2 +- .../ext/ojp/mapping/TextMapper.java | 2 +- .../ext/ojp/service/CallAtStopService.java | 2 +- .../ext/ojp/service/OjpService.java | 2 +- .../parkAndRideApi/ParkAndRideResource.java | 2 +- .../ext/reportapi/model/TransfersReport.java | 2 +- .../SorlandsbanenNorwayService.java | 2 +- .../StopConsolidationParser.java | 2 +- .../StopConsolidationService.java | 2 +- .../DefaultStopConsolidationService.java | 2 +- .../model/ConsolidatedStopGroup.java | 2 +- .../model/StopReplacement.java | 2 +- .../DirectTransferAnalyzer.java | 2 +- .../ext/vectortiles/layers/LayerFilters.java | 2 +- .../areastops/AreaStopPropertyMapper.java | 2 +- .../DigitransitStationPropertyMapper.java | 4 +- ...DigitransitRealtimeStopPropertyMapper.java | 2 +- .../stops/DigitransitStopPropertyMapper.java | 2 +- ...nsitVehicleParkingGroupPropertyMapper.java | 2 +- ...gitransitVehicleParkingPropertyMapper.java | 2 +- ...StadtnaviVehicleParkingPropertyMapper.java | 2 +- ...imeVehicleRentalStationPropertyMapper.java | 2 +- ...igitransitVehicleRentalPropertyMapper.java | 2 +- ...sitVehicleRentalStationPropertyMapper.java | 2 +- .../vehicleparking/bikeep/BikeepUpdater.java | 4 +- .../vehicleparking/bikely/BikelyUpdater.java | 6 +- .../liipi/LiipiFacilitiesDownloader.java | 2 +- .../LiipiHubToVehicleParkingGroupMapper.java | 8 +- .../liipi/LiipiHubsDownloader.java | 2 +- .../vehicleparking/liipi/LiipiParkPatch.java | 2 +- .../LiipiParkToVehicleParkingMapper.java | 8 +- .../liipi/LiipiParkUpdater.java | 2 +- .../parkapi/ParkAPIUpdater.java | 8 +- .../sirifm/SiriFmDataSource.java | 2 +- .../api/common/LocationStringParser.java | 2 +- .../opentripplanner/api/common/Message.java | 2 +- .../model/transit/DefaultFeedIdMapper.java | 2 +- .../api/model/transit/FeedScopedIdMapper.java | 2 +- .../api/model/transit/HideFeedIdMapper.java | 2 +- .../apis/gtfs/GraphQLScalars.java | 2 +- .../apis/gtfs/GraphQLUtils.java | 4 +- .../apis/gtfs/datafetchers/AlertImpl.java | 6 +- .../apis/gtfs/datafetchers/QueryTypeImpl.java | 2 +- .../apis/gtfs/datafetchers/StopImpl.java | 4 +- .../apis/gtfs/datafetchers/TripImpl.java | 2 +- .../datafetchers/TripOnServiceDateImpl.java | 2 +- .../apis/gtfs/generated/GraphQLTypes.java | 88 ++++++++++--------- .../apis/gtfs/generated/graphql-codegen.yml | 2 +- .../mapping/AlertsConnectionFilterMapper.java | 2 +- .../mapping/CanceledTripsFilterMapper.java | 4 +- .../LegacyRouteRequestMapper.java | 2 +- .../routerequest/RouteRequestMapper.java | 2 +- .../routerequest/SelectRequestMapper.java | 2 +- .../TransitPreferencesMapper.java | 2 +- .../routerequest/ViaLocationMapper.java | 2 +- .../apis/gtfs/model/OffsetDateTimeRange.java | 2 +- .../apis/gtfs/service/ApiTransitService.java | 6 +- .../filter/PatternByDateFilterUtil.java | 2 +- .../gtfs/support/time/LocalDateRangeUtil.java | 2 +- .../support/time/OffsetDateTimeRangeUtil.java | 2 +- .../injectdoc/ApiDocumentationProfile.java | 2 +- .../TransmodelGraphQLSchemaFactory.java | 2 +- .../mapping/GenericLocationMapper.java | 2 +- .../mapping/TransitFilterOldWayMapper.java | 2 +- .../mapping/TripViaLocationMapper.java | 2 +- .../apis/transmodel/model/EnumTypes.java | 4 +- .../model/plan/JourneyWhiteListed.java | 2 +- .../transmodel/model/plan/RelaxCostType.java | 2 +- .../model/siri/et/EstimatedCallType.java | 4 +- .../transmodel/model/siri/sx/AffectsType.java | 2 +- .../model/siri/sx/PtSituationElementType.java | 4 +- .../model/stop/MonoOrMultiModalStation.java | 6 +- .../apis/transmodel/model/stop/QuayType.java | 2 +- .../transmodel/model/stop/StopPlaceType.java | 2 +- .../timetable/DatedServiceJourneyQuery.java | 2 +- .../framework/graphql/GraphQLUtils.java | 2 +- .../graphql/scalar/CostScalarFactory.java | 2 +- .../framework/model/TimeAndCost.java | 2 +- .../gbfs/GbfsGeofencingZoneMapper.java | 4 +- .../gbfs/network/GeofencingZoneOtpPhase.java | 2 +- .../gbfs/v2/GbfsFreeVehicleStatusMapper.java | 8 +- .../gbfs/v2/GbfsGeofencingZoneMapper.java | 4 +- .../gbfs/v2/GbfsStationInformationMapper.java | 4 +- .../gbfs/v2/GbfsSystemInformationMapper.java | 4 +- .../gbfs/v2/GbfsVehicleTypeMapper.java | 4 +- .../gbfs/v3/GbfsFeedMapper.java | 4 +- .../gbfs/v3/GbfsGeofencingZoneMapper.java | 2 +- .../gbfs/v3/GbfsStationInformationMapper.java | 2 +- .../gbfs/v3/GbfsVehicleStatusMapper.java | 8 +- .../gbfs/v3/GbfsVehicleTypeMapper.java | 2 +- .../graph_builder/GraphBuilder.java | 2 +- .../configure/GraphBuilderModule.java | 2 +- .../issues/BogusShapeGeometry.java | 2 +- .../issues/BogusShapeGeometryCaught.java | 2 +- .../issues/ShapeGeometryTooFar.java | 2 +- .../module/AddTransitEntitiesToGraph.java | 4 +- .../module/AddTransitEntitiesToTimetable.java | 2 +- .../module/OsmBoardingLocationsModule.java | 4 +- .../RouteToCentroidStationIdsValidator.java | 2 +- .../TransitWithFutureDateValidator.java | 2 +- .../graph_builder/module/cache/CacheTask.java | 2 +- .../module/configure/GraphBuilderModules.java | 2 +- .../module/geometry/GeometryProcessor.java | 2 +- .../module/geometry/ShapeSegmentKey.java | 2 +- .../module/osm/BarrierEdgeBuilder.java | 2 +- .../graph_builder/module/osm/EdgeNamer.java | 2 +- .../module/osm/ElevatorProcessor.java | 2 +- .../graph_builder/module/osm/OsmModule.java | 2 +- .../module/osm/ParkingProcessor.java | 8 +- .../osm/internal/naming/DefaultNamer.java | 2 +- .../walkablearea/WalkableAreaBuilder.java | 2 +- .../module/osm/storage/VertexGenerator.java | 4 +- .../gtfs/GenerateTripPatternsOperation.java | 4 +- .../gtfs/graphbuilder/GtfsModule.java | 6 +- .../gtfs/interlining/InterlineProcessor.java | 2 +- .../gtfs/mapping/BoardingAreaMapper.java | 2 +- .../gtfs/mapping/DirectionMapper.java | 2 +- .../gtfs/mapping/EntranceMapper.java | 2 +- .../gtfs/mapping/FareAttributeMapper.java | 2 +- .../gtfs/mapping/FareLegRuleMapper.java | 2 +- .../gtfs/mapping/FareProductMapper.java | 2 +- .../gtfs/mapping/FareTransferRuleMapper.java | 2 +- .../GTFSToTransitDataImportMapper.java | 2 +- .../gtfs/mapping/IdFactory.java | 2 +- .../gtfs/mapping/LocationGroupMapper.java | 4 +- .../gtfs/mapping/LocationMapper.java | 2 +- .../gtfs/mapping/NoticeAssignmentMapper.java | 2 +- .../gtfs/mapping/NoticeMapper.java | 2 +- .../gtfs/mapping/PathwayNodeMapper.java | 2 +- .../gtfs/mapping/RouteMapper.java | 4 +- .../mapping/RouteNetworkAssignmentMapper.java | 2 +- .../gtfs/mapping/ServiceDateMapper.java | 2 +- .../gtfs/mapping/ShapePointMapper.java | 2 +- .../gtfs/mapping/StopAreaMapper.java | 2 +- .../gtfs/mapping/StopMapper.java | 2 +- .../gtfs/mapping/StopMappingWrapper.java | 4 +- .../gtfs/mapping/StopTimeMapper.java | 2 +- .../gtfs/mapping/TimeframeMapper.java | 2 +- .../gtfs/mapping/TranslationHelper.java | 6 +- .../gtfs/mapping/TripMapper.java | 2 +- .../gtfs/mapping/TripSegmentMapper.java | 2 +- .../WheelchairAccessibilityMapper.java | 2 +- .../inspector/vector/KeyValue.java | 4 +- .../stop/StopLocationPropertyMapper.java | 2 +- .../model/GenericLocation.java | 2 +- .../org/opentripplanner/model/StopTime.java | 2 +- .../model/TransitDataImport.java | 2 +- .../opentripplanner/model/TripTimeOnDate.java | 2 +- .../model/calendar/CalendarService.java | 2 +- .../model/calendar/CalendarServiceData.java | 2 +- .../model/calendar/ServiceCalendar.java | 4 +- .../model/calendar/ServiceCalendarDate.java | 2 +- .../impl/CalendarServiceDataFactoryImpl.java | 2 +- .../calendar/impl/CalendarServiceImpl.java | 2 +- ...ultipleCalendarsForServiceIdException.java | 2 +- .../model/fare/FareMedium.java | 2 +- .../model/fare/FareProduct.java | 2 +- .../model/fare/FareProductBuilder.java | 2 +- .../model/fare/RiderCategory.java | 2 +- .../model/fare/RiderCategoryBuilder.java | 2 +- .../model/impl/DefaultTransitDataImport.java | 2 +- .../model/impl/TransitDataImportBuilder.java | 4 +- .../opentripplanner/model/plan/Itinerary.java | 2 +- .../model/plan/ItineraryBuilder.java | 2 +- .../model/plan/ItinerarySortKey.java | 2 +- .../org/opentripplanner/model/plan/Leg.java | 4 +- .../org/opentripplanner/model/plan/Place.java | 6 +- .../model/plan/leg/ScheduledTransitLeg.java | 6 +- .../legreference/LegReferenceSerializer.java | 2 +- .../ScheduledTransitLegReference.java | 2 +- .../paging/cursor/DeduplicationPageCut.java | 2 +- .../model/plan/paging/cursor/PageCursor.java | 2 +- .../plan/paging/cursor/PageCursorFactory.java | 2 +- .../plan/paging/cursor/PageCursorInput.java | 2 +- .../paging/cursor/PageCursorSerializer.java | 2 +- .../model/plan/walkstep/WalkStep.java | 2 +- .../model/plan/walkstep/WalkStepBuilder.java | 2 +- .../opentripplanner/netex/NetexBundle.java | 4 +- .../opentripplanner/netex/NetexModule.java | 4 +- .../netex/configure/NetexConfigure.java | 2 +- .../netex/mapping/FlexStopsMapper.java | 2 +- .../netex/mapping/GroupOfStationsMapper.java | 6 +- .../netex/mapping/HeadsignMapper.java | 2 +- .../mapping/MultiModalStationMapper.java | 2 +- .../netex/mapping/NetexMapper.java | 4 +- .../netex/mapping/NoticeAssignmentMapper.java | 2 +- .../netex/mapping/NoticeMapper.java | 2 +- .../netex/mapping/QuayMapper.java | 6 +- .../netex/mapping/RouteMapper.java | 4 +- .../netex/mapping/StationMapper.java | 8 +- .../netex/mapping/StopAndStationMapper.java | 4 +- .../netex/mapping/StopTimesMapper.java | 2 +- .../netex/mapping/TariffZoneMapper.java | 2 +- .../netex/mapping/TransferMapper.java | 2 +- .../netex/mapping/TripCalendarBuilder.java | 2 +- .../netex/mapping/TripMapper.java | 6 +- .../netex/mapping/TripPatternMapper.java | 4 +- .../netex/mapping/VehicleParkingMapper.java | 2 +- .../netex/mapping/WheelChairMapper.java | 2 +- .../calendar/CalendarServiceBuilder.java | 4 +- .../mapping/support/FeedScopedIdFactory.java | 2 +- .../opentripplanner/osm/model/OsmEntity.java | 8 +- .../osm/wayproperty/CreativeNamer.java | 2 +- .../wayproperty/LocalizedStringMapper.java | 8 +- .../osm/wayproperty/WayPropertySet.java | 2 +- .../place/NearbyPlaceFinder.java | 2 +- .../opentripplanner/place/api/NearbyStop.java | 2 +- .../place/api/PatternAtStop.java | 2 +- .../CompositeNearbyStopFilter.java | 2 +- .../FlexTripNearbyStopFilter.java | 2 +- .../nearbystopfinder/NearbyStopFilter.java | 2 +- .../NearbyStopFinderVisitor.java | 2 +- .../PatternNearbyStopFilter.java | 2 +- .../PlaceFinderTraverseVisitor.java | 2 +- .../placefinder/StreetNearbyPlaceFinder.java | 2 +- .../routing/alertpatch/AlertCalendar.java | 2 +- .../routing/alertpatch/EntityKey.java | 2 +- .../routing/alertpatch/EntitySelector.java | 2 +- .../routing/alertpatch/TransitAlert.java | 6 +- .../alertpatch/TransitAlertBuilder.java | 4 +- .../ItineraryListFilterChainBuilder.java | 2 +- ...nsitItinerariesBasedOnGeneralizedCost.java | 2 +- .../RemoveTransitIfStreetOnlyIsBetter.java | 2 +- ...moveTransitIfStreetOnlyIsBetterResult.java | 2 +- .../transit/TransitGeneralizedCostFilter.java | 2 +- ...veOtherThanSameLegsMaxGeneralizedCost.java | 2 +- .../groupids/GroupByAllSameStations.java | 2 +- .../groupids/GroupBySameFirstOrLastTrip.java | 2 +- .../groupids/GroupBySameRoutesAndStops.java | 2 +- .../paging/DefaultPageCursorInput.java | 2 +- .../algorithm/mapping/AlertToLegMapper.java | 4 +- .../mapping/LegsToItineraryMapper.java | 2 +- .../mapping/RaptorPathToItineraryMapper.java | 4 +- .../mapping/StatesToWalkStepsMapper.java | 4 +- .../mapping/StreetPathToLegsMapper.java | 2 +- .../algorithm/mapping/TripPlanMapper.java | 2 +- .../raptoradapter/router/TransitRouter.java | 2 +- .../TripAndServiceDateResolver.java | 2 +- .../TripLocationResolver.java | 2 +- .../transit/cost/DefaultTripSchedule.java | 2 +- .../cost/RaptorCostLinearFunction.java | 2 +- .../cost/WheelchairCostCalculator.java | 2 +- .../FrequencyBoardOrAlightEvent.java | 2 +- .../GeneralizedCostParametersMapper.java | 2 +- .../mappers/LookupStopIndexCallback.java | 2 +- .../transit/mappers/RaptorRequestMapper.java | 2 +- .../mappers/TimetableUpdateMapper.java | 2 +- .../DefaultTransitDataProviderFilter.java | 4 +- ...faultTransitDataProviderFilterBuilder.java | 2 +- .../transit/request/TripPatternForDates.java | 2 +- .../request/TripScheduleWithOffset.java | 2 +- .../routing/api/request/TripLocation.java | 2 +- .../api/request/TripOnDateReference.java | 2 +- .../TripOnDateReferenceWithTripAndDate.java | 2 +- ...nDateReferenceWithTripOnServiceDateId.java | 2 +- .../request/framework/CostLinearFunction.java | 2 +- .../LinearFunctionSerialization.java | 2 +- .../request/framework/TimeAndCostPenalty.java | 2 +- .../preference/AccessibilityPreferences.java | 2 +- .../request/preference/BikePreferences.java | 2 +- .../request/preference/CarPreferences.java | 2 +- .../preference/DirectTransitPreferences.java | 2 +- .../preference/ElevatorPreferences.java | 2 +- .../ItineraryFilterDebugProfile.java | 2 +- .../preference/TransferPreferences.java | 2 +- .../preference/TransitPreferences.java | 2 +- .../preference/VehicleParkingPreferences.java | 2 +- .../preference/VehicleRentalPreferences.java | 2 +- .../preference/VehicleWalkingPreferences.java | 2 +- .../request/preference/WalkPreferences.java | 2 +- .../api/request/request/TransitRequest.java | 2 +- .../request/TransitRequestBuilder.java | 2 +- .../request/request/filter/SelectRequest.java | 2 +- .../request/filter/TransitGroupSelect.java | 2 +- .../api/request/via/AbstractViaLocation.java | 2 +- .../request/via/PassThroughViaLocation.java | 2 +- .../routing/api/request/via/ViaLocation.java | 2 +- .../api/request/via/VisitViaLocation.java | 2 +- .../DelegatingTransitAlertServiceImpl.java | 2 +- .../routing/impl/TransitAlertServiceImpl.java | 2 +- .../linking/LinkingContextFactory.java | 2 +- .../internal/VertexCreationService.java | 6 +- .../refetch/RefetchItineraryService.java | 2 +- .../routing/services/TransitAlertService.java | 2 +- .../service/osminfo/model/Platform.java | 2 +- .../model/RealtimeVehicle.java | 2 +- .../model/RealtimeVehicleBuilder.java | 2 +- .../standalone/config/BuildConfig.java | 4 +- .../configure/DeduplicatorServiceModule.java | 2 +- .../config/configure/LoadConfigModule.java | 4 +- .../config/framework/json/EnumMapper.java | 2 +- .../framework/json/ParameterBuilder.java | 2 +- .../configure/ConstructApplication.java | 2 +- .../ConstructApplicationFactory.java | 2 +- .../streetadapter/VertexFactory.java | 4 +- .../model/ConstrainedTransfer.java | 2 +- .../transit/EntranceResolver.java | 2 +- .../opentripplanner/transit/SiteResolver.java | 2 +- .../opentripplanner/transit/StopResolver.java | 2 +- .../transit/api/model/FilterValues.java | 2 +- .../api/request/TripOnServiceDateRequest.java | 6 +- .../TripOnServiceDateRequestBuilder.java | 6 +- .../transit/api/request/TripRequest.java | 2 +- .../api/request/TripRequestBuilder.java | 2 +- .../api/request/TripTimeOnDateRequest.java | 6 +- .../request/TripTimeOnDateRequestBuilder.java | 6 +- .../transit/model/basic/LocalizedMoney.java | 2 +- .../transit/model/basic/Notice.java | 2 +- .../transit/model/basic/NoticeBuilder.java | 2 +- .../transit/model/basic/TransitMode.java | 2 +- .../transit/model/calendar/TripCalendars.java | 2 +- .../transit/TransitAlertMatcherFactory.java | 2 +- .../transit/TransitAlertSelectRequest.java | 2 +- .../filter/transit/TripMatcherFactory.java | 2 +- .../TripOnServiceDateMatcherFactory.java | 6 +- .../TripOnServiceDateSelectRequest.java | 6 +- .../transit/TripTimeOnDateMatcherFactory.java | 4 +- .../transit/TripTimeOnDateSelectRequest.java | 2 +- .../framework/AbstractEntityBuilder.java | 2 +- .../framework/AbstractTransitEntity.java | 2 +- .../transit/model/framework/Deduplicator.java | 2 +- .../model/framework/DefaultEntityById.java | 2 +- .../transit/model/framework/EntityById.java | 2 +- .../framework/EntityNotFoundException.java | 2 +- .../model/framework/ImmutableEntityById.java | 2 +- .../model/framework/TransitEntity.java | 2 +- .../transit/model/network/GroupOfRoutes.java | 2 +- .../model/network/GroupOfRoutesBuilder.java | 2 +- .../transit/model/network/Route.java | 4 +- .../transit/model/network/RouteBuilder.java | 4 +- .../transit/model/network/StopPattern.java | 2 +- .../transit/model/network/TripPattern.java | 6 +- .../model/network/TripPatternBuilder.java | 2 +- .../network/grouppriority/EntityAdapter.java | 2 +- .../model/network/grouppriority/Matchers.java | 2 +- .../TransitGroupPriorityService.java | 2 +- .../network/grouppriority/TripAdapter.java | 2 +- .../grouppriority/TripPatternAdapter.java | 2 +- .../transit/model/organization/Agency.java | 2 +- .../model/organization/AgencyBuilder.java | 2 +- .../transit/model/organization/Branding.java | 2 +- .../model/organization/BrandingBuilder.java | 2 +- .../transit/model/organization/Operator.java | 2 +- .../model/organization/OperatorBuilder.java | 2 +- .../transit/model/site/AreaStop.java | 6 +- .../transit/model/site/AreaStopBuilder.java | 4 +- .../transit/model/site/BoardingArea.java | 2 +- .../model/site/BoardingAreaBuilder.java | 2 +- .../transit/model/site/Entrance.java | 2 +- .../transit/model/site/EntranceBuilder.java | 2 +- .../transit/model/site/FareZone.java | 2 +- .../transit/model/site/FareZoneBuilder.java | 2 +- .../transit/model/site/GroupOfStations.java | 4 +- .../model/site/GroupOfStationsBuilder.java | 4 +- .../transit/model/site/GroupStop.java | 4 +- .../transit/model/site/GroupStopBuilder.java | 4 +- .../transit/model/site/MultiModalStation.java | 4 +- .../model/site/MultiModalStationBuilder.java | 4 +- .../transit/model/site/Pathway.java | 2 +- .../transit/model/site/PathwayBuilder.java | 2 +- .../transit/model/site/PathwayNode.java | 2 +- .../model/site/PathwayNodeBuilder.java | 2 +- .../transit/model/site/RegularStop.java | 4 +- .../model/site/RegularStopBuilder.java | 4 +- .../transit/model/site/Station.java | 4 +- .../transit/model/site/StationBuilder.java | 4 +- .../transit/model/site/StationElement.java | 6 +- .../model/site/StationElementBuilder.java | 6 +- .../transit/model/site/StopLocation.java | 6 +- .../model/site/StopLocationsGroup.java | 4 +- .../model/timetable/OccupancyStatus.java | 2 +- .../model/timetable/RealTimeTripTimes.java | 6 +- .../timetable/RealTimeTripTimesBuilder.java | 6 +- .../model/timetable/ScheduledTripTimes.java | 8 +- .../timetable/ScheduledTripTimesBuilder.java | 4 +- .../transit/model/timetable/StopTimeKey.java | 2 +- .../model/timetable/StopTimeKeyBuilder.java | 2 +- .../StopTimeToScheduledTripTimesMapper.java | 4 +- .../transit/model/timetable/Timetable.java | 2 +- .../model/timetable/TimetableBuilder.java | 2 +- .../transit/model/timetable/Trip.java | 6 +- .../transit/model/timetable/TripBuilder.java | 6 +- .../model/timetable/TripIdAndServiceDate.java | 2 +- .../model/timetable/TripOnServiceDate.java | 2 +- .../timetable/TripOnServiceDateBuilder.java | 2 +- .../transit/model/timetable/TripTimes.java | 8 +- .../model/timetable/TripTimesFactory.java | 2 +- .../DefaultTimetableRepository.java | 2 +- .../repository/TimetableRepository.java | 2 +- .../TimetableRepositorySnapshot.java | 2 +- .../service/DefaultTransitService.java | 4 +- .../service/PatternByServiceDatesFilter.java | 2 +- .../transit/service/SiteRepository.java | 2 +- .../service/SiteRepositoryBuilder.java | 2 +- .../transit/service/TransitRepository.java | 2 +- .../service/TransitRepositoryIndex.java | 2 +- .../transit/service/TransitService.java | 2 +- .../service/TransitServiceResolver.java | 2 +- .../alert/gtfs/AlertsUpdateHandler.java | 8 +- .../alert/siri/SiriAlertsUpdateHandler.java | 10 +-- .../alert/siri/mapping/AffectsMapper.java | 2 +- .../configure/UpdaterConfigurator.java | 2 +- .../updater/spi/UpdateError.java | 2 +- .../updater/spi/UpdateException.java | 2 +- .../trip/gtfs/CanceledTripHandler.java | 2 +- .../trip/gtfs/DuplicatedTripHandler.java | 4 +- .../gtfs/GtfsRealTimeTripUpdateAdapter.java | 2 +- .../gtfs/GtfsRealtimeFuzzyTripMatcher.java | 2 +- .../updater/trip/gtfs/NewTripHandler.java | 2 +- .../updater/trip/gtfs/RouteFactory.java | 6 +- .../trip/gtfs/ScheduledTripHandler.java | 2 +- .../updater/trip/gtfs/StopPositionMapper.java | 2 +- .../updater/trip/gtfs/TripTimesUpdater.java | 2 +- .../BackwardsDelayPropagationType.java | 2 +- .../ForwardsDelayPropagationType.java | 2 +- .../trip/gtfs/model/GtfsRealtimeMapper.java | 2 +- .../trip/gtfs/model/StopTimeUpdate.java | 2 +- .../updater/trip/gtfs/model/TripUpdate.java | 6 +- .../patterncache/TripPatternIdGenerator.java | 2 +- .../updater/trip/siri/AddedTripBuilder.java | 6 +- .../updater/trip/siri/EntityResolver.java | 2 +- .../trip/siri/ExtraCallTripBuilder.java | 4 +- .../trip/siri/ModifiedTripBuilder.java | 2 +- .../trip/siri/SiriFuzzyTripMatcher.java | 2 +- .../siri/SiriRealTimeTripUpdateAdapter.java | 2 +- .../trip/siri/SiriRealTimeUpdateHandler.java | 2 +- .../updater/trip/siri/StopTimesMapper.java | 2 +- .../updater/trip/siri/TimetableHelper.java | 2 +- .../vehicle_parking/AvailabiltyUpdate.java | 2 +- .../VehicleParkingAvailabilityUpdater.java | 2 +- .../VehicleParkingUpdater.java | 2 +- .../RealtimeVehiclePatternMatcher.java | 2 +- .../vehicle_rental/VehicleRentalUpdater.java | 2 +- .../datasources/params/RentalPickupType.java | 2 +- .../opentripplanner/warmup/api/WarmupApi.java | 2 +- .../model/id/FeedScopedIdForTestFactory.java | 2 + .../ext/fares/model/FareModelForTest.java | 4 +- .../ext/fares/model/FareTestConstants.java | 2 +- .../module/islandpruning/TestNamer.java | 4 +- .../graphbuilder/GtfsModuleTestFactory.java | 2 +- .../model/plan/TestItinerary.java | 2 +- .../model/plan/TestTransitLegBuilder.java | 2 +- .../model/RentalVehicleTypeFactory.java | 4 +- .../street/model/StreetModelForTest.java | 4 +- .../street/model/vertex/SimpleVertex.java | 2 +- .../street/search/state/TestStateBuilder.java | 4 +- .../model/SiteRepositoryTestBuilder.java | 2 +- .../model/TransitRepositoryTestBuilder.java | 2 +- .../model/TransitTestEnvironmentBuilder.java | 2 +- .../transit/model/TripInput.java | 4 +- .../transit/model/TripOnDateDataFetcher.java | 2 +- .../transit/model/site/TestStopLocation.java | 4 +- .../transit/service/NoopSiteResolver.java | 2 +- .../updater/trip/gtfs/GtfsRtTestHelper.java | 2 +- .../updater/trip/siri/SiriTestHelper.java | 2 +- .../opentripplanner/ConstantsForTests.java | 6 +- .../java/org/opentripplanner/GtfsTest.java | 4 +- .../OtpArchitectureModules.java | 15 ++-- .../_support/text/I18NStrings.java | 4 +- .../api/common/LocationStringParserTest.java | 2 +- .../transit/DefaultFeedIdMapperTest.java | 2 +- .../model/transit/FeedScopedIdMapperTest.java | 2 +- .../model/transit/HideFeedIdMapperTest.java | 2 +- .../apis/gtfs/CostScalarTest.java | 2 +- .../apis/gtfs/GraphQLIntegrationTest.java | 10 +-- .../AlertsConnectionFilterMapperTest.java | 2 +- .../CanceledTripsFilterMapperTest.java | 4 +- .../routerequest/AlertsFilterTest.java | 4 +- .../LegacyRouteRequestMapperTest.java | 2 +- .../RouteRequestMapperBicycleTest.java | 2 +- .../RouteRequestMapperCarTest.java | 2 +- .../RouteRequestMapperScooterTest.java | 2 +- .../routerequest/RouteRequestMapperTest.java | 2 +- .../RouteRequestMapperTransitTest.java | 2 +- .../RouteRequestMapperWalkTest.java | 2 +- .../gtfs/model/OffsetDateTimeRangeTest.java | 2 +- .../gtfs/service/ApiTransitServiceTest.java | 4 +- .../sort/AlertsConnectionOrderingTest.java | 4 +- .../time/OffsetDateTimeRangeUtilTest.java | 2 +- .../mapping/FixedFeedIdGeneratorTest.java | 2 +- .../apis/transmodel/model/EnumTypesTest.java | 2 +- .../model/PlanResponseBuilderTest.java | 2 +- .../model/plan/RelaxCostTypeTest.java | 2 +- .../plan/TripPlanTimePenaltyDtoTest.java | 2 +- .../framework/FrameworkArchitectureTest.java | 8 +- .../doc/DocumentedEnumTestHelper.java | 2 +- .../framework/graphql/GraphQLUtilsTest.java | 2 +- .../graphql/scalar/CostScalarFactoryTest.java | 2 +- .../framework/model/CostTest.java | 4 +- .../framework/model/TimeAndCostTest.java | 2 +- .../v2/GbfsFreeVehicleStatusMapperTest.java | 4 +- .../gbfs/v3/GbfsFeedMapperTest.java | 2 +- .../v3/GbfsStationInformationMapperTest.java | 4 +- .../gbfs/v3/GbfsVehicleStatusMapperTest.java | 4 +- .../OsmBoardingLocationsModuleTest.java | 4 +- .../module/StreetLinkerModuleTest.java | 2 +- .../CalculateWorldEnvelopeModuleTest.java | 2 +- .../geometry/GeometryProcessorTest.java | 2 +- .../islandpruning/SubgraphOnlyFerryTest.java | 2 +- .../ned/MissingElevationHandlerTest.java | 2 +- .../module/osm/ParkingProcessorTest.java | 2 +- .../elevator/MultipleLevelsTest.java | 2 +- .../GenerateTripPatternsOperationTest.java | 2 +- .../gtfs/graphbuilder/GtfsModuleTest.java | 2 +- .../interlining/InterlineProcessorTest.java | 2 +- .../gtfs/mapping/BoardingAreaMapperTest.java | 2 +- .../gtfs/mapping/EntranceMapperTest.java | 2 +- .../gtfs/mapping/IdFactoryTest.java | 2 +- .../gtfs/mapping/LocationGroupMapperTest.java | 2 +- .../gtfs/mapping/PathwayNodeMapperTest.java | 2 +- .../gtfs/mapping/RouteMapperTest.java | 2 +- .../gtfs/mapping/ShapePointMapperTest.java | 2 +- .../gtfs/mapping/StopMapperTest.java | 2 +- .../gtfs/mapping/TranslationHelperTest.java | 2 +- .../gtfs/mapping/TripMapperTest.java | 2 +- .../inspector/vector/KeyValueTest.java | 2 +- .../vector/stop/AreaStopLayerBuilderTest.java | 4 +- .../model/GenericLocationTest.java | 2 +- .../model/TripPatternTest.java | 2 +- .../CalendarServiceDataFactoryImplTest.java | 2 +- .../impl/DefaultTransitDataImportTest.java | 2 +- ...ansitDataImportBuilderLimitPeriodTest.java | 4 +- .../impl/TransitDataImportBuilderTest.java | 2 +- .../model/plan/ItineraryTest.java | 2 +- .../opentripplanner/model/plan/PlaceTest.java | 6 +- .../model/plan/TestItineraryBuilder.java | 6 +- .../plan/leg/ScheduledTransitLegTest.java | 4 +- .../LegReferenceSerializerTest.java | 2 +- .../ScheduledTransitLegReferenceTest.java | 2 +- .../cursor/DeduplicationPageCutTest.java | 4 +- .../paging/cursor/PageCursorFactoryTest.java | 2 +- .../cursor/PageCursorSerializerTest.java | 2 +- .../plan/paging/cursor/PageCursorTest.java | 2 +- .../model/plan/walkstep/WalkStepTest.java | 2 +- .../netex/NetexEpipBundleSmokeTest.java | 4 +- .../netex/NetexNordicBundleSmokeTest.java | 4 +- .../mapping/FeedScopedIdFactoryTest.java | 2 +- .../netex/mapping/NetexMapperTest.java | 2 +- .../netex/mapping/ServiceLinkMapperTest.java | 4 +- .../mapping/StopAndStationMapperTest.java | 2 +- .../mapping/TripCalendarBuilderTest.java | 2 +- .../netex/mapping/TripMapperTest.java | 4 +- .../netex/mapping/TripPatternMapperTest.java | 2 +- .../calendar/CalendarServiceBuilderTest.java | 2 +- .../osm/model/OsmEntityTest.java | 2 +- .../NearbyStopFinderVisitorTest.java | 2 +- .../PlaceFinderTraverseVisitorTest.java | 2 +- .../_data/transit/TestAccessEgress.java | 2 +- .../_data/transit/TestTripSchedule.java | 4 +- .../routing/alertpatch/AlertCalendarTest.java | 2 +- .../alertpatch/EntitySelectorTest.java | 2 +- .../routing/algorithm/FilterTest.java | 2 +- .../routing/algorithm/GraphRoutingTest.java | 8 +- .../routing/algorithm/TestBanning.java | 2 +- .../system/mcmax/McMaxLimitFilterTest.java | 2 +- .../transit/DecorateTransitAlertTest.java | 2 +- ...RemoveTransitIfStreetOnlyIsBetterTest.java | 2 +- .../TransitGeneralizedCostFilterTest.java | 2 +- .../RaptorPathToItineraryMapperTest.java | 2 +- .../mapping/StatesToWalkStepsMapperTest.java | 4 +- .../mapping/TransitSnapshotTest.java | 2 +- .../_support/mapping/FeedScopedIdMapper.java | 2 +- .../mapping/_support/mapping/LegMapper.java | 2 +- .../mapping/_support/mapping/PlaceMapper.java | 2 +- .../router/street/AccessEgressRouterTest.java | 2 +- .../router/street/AccessEgressesTest.java | 2 +- .../transit/DefaultAccessEgressTest.java | 2 +- .../cost/PatternCostCalculatorTest.java | 4 +- .../cost/RaptorCostLinearFunctionTest.java | 2 +- .../cost/WheelchairCostCalculatorTest.java | 2 +- .../GeneralizedCostParametersMapperTest.java | 2 +- .../mappers/LookupStopIndexCallbackTest.java | 2 +- .../mappers/RaptorRequestMapperTest.java | 2 +- .../mappers/TestLookupStopIndexCallback.java | 2 +- .../DefaultTransitDataProviderFilterTest.java | 4 +- ...rRoutingRequestTransitDataCreatorTest.java | 2 +- .../transit/request/TestRouteData.java | 2 +- .../api/DefaultRoutingServiceTest.java | 2 +- .../routing/api/request/TripLocationTest.java | 2 +- .../api/request/TripOnDateReferenceTest.java | 2 +- .../framework/CostLinearFunctionTest.java | 2 +- .../framework/TimeAndCostPenaltyTest.java | 2 +- .../preference/CarPreferencesTest.java | 2 +- .../DirectTransitPreferencesTest.java | 2 +- .../preference/TransitPreferencesTest.java | 2 +- .../VehicleParkingPreferencesTest.java | 2 +- .../VehicleRentalPreferencesTest.java | 2 +- .../VehicleWalkingPreferencesTest.java | 2 +- .../request/request/JourneyRequestTest.java | 2 +- .../request/request/TransitRequestTest.java | 2 +- .../filter/TransitGroupSelectTest.java | 2 +- .../via/PassThroughViaLocationTest.java | 2 +- .../api/request/via/VisitViaLocationTest.java | 2 +- .../routing/core/DistanceTest.java | 2 +- .../routing/core/RatioTest.java | 2 +- .../routing/core/RouteRequestTest.java | 2 +- .../routing/graph/GraphSerializationTest.java | 2 +- ...DelegatingTransitAlertServiceImplTest.java | 2 +- .../impl/TransitAlertServiceImplTest.java | 2 +- .../linking/LinkingContextFactoryTest.java | 2 +- .../stoptimes/AlternativeLegsTest.java | 4 +- .../trippattern/FrequencyEntryTest.java | 2 +- .../DefaultRealtimeVehicleRepositoryTest.java | 2 +- .../VehicleParkingTestUtil.java | 4 +- .../TestFreeFloatingRentalVehicleBuilder.java | 10 +-- .../TestVehicleRentalStationBuilder.java | 6 +- .../config/framework/json/EnumMapperTest.java | 2 +- .../framework/json/NodeAdapterTest.java | 2 +- .../standalone/server/AlertMetricsTest.java | 2 +- .../street/integration/EdgeSplittingTest.java | 2 +- .../StreetSearchRequestMapperTest.java | 6 +- .../ConstrainedBoardingSearchTest.java | 2 +- .../TransferIndexGeneratorTest.java | 2 +- .../index/RaptorTransferIndexTest.java | 2 +- .../TripTimeOnDateRequestBuilderTest.java | 4 +- .../transit/model/_data/PatternTestModel.java | 2 +- .../model/_data/TransitRepositoryForTest.java | 6 +- .../RegularStopMatcherFactoryTest.java | 2 +- .../transit/RouteMatcherFactoryTest.java | 4 +- .../StopLocationMatcherFactoryTest.java | 4 +- .../TransitAlertMatcherFactoryTest.java | 4 +- .../transit/TripMatcherFactoryTest.java | 2 +- .../TripOnServiceDateMatcherFactoryTest.java | 4 +- .../TripTimeOnDateMatcherFactoryTest.java | 2 +- .../model/framework/EntityByIdTest.java | 2 +- .../EntityNotFoundExceptionTest.java | 2 +- .../transit/model/network/RouteTest.java | 4 +- .../network/grouppriority/MatchersTest.java | 2 +- .../transit/model/site/AreaStopTest.java | 4 +- .../transit/model/site/BoardingAreaTest.java | 4 +- .../transit/model/site/EntranceTest.java | 6 +- .../model/site/GroupOfStationsTest.java | 4 +- .../transit/model/site/GroupStopTest.java | 4 +- .../model/site/MultiModalStationTest.java | 4 +- .../transit/model/site/PathwayNodeTest.java | 6 +- .../transit/model/site/RegularStopTest.java | 8 +- .../transit/model/site/StationTest.java | 4 +- .../timetable/RealTimeTripTimesTest.java | 6 +- .../timetable/ScheduledTripTimesTest.java | 4 +- .../transit/model/timetable/TripTest.java | 6 +- .../DefaultTimetableRepositoryTest.java | 2 +- .../service/DefaultTransitServiceTest.java | 6 +- .../PatternByServiceDatesFilterTest.java | 2 +- .../transit/service/SiteRepositoryTest.java | 4 +- .../transit/service/StopTimesHelperTest.java | 2 +- .../service/TransitRepositoryTest.java | 2 +- .../transit/speed_test/SpeedTest.java | 2 +- .../io/TestCaseDefinitionCsvFile.java | 2 +- .../alert/gtfs/AlertsUpdateHandlerTest.java | 2 +- .../siri/SiriAlertsUpdateHandlerTest.java | 4 +- .../updater/spi/UpdateErrorTest.java | 2 +- ...acyTimetableRepositoryIntegrationTest.java | 2 +- .../trip/gtfs/TripTimesUpdaterTest.java | 4 +- ...ataBackwardsEarlinessInterpolatorTest.java | 2 +- .../gtfs/moduletests/addition/AddedTest.java | 2 +- .../moduletests/addition/ReplacementTest.java | 2 +- .../trip/siri/AddedTripBuilderTest.java | 2 +- .../updater/trip/siri/EntityResolverTest.java | 2 +- .../trip/siri/ModifiedTripBuilderTest.java | 2 +- .../trip/siri/TimetableHelperTest.java | 4 +- .../extrajourney/ExtraJourneyTest.java | 2 +- .../replacement/PartialReplacementTest.java | 2 +- ...VehicleParkingAvailabilityUpdaterTest.java | 4 +- .../RealtimeVehicleMatcherTest.java | 2 +- .../deduplicator/DeduplicatorNoop.java | 2 +- .../deduplicator/DeduplicatorService.java | 2 +- .../framework/di/TransitServicePeriod.java | 2 +- .../resources/ResourceBundleAdaptor.java | 2 +- .../resources/ResourceBundleSingleton.java | 2 +- .../model/accessibility/Accessibility.java | 2 +- .../core/domain/model/basic/Cost.java | 2 +- .../core/domain/model/basic/Distance.java | 2 +- .../domain/model/basic/NormalizedCost.java | 2 +- .../core/domain/model/basic/Ratio.java | 2 +- .../core/domain/model/doc/DocumentedEnum.java | 2 +- .../core/domain/model/i18n/I18NString.java | 2 +- .../domain/model/i18n/I18NStringMapper.java | 2 +- .../domain/model/i18n/LocalizedString.java | 4 +- .../model/i18n/LocalizedStringFormat.java | 2 +- .../domain/model/i18n/NonLocalizedString.java | 2 +- .../domain/model/i18n/TranslatedString.java | 2 +- .../core/domain/model/id/FeedScopedId.java | 2 +- .../domain/model/time/LocalDateRange.java | 2 +- .../core/domain/model/time/TimePeriod.java | 2 +- .../domain/model/i18n/I18NStringTest.java | 2 +- .../model/i18n/LocalizedStringTest.java | 2 +- .../model/i18n/TranslatedStringTest.java | 2 +- .../domain/model/id/FeedScopedIdTest.java | 2 +- .../domain/model/time/LocalDateRangeTest.java | 2 +- .../domain/model/time/TimePeriodTest.java | 2 +- .../vehicleparking/model/VehicleParking.java | 4 +- .../model/VehicleParkingEntrance.java | 4 +- .../model/VehicleParkingGroup.java | 4 +- .../model/VehicleParkingGroupBuilder.java | 4 +- .../VehicleRentalRepository.java | 2 +- .../vehiclerental/VehicleRentalService.java | 2 +- .../DefaultVehicleRentalRepository.java | 2 +- .../internal/DefaultVehicleRentalService.java | 2 +- .../vehiclerental/model/GeofencingZone.java | 4 +- .../model/RentalVehicleFuel.java | 4 +- .../model/RentalVehicleType.java | 4 +- .../model/VehicleRentalPlace.java | 4 +- .../model/VehicleRentalStation.java | 4 +- .../model/VehicleRentalStationBuilder.java | 4 +- .../model/VehicleRentalSystem.java | 2 +- .../model/VehicleRentalVehicle.java | 4 +- .../street/StreetVehicleRentalLink.java | 2 +- .../street/VehicleRentalEdge.java | 2 +- .../street/VehicleRentalPlaceVertex.java | 2 +- .../opentripplanner/street/graph/Graph.java | 2 +- .../street/graph/StreetIndex.java | 2 +- .../graph/summary/StreetSummarizer.java | 2 +- .../street/linking/AreaEdgeProperties.java | 2 +- .../street/model/StreetMode.java | 2 +- .../street/model/edge/Area.java | 2 +- .../street/model/edge/Edge.java | 2 +- .../street/model/edge/ElevatorAlightEdge.java | 4 +- .../street/model/edge/ElevatorBoardEdge.java | 4 +- .../street/model/edge/ElevatorHopEdge.java | 4 +- .../street/model/edge/EscalatorEdge.java | 4 +- .../street/model/edge/FreeEdge.java | 2 +- .../street/model/edge/PathwayEdge.java | 4 +- .../street/model/edge/StreetEdge.java | 2 +- .../street/model/edge/StreetEdgeBuilder.java | 4 +- .../model/edge/StreetTransitEntityLink.java | 4 +- .../model/edge/StreetTransitEntranceLink.java | 2 +- .../model/edge/StreetVehicleParkingLink.java | 2 +- .../street/model/edge/VehicleParkingEdge.java | 4 +- .../model/openinghours/OHCalendarBuilder.java | 2 +- .../OpeningHoursCalendarService.java | 6 +- .../street/model/vertex/BarrierVertex.java | 2 +- .../model/vertex/ElevatorHopVertex.java | 2 +- .../vertex/LabelledIntersectionVertex.java | 2 +- .../vertex/OsmBoardingLocationVertex.java | 2 +- .../street/model/vertex/OsmVertex.java | 2 +- .../street/model/vertex/SplitterVertex.java | 2 +- .../model/vertex/StationCentroidVertex.java | 4 +- .../model/vertex/StationElementVertex.java | 4 +- .../model/vertex/StationEntranceVertex.java | 4 +- .../street/model/vertex/StreetLocation.java | 2 +- .../street/model/vertex/StreetVertex.java | 6 +- .../street/model/vertex/SubsidiaryVertex.java | 2 +- .../model/vertex/TemporaryStreetLocation.java | 2 +- .../vertex/TransitBoardingAreaVertex.java | 4 +- .../model/vertex/TransitEntranceVertex.java | 6 +- .../vertex/TransitPathwayNodeVertex.java | 4 +- .../model/vertex/TransitStopVertex.java | 6 +- .../vertex/TransitStopVertexBuilder.java | 4 +- .../vertex/VehicleParkingEntranceVertex.java | 2 +- .../street/model/vertex/Vertex.java | 4 +- .../street/model/vertex/VertexLabel.java | 2 +- .../search/request/AccessibilityRequest.java | 2 +- .../street/search/request/CarRequest.java | 2 +- .../search/request/ElevatorRequest.java | 2 +- .../street/search/request/ParkingRequest.java | 2 +- .../street/search/request/RentalRequest.java | 2 +- .../search/request/VehicleWalkingRequest.java | 2 +- .../core/model/id/FeedScopedIdFactory.java | 2 + .../TestFreeFloatingRentalVehicleBuilder.java | 10 +-- .../model/TestGeofencingZoneBuilder.java | 4 +- .../TestVehicleRentalStationBuilder.java | 6 +- .../street/linking/LinkingEnvironment.java | 2 +- .../street/model/StreetModelFactory.java | 4 +- .../street/model/edge/SimpleConcreteEdge.java | 2 +- .../model/edge/TestAreaGroupBuilder.java | 2 +- .../street/model/edge/TestEdge.java | 2 +- .../street/model/vertex/SimpleVertex.java | 2 +- .../street/search/state/TestStateBuilder.java | 4 +- .../geofencing/PreResolveVertexZonesTest.java | 4 +- .../street/graph/StreetIndexTest.java | 4 +- .../street/integration/BikeRentalTest.java | 2 +- .../street/integration/BikeWalkingTest.java | 2 +- .../street/integration/GraphRoutingTest.java | 8 +- .../street/integration/ParkAndRideTest.java | 2 +- .../ScooterRentalGeofencingTest.java | 6 +- .../linking/AreaEdgePropertiesTest.java | 2 +- .../street/linking/FlexLinkingTest.java | 2 +- .../street/linking/PlatformLinkingTest.java | 4 +- .../street/linking/PreparedAreaGroupTest.java | 2 +- .../TemporaryVerticesContainerTest.java | 2 +- .../linking/VehicleParkingHelperTest.java | 4 +- .../linking/VertexLinkerGeofencingTest.java | 2 +- .../model/edge/AreaEdgeBuilderTest.java | 2 +- .../model/edge/ElevatorHopEdgeTest.java | 2 +- .../street/model/edge/PathwayEdgeTest.java | 4 +- .../model/edge/StreetEdgeBuilderTest.java | 2 +- .../model/edge/StreetEdgeSplittingTest.java | 2 +- .../street/model/edge/StreetEdgeTest.java | 4 +- .../edge/StreetTransitEntityLinkTest.java | 8 +- .../edge/StreetVehicleParkingLinkTest.java | 4 +- ...TemporaryPartialStreetEdgeBuilderTest.java | 2 +- .../edge/TemporaryPartialStreetEdgeTest.java | 2 +- .../model/edge/VehicleParkingEdgeTest.java | 2 +- .../edge/VehicleParkingPreferredTagsTest.java | 4 +- .../model/openinghours/OHCalendarTest.java | 2 +- .../model/vertex/BarrierVertexTest.java | 2 +- .../street/model/vertex/OsmVertexTest.java | 2 +- .../vertex/TemporaryVertexDisposeTest.java | 2 +- ...leIntersectionTraversalCalculatorTest.java | 2 +- .../search/request/BikeRequestTest.java | 2 +- .../street/search/request/CarRequestTest.java | 2 +- .../search/request/ParkingRequestTest.java | 4 +- .../search/request/RentalRequestTest.java | 4 +- .../request/VehicleWalkingRequestTest.java | 2 +- 962 files changed, 1361 insertions(+), 1348 deletions(-) diff --git a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/CarpoolTripTestData.java b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/CarpoolTripTestData.java index 03c7229777d..bc5b9261c4b 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/CarpoolTripTestData.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/CarpoolTripTestData.java @@ -4,7 +4,7 @@ import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.List; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.model.CarpoolStop; import org.opentripplanner.ext.carpooling.model.CarpoolTrip; import org.opentripplanner.ext.carpooling.model.CarpoolTripBuilder; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/constraints/PassengerDelayConstraintsTest.java b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/constraints/PassengerDelayConstraintsTest.java index a29b8b62686..9b7c58e7590 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/constraints/PassengerDelayConstraintsTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/constraints/PassengerDelayConstraintsTest.java @@ -9,7 +9,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.Test; import org.opentripplanner.astar.model.GraphPath; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.CarpoolGraphPathBuilder; import org.opentripplanner.ext.carpooling.model.CarpoolStop; import org.opentripplanner.street.model.edge.Edge; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/internal/DefaultCarpoolingRepositoryTest.java b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/internal/DefaultCarpoolingRepositoryTest.java index 049ecfa766f..832e0efe7cb 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/internal/DefaultCarpoolingRepositoryTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/internal/DefaultCarpoolingRepositoryTest.java @@ -10,7 +10,7 @@ import java.time.ZonedDateTime; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.CarpoolTripTestData; import org.opentripplanner.ext.carpooling.model.CarpoolStop; import org.opentripplanner.ext.carpooling.model.CarpoolTrip; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/model/CarpoolStopBuilderTest.java b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/model/CarpoolStopBuilderTest.java index a468587379c..ec703f5cc34 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/model/CarpoolStopBuilderTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/model/CarpoolStopBuilderTest.java @@ -7,7 +7,7 @@ import java.time.ZoneId; import java.time.ZonedDateTime; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; public class CarpoolStopBuilderTest { diff --git a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/model/CarpoolTripBuilderTest.java b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/model/CarpoolTripBuilderTest.java index 5f9242b4eb5..cfc14dc8a11 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/model/CarpoolTripBuilderTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/model/CarpoolTripBuilderTest.java @@ -12,7 +12,7 @@ import java.time.ZonedDateTime; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.organization.ContactInfo; public class CarpoolTripBuilderTest { diff --git a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/routing/CarpoolAccessEgressTest.java b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/routing/CarpoolAccessEgressTest.java index 78b91cb8c24..4e8310a2ae5 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/routing/CarpoolAccessEgressTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/routing/CarpoolAccessEgressTest.java @@ -13,7 +13,7 @@ import javax.annotation.Nullable; import org.junit.jupiter.api.Test; import org.opentripplanner.astar.model.GraphPath; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.raptor.spi.RaptorConstants; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingServiceCrossLegInsertionTest.java b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingServiceCrossLegInsertionTest.java index 97525e44c2f..ac63809ff94 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingServiceCrossLegInsertionTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingServiceCrossLegInsertionTest.java @@ -10,7 +10,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.model.CarpoolStop; import org.opentripplanner.ext.carpooling.model.CarpoolTrip; import org.opentripplanner.ext.carpooling.model.CarpoolTripBuilder; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingServiceTreeLimitTest.java b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingServiceTreeLimitTest.java index 0ccdf86bedd..1cf520fe65f 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingServiceTreeLimitTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingServiceTreeLimitTest.java @@ -10,7 +10,7 @@ import java.time.ZonedDateTime; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.model.CarpoolStop; import org.opentripplanner.ext.carpooling.model.CarpoolTrip; import org.opentripplanner.ext.carpooling.model.CarpoolTripBuilder; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/updater/MultiFeedSiriETCarpoolingUpdaterTest.java b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/updater/MultiFeedSiriETCarpoolingUpdaterTest.java index 92a88a6d603..0596a880b90 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/updater/MultiFeedSiriETCarpoolingUpdaterTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/updater/MultiFeedSiriETCarpoolingUpdaterTest.java @@ -14,7 +14,7 @@ import java.util.stream.Collectors; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.CarpoolTripWithVerticesTestData; import org.opentripplanner.ext.carpooling.internal.DefaultCarpoolingRepository; import org.opentripplanner.ext.carpooling.routing.CarpoolTripVertexResolver; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/updater/SiriETCarpoolingUpdaterTest.java b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/updater/SiriETCarpoolingUpdaterTest.java index 0d00219f153..6baa27c8bf7 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/updater/SiriETCarpoolingUpdaterTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/updater/SiriETCarpoolingUpdaterTest.java @@ -22,7 +22,7 @@ import java.time.Duration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.CarpoolTripWithVerticesTestData; import org.opentripplanner.ext.carpooling.internal.DefaultCarpoolingRepository; import org.opentripplanner.ext.carpooling.routing.CarpoolTripVertexResolver; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/edgenaming/CrosswalkNamerTest.java b/application/src/ext-test/java/org/opentripplanner/ext/edgenaming/CrosswalkNamerTest.java index 055cc752bea..025cdecd7b3 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/edgenaming/CrosswalkNamerTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/edgenaming/CrosswalkNamerTest.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.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.module.osm.EdgeNamer; import org.opentripplanner.graph_builder.module.osm.model.StreetEdgePair; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/edgenaming/SidewalkNamerTest.java b/application/src/ext-test/java/org/opentripplanner/ext/edgenaming/SidewalkNamerTest.java index db739aa7fe2..4087d4fb888 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/edgenaming/SidewalkNamerTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/edgenaming/SidewalkNamerTest.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.module.osm.EdgeNamer; import org.opentripplanner.graph_builder.module.osm.model.StreetEdgePair; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/emission/EmissionTestData.java b/application/src/ext-test/java/org/opentripplanner/ext/emission/EmissionTestData.java index ffd097170b5..5da82b2000d 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/emission/EmissionTestData.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/emission/EmissionTestData.java @@ -2,7 +2,7 @@ import java.io.File; import org.opentripplanner.ConstantsForTests; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.datastore.api.CompositeDataSource; import org.opentripplanner.datastore.api.DataSource; import org.opentripplanner.datastore.api.DataSourceTestFactory; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/EmissionDataReaderTest.java b/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/EmissionDataReaderTest.java index 9378bab5389..451582b83f3 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/EmissionDataReaderTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/EmissionDataReaderTest.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.emission.EmissionRepository; import org.opentripplanner.ext.emission.EmissionTestData; import org.opentripplanner.ext.emission.internal.DefaultEmissionRepository; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/route/RouteDataReaderTest.java b/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/route/RouteDataReaderTest.java index e7dc0a659a3..c8c653855b2 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/route/RouteDataReaderTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/route/RouteDataReaderTest.java @@ -8,7 +8,7 @@ import java.io.FileNotFoundException; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.emission.EmissionTestData; import org.opentripplanner.framework.csv.HeadersDoNotMatch; import org.opentripplanner.graph_builder.issue.service.DefaultDataImportIssueStore; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/trip/EmissionAggregatorTest.java b/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/trip/EmissionAggregatorTest.java index b00bf854bfc..f8f51cb0152 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/trip/EmissionAggregatorTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/trip/EmissionAggregatorTest.java @@ -5,7 +5,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.model.Gram; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.site.StopLocation; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/trip/TripHopMapperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/trip/TripHopMapperTest.java index b9a3d96ea2b..8fb7a038b53 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/trip/TripHopMapperTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/trip/TripHopMapperTest.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.model.Gram; import org.opentripplanner.graph_builder.issue.api.DataImportIssue; import org.opentripplanner.graph_builder.issue.service.DefaultDataImportIssueStore; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/itinerary/EmissionItineraryDecoratorTest.java b/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/itinerary/EmissionItineraryDecoratorTest.java index fe7ece6f3cc..013d1c42c68 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/itinerary/EmissionItineraryDecoratorTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/itinerary/EmissionItineraryDecoratorTest.java @@ -10,7 +10,7 @@ import java.util.Map; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.emission.EmissionService; import org.opentripplanner.ext.emission.internal.DefaultEmissionRepository; import org.opentripplanner.ext.emission.internal.DefaultEmissionService; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayRepositoryTest.java b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayRepositoryTest.java index 8932c4c951f..42f50f69ba4 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayRepositoryTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayRepositoryTest.java @@ -21,7 +21,7 @@ import java.util.Optional; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.internal.DefaultEmpiricalDelayRepository; import org.opentripplanner.ext.empiricaldelay.model.TripDelays; import org.opentripplanner.ext.empiricaldelay.model.calendar.EmpiricalDelayCalendar; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayServiceTest.java index 50db5abde37..d8b094af3ee 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayServiceTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayServiceTest.java @@ -16,7 +16,7 @@ import java.util.Optional; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.internal.DefaultEmpiricalDelayRepository; import org.opentripplanner.ext.empiricaldelay.internal.DefaultEmpiricalDelayService; import org.opentripplanner.ext.empiricaldelay.model.TripDelays; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayTestData.java b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayTestData.java index 4ac43a233b4..a0662fd72dd 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayTestData.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayTestData.java @@ -3,7 +3,7 @@ import java.time.DayOfWeek; import java.time.LocalDate; import java.util.Arrays; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.model.EmpiricalDelay; import org.opentripplanner.ext.empiricaldelay.model.calendar.EmpiricalDelayCalendar; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/EmpiricalDelayCsvDataReaderTest.java b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/EmpiricalDelayCsvDataReaderTest.java index 974b73bfc73..c2869c5a9bf 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/EmpiricalDelayCsvDataReaderTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/EmpiricalDelayCsvDataReaderTest.java @@ -8,7 +8,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.datastore.api.DataSourceTestFactory; import org.opentripplanner.datastore.api.ListCompositeDataSource; import org.opentripplanner.ext.empiricaldelay.internal.model.DelayAtStopDto; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/delay/TripTimeDelayCsvParserTest.java b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/delay/TripTimeDelayCsvParserTest.java index 54d350109af..b16e8959a1a 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/delay/TripTimeDelayCsvParserTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/delay/TripTimeDelayCsvParserTest.java @@ -6,7 +6,7 @@ import com.csvreader.CsvReader; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; class TripTimeDelayCsvParserTest { diff --git a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/graphbuilder/TripDelaysMapperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/graphbuilder/TripDelaysMapperTest.java index d7d7d010553..a1ada3ba032 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/graphbuilder/TripDelaysMapperTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/graphbuilder/TripDelaysMapperTest.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.internal.model.TripDelaysAgregator; import org.opentripplanner.ext.empiricaldelay.model.EmpiricalDelay; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/model/DelayAtStopDtoTest.java b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/model/DelayAtStopDtoTest.java index 097e7b1c60f..531a37b4359 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/model/DelayAtStopDtoTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/model/DelayAtStopDtoTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.model.EmpiricalDelay; class DelayAtStopDtoTest { diff --git a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/model/EmpiricalDelaySummaryTest.java b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/model/EmpiricalDelaySummaryTest.java index 2ccc606536a..96d0cb96ed5 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/model/EmpiricalDelaySummaryTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/model/EmpiricalDelaySummaryTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; class EmpiricalDelaySummaryTest { diff --git a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/model/TripDelaysDtoTest.java b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/model/TripDelaysDtoTest.java index fda97e6e7fb..8cceca6504a 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/model/TripDelaysDtoTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/model/TripDelaysDtoTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.model.EmpiricalDelay; class TripDelaysDtoTest { diff --git a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/model/TripDelaysTest.java b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/model/TripDelaysTest.java index 8b55b45adce..c98f10a824a 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/model/TripDelaysTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/model/TripDelaysTest.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Optional; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; class TripDelaysTest { diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/FareRuleSetTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/FareRuleSetTest.java index 910c0dfcb27..6601f1cafd0 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/FareRuleSetTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/FareRuleSetTest.java @@ -10,7 +10,7 @@ import java.util.Set; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareAttribute; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.transit.model.basic.Money; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/model/FareProductTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/model/FareProductTest.java index 3487bf0a251..e1bfb0a5b0c 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/model/FareProductTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/model/FareProductTest.java @@ -12,7 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.fare.FareMedium; import org.opentripplanner.model.fare.FareProduct; import org.opentripplanner.model.fare.RiderCategory; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareServiceTest.java index 28c944e0b2c..6e1f19ddbaa 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareServiceTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareServiceTest.java @@ -18,8 +18,8 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareModelForTest; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.model.plan.Itinerary; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HSLFareServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HSLFareServiceTest.java index 7d3c6285ff6..7b7ddab33d1 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HSLFareServiceTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HSLFareServiceTest.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.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareAttribute; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.model.plan.Itinerary; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HighestFareInFreeTransferWindowFareServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HighestFareInFreeTransferWindowFareServiceTest.java index 4d644c5ec83..a8b854d608a 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HighestFareInFreeTransferWindowFareServiceTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HighestFareInFreeTransferWindowFareServiceTest.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.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareAttribute; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.model.fare.FareProduct; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java index bd3c6425b0a..1c7b70594ed 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java @@ -38,9 +38,9 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.model.basic.Cost; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareModelForTest; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.model.fare.FareOffer; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/AreasTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/AreasTest.java index 4784c5326ff..dca824b8c60 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/AreasTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/AreasTest.java @@ -8,7 +8,7 @@ import java.util.Map; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.model.fare.FareOffer; import org.opentripplanner.model.fare.FareProduct; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/CostedTransferInNetworkTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/CostedTransferInNetworkTest.java index 5085a4ad230..995a5e76dca 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/CostedTransferInNetworkTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/CostedTransferInNetworkTest.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTestConstants; import org.opentripplanner.ext.fares.model.FareTransferRule; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/DepartureToArrivalTimeLimitTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/DepartureToArrivalTimeLimitTest.java index da80500a699..8425e839715 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/DepartureToArrivalTimeLimitTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/DepartureToArrivalTimeLimitTest.java @@ -8,7 +8,7 @@ import java.time.Duration; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTestConstants; import org.opentripplanner.ext.fares.model.FareTransferRule; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/DepartureToDepartureTimeLimitTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/DepartureToDepartureTimeLimitTest.java index 56e8d3df822..6000c586d48 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/DepartureToDepartureTimeLimitTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/DepartureToDepartureTimeLimitTest.java @@ -8,7 +8,7 @@ import java.time.Duration; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTestConstants; import org.opentripplanner.ext.fares.model.FareTransferRule; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FlexLegTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FlexLegTest.java index 5c9927b93a8..eaa6a066848 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FlexLegTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FlexLegTest.java @@ -7,7 +7,7 @@ import com.google.common.collect.ImmutableMultimap; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTestConstants; import org.opentripplanner.model.fare.FareOffer; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FreeTransferInNetworkTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FreeTransferInNetworkTest.java index 7b3a9eb2c41..264cdf5b959 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FreeTransferInNetworkTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FreeTransferInNetworkTest.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTransferRule; import org.opentripplanner.model.fare.FareOffer; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FreeTransferTimeLimitTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FreeTransferTimeLimitTest.java index 671b2b77356..80fb27eecc4 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FreeTransferTimeLimitTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FreeTransferTimeLimitTest.java @@ -8,7 +8,7 @@ import java.time.Duration; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTestConstants; import org.opentripplanner.ext.fares.model.FareTransferRule; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2ServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2ServiceTest.java index d138b1370b1..f17187bbfc5 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2ServiceTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2ServiceTest.java @@ -8,7 +8,7 @@ import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.model.fare.FareOffer; import org.opentripplanner.model.fare.FareProduct; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/OnlyFromTimeframeMatcherTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/OnlyFromTimeframeMatcherTest.java index 2bd9c448731..15b939721a0 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/OnlyFromTimeframeMatcherTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/OnlyFromTimeframeMatcherTest.java @@ -10,7 +10,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTestConstants; import org.opentripplanner.ext.fares.model.Timeframe; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/SameGroupIdPriorityTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/SameGroupIdPriorityTest.java index 9388b7e26c9..bddbe4a8e18 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/SameGroupIdPriorityTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/SameGroupIdPriorityTest.java @@ -13,7 +13,7 @@ import org.junit.jupiter.api.Named; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareLegRuleBuilder; import org.opentripplanner.ext.fares.model.FareTestConstants; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/StopCountTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/StopCountTest.java index ecfc7008210..524a0350cb1 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/StopCountTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/StopCountTest.java @@ -4,7 +4,7 @@ import static org.opentripplanner.core.model.id.FeedScopedIdForTestFactory.id; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareDistance; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTestConstants; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/TimeframeMatcherTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/TimeframeMatcherTest.java index b412286e6c4..4ee14d42f8b 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/TimeframeMatcherTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/TimeframeMatcherTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTestConstants; import org.opentripplanner.model.plan.TestTransitLeg; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/custom/OregonHopFareFactoryTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/custom/OregonHopFareFactoryTest.java index 282b2893012..699a4ccc349 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/custom/OregonHopFareFactoryTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/custom/OregonHopFareFactoryTest.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareRulesData; import org.opentripplanner.ext.fares.model.FareTestConstants; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapperTest.java index 259cb7fb134..15701a8303f 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapperTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapperTest.java @@ -16,7 +16,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.locationtech.jts.geom.Coordinate; import org.opentripplanner._support.geometry.Polygons; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.graph.Graph; import org.opentripplanner.street.model.StreetModelForTest; import org.opentripplanner.street.model.StreetTraversalPermission; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIndexTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIndexTest.java index 44c196c5a68..4d3ea1af575 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIndexTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIndexTest.java @@ -12,7 +12,7 @@ import java.util.Collection; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.UnscheduledTrip; import org.opentripplanner.model.calendar.CalendarServiceData; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java index 9cb705147d7..16814f1fe1f 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java @@ -17,8 +17,8 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.opentripplanner.TestOtpModel; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.LocalDateRange; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.module.TestStreetLinkerModule; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java index 5b1dc81ef1d..760ef8f128e 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java @@ -8,7 +8,7 @@ import java.util.Map; import org.opentripplanner.ConstantsForTests; import org.opentripplanner.TestOtpModel; -import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.time.LocalDateRange; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.gtfs.graphbuilder.GtfsBundle; import org.opentripplanner.gtfs.graphbuilder.GtfsBundleTestFactory; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexRouterTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexRouterTest.java index 331e98f69e6..3e091552854 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexRouterTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexRouterTest.java @@ -12,7 +12,7 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.template.FlexServiceDate; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.framework.application.OTPFeature; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexibleTransitLegTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexibleTransitLegTest.java index c72e1842089..5f88a7aab46 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexibleTransitLegTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexibleTransitLegTest.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.ext.flex.edgetype.FlexTripEdge; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPath; import org.opentripplanner.model.plan.Emission; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java index 0ebb198c816..fe6815b2418 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.opentripplanner.TestOtpModel; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.ext.flex.trip.UnscheduledTrip; import org.opentripplanner.transit.service.TransitRepository; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/filter/FilterMapperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/filter/FilterMapperTest.java index 6836a2ce493..096bb9c3405 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/flex/filter/FilterMapperTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/flex/filter/FilterMapperTest.java @@ -5,7 +5,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.request.filter.AllowAllTransitFilter; import org.opentripplanner.routing.api.request.request.filter.SelectRequest; import org.opentripplanner.routing.api.request.request.filter.TransitFilterRequest; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/template/ClosestTripTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/template/ClosestTripTest.java index 03256e61ff7..235ee69dab6 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/flex/template/ClosestTripTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/flex/template/ClosestTripTest.java @@ -13,7 +13,7 @@ import java.util.Set; import org.junit.jupiter.api.Test; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.ext.flex.trip.UnscheduledTrip; import org.opentripplanner.place.api.NearbyStop; 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 141d0c359bb..939b46bb961 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 @@ -18,7 +18,7 @@ import java.util.Set; import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.ScheduledFlexPathCalculator; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripIntegrationTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripIntegrationTest.java index 83ef8051177..e9e3e05ebed 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripIntegrationTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripIntegrationTest.java @@ -17,7 +17,7 @@ import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.api.model.geometry.EncodedPolyline; import org.opentripplanner.apis.transmodel.model.TripTimeOnDateHelper; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.FlexIntegrationTestData; import org.opentripplanner.graph_builder.module.ValidateAndInterpolateStopTimesForEachTrip; import org.opentripplanner.model.GenericLocation; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java b/application/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java index d9ae14058df..83fcb321451 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java @@ -19,7 +19,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.opentripplanner._support.geometry.Polygons; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.stopconsolidation.internal.DefaultStopConsolidationRepository; import org.opentripplanner.ext.stopconsolidation.internal.DefaultStopConsolidationService; import org.opentripplanner.model.FeedInfo; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/geocoder/StopClusterMapperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/geocoder/StopClusterMapperTest.java index 5c6cd1b3d06..f985409239e 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/geocoder/StopClusterMapperTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/geocoder/StopClusterMapperTest.java @@ -7,7 +7,7 @@ import com.google.common.collect.Iterables; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.stopconsolidation.internal.DefaultStopConsolidationRepository; import org.opentripplanner.ext.stopconsolidation.internal.DefaultStopConsolidationService; import org.opentripplanner.ext.stopconsolidation.model.ConsolidatedStopGroup; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/ojp/service/CallAtStopServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/ojp/service/CallAtStopServiceTest.java index 98175775630..0c6318ad01e 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/ojp/service/CallAtStopServiceTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/ojp/service/CallAtStopServiceTest.java @@ -13,7 +13,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.place.NearbyStopFinder; import org.opentripplanner.place.api.NearbyStop; import org.opentripplanner.place.nearbystopfinder.StraightLineNearbyStopFinder; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/ojp/service/StopEventParamsMapperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/ojp/service/StopEventParamsMapperTest.java index fc9d47aae5a..ef89dd77cb4 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/ojp/service/StopEventParamsMapperTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/ojp/service/StopEventParamsMapperTest.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test; import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.api.model.transit.DefaultFeedIdMapper; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.ojp.mapping.StopEventParamsMapper; import org.opentripplanner.ojp.time.XmlDateTime; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationParserTest.java b/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationParserTest.java index fe2bf810820..f01e8b86268 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationParserTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationParserTest.java @@ -5,7 +5,7 @@ import java.io.IOException; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.test.support.ResourceLoader; class StopConsolidationParserTest { diff --git a/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/TestStopConsolidationModel.java b/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/TestStopConsolidationModel.java index 705162dd018..025b8049b1e 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/TestStopConsolidationModel.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/TestStopConsolidationModel.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.stopconsolidation; import java.util.List; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.network.StopPattern; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLegBuilderTest.java b/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLegBuilderTest.java index 7846f98eded..2a712cdff43 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLegBuilderTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLegBuilderTest.java @@ -9,7 +9,7 @@ import java.util.Set; import org.junit.jupiter.api.Test; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.model.fare.FareOffer; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.model.plan.leg.ScheduledTransitLeg; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java index 7881ea2f564..d0686ac3f3d 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java @@ -7,8 +7,8 @@ import java.util.Locale; import org.junit.jupiter.api.Test; import org.opentripplanner._support.geometry.Polygons; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.vectortiles.VectorTilesResource; import org.opentripplanner.inspector.vector.LayerParameters; import org.opentripplanner.standalone.config.routerconfig.VectorTileConfig; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapperTest.java index c3b9b177b5d..2eb980fd520 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapperTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapperTest.java @@ -7,7 +7,7 @@ import java.util.Locale; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.ext.vectortiles.layers.TestTransitService; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.site.Station; 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 8ef204e72bf..da7117ce8ab 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 @@ -13,8 +13,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.ext.realtimeresolver.RealtimeResolver; import org.opentripplanner.model.plan.Place; import org.opentripplanner.routing.alertpatch.AlertCalendar; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java index 5f41ddcc78a..2fd6a1a18fe 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java @@ -7,9 +7,9 @@ import java.util.Locale; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.TranslatedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.TranslatedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.vectortiles.layers.TestTransitService; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.site.RegularStop; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java index b821852c558..5986ba75573 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java @@ -13,9 +13,9 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.i18n.TranslatedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.TranslatedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.ext.vectortiles.VectorTilesResource; import org.opentripplanner.inspector.vector.KeyValue; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerTest.java index d3b5a28ce16..84ccfacc02f 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerTest.java @@ -20,8 +20,8 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.model.i18n.TranslatedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.TranslatedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingRepository; import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingService; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRentalVehiclePropertyMapperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRentalVehiclePropertyMapperTest.java index 9272dda9675..a86d05da051 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRentalVehiclePropertyMapperTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRentalVehiclePropertyMapperTest.java @@ -7,9 +7,9 @@ import java.util.HashMap; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Ratio; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.basic.Ratio; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.RentalVehicleFuel; import org.opentripplanner.service.vehiclerental.model.RentalVehicleTypeFactory; import org.opentripplanner.service.vehiclerental.model.VehicleRentalVehicle; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalStationPropertyMapperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalStationPropertyMapperTest.java index 83669a40da3..50bf5998772 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalStationPropertyMapperTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalStationPropertyMapperTest.java @@ -9,9 +9,9 @@ import java.util.Locale; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.i18n.TranslatedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.TranslatedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation; class DigitransitVehicleRentalStationPropertyMapperTest { diff --git a/application/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterTest.java index 824e8924b73..92f61cfcaaf 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterTest.java @@ -7,7 +7,7 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.io.HttpHeaders; import org.opentripplanner.service.vehicleparking.model.VehicleParkingState; import org.opentripplanner.test.support.ResourceLoader; diff --git a/application/src/ext/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScore.java b/application/src/ext/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScore.java index aad1959a745..79312a831e8 100644 --- a/application/src/ext/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScore.java +++ b/application/src/ext/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScore.java @@ -3,7 +3,7 @@ import java.util.Comparator; import java.util.List; import java.util.Objects; -import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.model.plan.leg.ScheduledTransitLeg; diff --git a/application/src/ext/java/org/opentripplanner/ext/carpooling/CarpoolingRepository.java b/application/src/ext/java/org/opentripplanner/ext/carpooling/CarpoolingRepository.java index b84ee1282f1..6be508e01d8 100644 --- a/application/src/ext/java/org/opentripplanner/ext/carpooling/CarpoolingRepository.java +++ b/application/src/ext/java/org/opentripplanner/ext/carpooling/CarpoolingRepository.java @@ -4,7 +4,7 @@ import java.time.Instant; import java.util.Collection; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.model.CarpoolTrip; import org.opentripplanner.ext.carpooling.routing.CarpoolTripWithVertices; diff --git a/application/src/ext/java/org/opentripplanner/ext/carpooling/internal/CarpoolItineraryMapper.java b/application/src/ext/java/org/opentripplanner/ext/carpooling/internal/CarpoolItineraryMapper.java index 195142ded22..6da511cec94 100644 --- a/application/src/ext/java/org/opentripplanner/ext/carpooling/internal/CarpoolItineraryMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/carpooling/internal/CarpoolItineraryMapper.java @@ -8,10 +8,10 @@ import javax.annotation.Nullable; import org.locationtech.jts.geom.LineString; import org.opentripplanner.astar.model.GraphPath; -import org.opentripplanner.core.model.basic.Cost; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.LocalizedString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.LocalizedString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.ext.carpooling.model.CarpoolLeg; import org.opentripplanner.ext.carpooling.routing.CarpoolAccessEgress; import org.opentripplanner.ext.carpooling.routing.EndpointLabel; diff --git a/application/src/ext/java/org/opentripplanner/ext/carpooling/internal/DefaultCarpoolingRepository.java b/application/src/ext/java/org/opentripplanner/ext/carpooling/internal/DefaultCarpoolingRepository.java index 0287aaa965a..a4b88604223 100644 --- a/application/src/ext/java/org/opentripplanner/ext/carpooling/internal/DefaultCarpoolingRepository.java +++ b/application/src/ext/java/org/opentripplanner/ext/carpooling/internal/DefaultCarpoolingRepository.java @@ -8,7 +8,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.CarpoolingRepository; import org.opentripplanner.ext.carpooling.model.CarpoolTrip; import org.opentripplanner.ext.carpooling.routing.CarpoolTripWithVertices; diff --git a/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolLeg.java b/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolLeg.java index aeddbf24b91..0c7372c0914 100644 --- a/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolLeg.java +++ b/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolLeg.java @@ -8,8 +8,8 @@ import java.util.Set; import javax.annotation.Nullable; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.fare.FareOffer; import org.opentripplanner.model.plan.Emission; diff --git a/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolStop.java b/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolStop.java index e555fa505ba..8c3b3416d72 100644 --- a/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolStop.java +++ b/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolStop.java @@ -4,7 +4,7 @@ import java.time.ZonedDateTime; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolStopBuilder.java b/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolStopBuilder.java index c8b496f88a4..8e4cdd0bbd7 100755 --- a/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolStopBuilder.java +++ b/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolStopBuilder.java @@ -3,7 +3,7 @@ import java.time.Duration; import java.time.ZonedDateTime; import java.util.Objects; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; diff --git a/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolTripBuilder.java b/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolTripBuilder.java index 10e64a98bc8..647bf3ddcdc 100644 --- a/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolTripBuilder.java +++ b/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolTripBuilder.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; import org.opentripplanner.transit.model.organization.ContactInfo; diff --git a/application/src/ext/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingService.java b/application/src/ext/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingService.java index 0eee4a174b7..e25dfb808ef 100644 --- a/application/src/ext/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingService.java +++ b/application/src/ext/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingService.java @@ -10,7 +10,7 @@ import java.util.Objects; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.CarpoolingRepository; import org.opentripplanner.ext.carpooling.CarpoolingService; import org.opentripplanner.ext.carpooling.filter.CarpoolingRequest; diff --git a/application/src/ext/java/org/opentripplanner/ext/carpooling/updater/CarpoolSiriMapper.java b/application/src/ext/java/org/opentripplanner/ext/carpooling/updater/CarpoolSiriMapper.java index abff17b4399..88ea6dd6925 100644 --- a/application/src/ext/java/org/opentripplanner/ext/carpooling/updater/CarpoolSiriMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/carpooling/updater/CarpoolSiriMapper.java @@ -15,7 +15,7 @@ import org.locationtech.jts.geom.GeometryFactory; import org.locationtech.jts.geom.LinearRing; import org.locationtech.jts.geom.Polygon; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.model.CarpoolStop; import org.opentripplanner.ext.carpooling.model.CarpoolTrip; import org.opentripplanner.ext.carpooling.model.CarpoolTripBuilder; diff --git a/application/src/ext/java/org/opentripplanner/ext/carpooling/updater/SiriETCarpoolingUpdater.java b/application/src/ext/java/org/opentripplanner/ext/carpooling/updater/SiriETCarpoolingUpdater.java index 5822e46064c..6dadd07d410 100644 --- a/application/src/ext/java/org/opentripplanner/ext/carpooling/updater/SiriETCarpoolingUpdater.java +++ b/application/src/ext/java/org/opentripplanner/ext/carpooling/updater/SiriETCarpoolingUpdater.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.CarpoolingRepository; import org.opentripplanner.ext.carpooling.model.CarpoolTrip; import org.opentripplanner.ext.carpooling.routing.CarpoolTripVertexResolver; diff --git a/application/src/ext/java/org/opentripplanner/ext/edgenaming/CrosswalkNamer.java b/application/src/ext/java/org/opentripplanner/ext/edgenaming/CrosswalkNamer.java index 5f505007238..7a50245fe6d 100644 --- a/application/src/ext/java/org/opentripplanner/ext/edgenaming/CrosswalkNamer.java +++ b/application/src/ext/java/org/opentripplanner/ext/edgenaming/CrosswalkNamer.java @@ -8,8 +8,8 @@ import java.util.Optional; import java.util.Set; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.LocalizedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.LocalizedString; import org.opentripplanner.graph_builder.module.osm.EdgeNamer; import org.opentripplanner.graph_builder.module.osm.model.StreetEdgePair; import org.opentripplanner.graph_builder.module.osm.storage.OsmDatabase; diff --git a/application/src/ext/java/org/opentripplanner/ext/edgenaming/PortlandCustomNamer.java b/application/src/ext/java/org/opentripplanner/ext/edgenaming/PortlandCustomNamer.java index 47ea131328f..979e3779c08 100644 --- a/application/src/ext/java/org/opentripplanner/ext/edgenaming/PortlandCustomNamer.java +++ b/application/src/ext/java/org/opentripplanner/ext/edgenaming/PortlandCustomNamer.java @@ -1,8 +1,8 @@ package org.opentripplanner.ext.edgenaming; import java.util.HashSet; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.graph_builder.module.osm.EdgeNamer; import org.opentripplanner.graph_builder.module.osm.model.StreetEdgePair; import org.opentripplanner.graph_builder.module.osm.storage.OsmDatabase; diff --git a/application/src/ext/java/org/opentripplanner/ext/edgenaming/SidewalkCrosswalkNamer.java b/application/src/ext/java/org/opentripplanner/ext/edgenaming/SidewalkCrosswalkNamer.java index 71e9b45b511..444b11b3bb7 100644 --- a/application/src/ext/java/org/opentripplanner/ext/edgenaming/SidewalkCrosswalkNamer.java +++ b/application/src/ext/java/org/opentripplanner/ext/edgenaming/SidewalkCrosswalkNamer.java @@ -1,6 +1,6 @@ package org.opentripplanner.ext.edgenaming; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.graph_builder.module.osm.EdgeNamer; import org.opentripplanner.graph_builder.module.osm.model.StreetEdgePair; import org.opentripplanner.graph_builder.module.osm.storage.OsmDatabase; diff --git a/application/src/ext/java/org/opentripplanner/ext/edgenaming/SidewalkNamer.java b/application/src/ext/java/org/opentripplanner/ext/edgenaming/SidewalkNamer.java index b85a074201c..5bb4ee5a8f1 100644 --- a/application/src/ext/java/org/opentripplanner/ext/edgenaming/SidewalkNamer.java +++ b/application/src/ext/java/org/opentripplanner/ext/edgenaming/SidewalkNamer.java @@ -13,7 +13,7 @@ import org.locationtech.jts.geom.LineString; import org.locationtech.jts.geom.MultiLineString; import org.locationtech.jts.geom.Point; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.graph_builder.module.osm.EdgeNamer; import org.opentripplanner.graph_builder.module.osm.model.StreetEdgePair; import org.opentripplanner.graph_builder.module.osm.storage.OsmDatabase; diff --git a/application/src/ext/java/org/opentripplanner/ext/emission/EmissionRepository.java b/application/src/ext/java/org/opentripplanner/ext/emission/EmissionRepository.java index 3ad23a66d8e..e08cd43d6b2 100644 --- a/application/src/ext/java/org/opentripplanner/ext/emission/EmissionRepository.java +++ b/application/src/ext/java/org/opentripplanner/ext/emission/EmissionRepository.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.Map; import java.util.Optional; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.emission.model.EmissionSummary; import org.opentripplanner.ext.emission.model.TripPatternEmission; import org.opentripplanner.framework.model.Gram; diff --git a/application/src/ext/java/org/opentripplanner/ext/emission/internal/DefaultEmissionRepository.java b/application/src/ext/java/org/opentripplanner/ext/emission/internal/DefaultEmissionRepository.java index 0e01a2fe9c9..e8faf2501fa 100644 --- a/application/src/ext/java/org/opentripplanner/ext/emission/internal/DefaultEmissionRepository.java +++ b/application/src/ext/java/org/opentripplanner/ext/emission/internal/DefaultEmissionRepository.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.emission.EmissionRepository; import org.opentripplanner.ext.emission.model.EmissionSummary; import org.opentripplanner.ext.emission.model.TripPatternEmission; diff --git a/application/src/ext/java/org/opentripplanner/ext/emission/internal/csvdata/route/RouteDataReader.java b/application/src/ext/java/org/opentripplanner/ext/emission/internal/csvdata/route/RouteDataReader.java index d0587c0e9c1..a46e3b1d539 100644 --- a/application/src/ext/java/org/opentripplanner/ext/emission/internal/csvdata/route/RouteDataReader.java +++ b/application/src/ext/java/org/opentripplanner/ext/emission/internal/csvdata/route/RouteDataReader.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.function.Consumer; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.datastore.api.DataSource; import org.opentripplanner.framework.csv.HeadersDoNotMatch; import org.opentripplanner.framework.csv.OtpCsvReader; diff --git a/application/src/ext/java/org/opentripplanner/ext/emission/internal/csvdata/trip/EmissionAggregator.java b/application/src/ext/java/org/opentripplanner/ext/emission/internal/csvdata/trip/EmissionAggregator.java index c8ea3129e99..e826cb7c980 100644 --- a/application/src/ext/java/org/opentripplanner/ext/emission/internal/csvdata/trip/EmissionAggregator.java +++ b/application/src/ext/java/org/opentripplanner/ext/emission/internal/csvdata/trip/EmissionAggregator.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.emission.model.TripPatternEmission; import org.opentripplanner.framework.error.OtpError; import org.opentripplanner.framework.error.WordList; diff --git a/application/src/ext/java/org/opentripplanner/ext/emission/internal/csvdata/trip/TripHopMapper.java b/application/src/ext/java/org/opentripplanner/ext/emission/internal/csvdata/trip/TripHopMapper.java index 19827005890..c087db7f4f7 100644 --- a/application/src/ext/java/org/opentripplanner/ext/emission/internal/csvdata/trip/TripHopMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/emission/internal/csvdata/trip/TripHopMapper.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.emission.model.TripPatternEmission; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.transit.model.site.StopLocation; diff --git a/application/src/ext/java/org/opentripplanner/ext/emission/internal/graphbuilder/EmissionGraphBuilder.java b/application/src/ext/java/org/opentripplanner/ext/emission/internal/graphbuilder/EmissionGraphBuilder.java index 5b534bd5fdf..0329cc2895c 100644 --- a/application/src/ext/java/org/opentripplanner/ext/emission/internal/graphbuilder/EmissionGraphBuilder.java +++ b/application/src/ext/java/org/opentripplanner/ext/emission/internal/graphbuilder/EmissionGraphBuilder.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.emission.EmissionRepository; import org.opentripplanner.ext.emission.internal.csvdata.EmissionDataReader; import org.opentripplanner.ext.emission.internal.csvdata.trip.TripHopMapper; diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayRepository.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayRepository.java index 1fe84b49e4f..20fb02ec48c 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayRepository.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayRepository.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.time.LocalDate; import java.util.Optional; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.model.EmpiricalDelay; import org.opentripplanner.ext.empiricaldelay.model.TripDelays; import org.opentripplanner.ext.empiricaldelay.model.calendar.EmpiricalDelayCalendar; diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayService.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayService.java index a7de9a3f35e..e187fe930c3 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayService.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayService.java @@ -2,7 +2,7 @@ import java.time.LocalDate; import java.util.Optional; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.model.EmpiricalDelay; import org.opentripplanner.utils.lang.Sandbox; diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/configure/EmpiricalDelayGraphBuilderModule.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/configure/EmpiricalDelayGraphBuilderModule.java index 4cf569c3d6f..572942529ef 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/configure/EmpiricalDelayGraphBuilderModule.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/configure/EmpiricalDelayGraphBuilderModule.java @@ -4,7 +4,7 @@ import dagger.Provides; import jakarta.inject.Singleton; import javax.annotation.Nullable; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; import org.opentripplanner.ext.empiricaldelay.EmpiricalDelayRepository; import org.opentripplanner.ext.empiricaldelay.internal.graphbuilder.EmpiricalDelayGraphBuilder; import org.opentripplanner.framework.application.OTPFeature; diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/DefaultEmpiricalDelayRepository.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/DefaultEmpiricalDelayRepository.java index 70f714aa3b5..e1a242a3e24 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/DefaultEmpiricalDelayRepository.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/DefaultEmpiricalDelayRepository.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.EmpiricalDelayRepository; import org.opentripplanner.ext.empiricaldelay.internal.model.EmpiricalDelaySummary; import org.opentripplanner.ext.empiricaldelay.model.EmpiricalDelay; diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/DefaultEmpiricalDelayService.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/DefaultEmpiricalDelayService.java index d052ce65a97..951e55087f9 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/DefaultEmpiricalDelayService.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/DefaultEmpiricalDelayService.java @@ -3,7 +3,7 @@ import java.time.LocalDate; import java.util.Objects; import java.util.Optional; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.EmpiricalDelayRepository; import org.opentripplanner.ext.empiricaldelay.EmpiricalDelayService; import org.opentripplanner.ext.empiricaldelay.model.EmpiricalDelay; diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/EmpiricalDelayCsvDataReader.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/EmpiricalDelayCsvDataReader.java index 2df29246943..7c670ad0d5c 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/EmpiricalDelayCsvDataReader.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/EmpiricalDelayCsvDataReader.java @@ -5,7 +5,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.datastore.api.CompositeDataSource; import org.opentripplanner.datastore.api.DataSource; import org.opentripplanner.ext.empiricaldelay.internal.csvinput.calendar.CalendarCsvParser; diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/delay/TripTimeDelayCsvParser.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/delay/TripTimeDelayCsvParser.java index cf09f0487e9..7a38ad24282 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/delay/TripTimeDelayCsvParser.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/delay/TripTimeDelayCsvParser.java @@ -4,7 +4,7 @@ import java.time.Duration; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.csv.parser.AbstractCsvParser; import org.opentripplanner.framework.csv.parser.HandledCsvParseException; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/delay/TripTimeDelayRow.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/delay/TripTimeDelayRow.java index 2e12291285e..cb1be9c6da7 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/delay/TripTimeDelayRow.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/delay/TripTimeDelayRow.java @@ -1,6 +1,6 @@ package org.opentripplanner.ext.empiricaldelay.internal.csvinput.delay; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * An empirical dealy trip time csv file row. diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/graphbuilder/EmpiricalDelayGraphBuilder.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/graphbuilder/EmpiricalDelayGraphBuilder.java index 713823d80b0..d4ac9ddbc47 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/graphbuilder/EmpiricalDelayGraphBuilder.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/graphbuilder/EmpiricalDelayGraphBuilder.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.EmpiricalDelayRepository; import org.opentripplanner.ext.empiricaldelay.internal.csvinput.EmpiricalDelayCsvDataReader; import org.opentripplanner.ext.empiricaldelay.internal.model.TripDelaysAgregator; diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/graphbuilder/TripDelaysMapper.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/graphbuilder/TripDelaysMapper.java index a6f95b7fce8..e81e22b5880 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/graphbuilder/TripDelaysMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/graphbuilder/TripDelaysMapper.java @@ -6,8 +6,8 @@ import java.util.Map; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.internal.model.DelayAtStopDto; import org.opentripplanner.ext.empiricaldelay.internal.model.TripDelaysAgregator; import org.opentripplanner.ext.empiricaldelay.model.EmpiricalDelay; diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/model/DelayAtStopDto.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/model/DelayAtStopDto.java index cf1dc65a4c1..36059c4d245 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/model/DelayAtStopDto.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/model/DelayAtStopDto.java @@ -1,6 +1,6 @@ package org.opentripplanner.ext.empiricaldelay.internal.model; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.model.EmpiricalDelay; public record DelayAtStopDto(int sequence, FeedScopedId stopId, EmpiricalDelay empiricalDelay) {} diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/model/EmpiricalDelaySummary.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/model/EmpiricalDelaySummary.java index f32c507d37f..c9415f03439 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/model/EmpiricalDelaySummary.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/model/EmpiricalDelaySummary.java @@ -4,7 +4,7 @@ import java.util.Locale; import java.util.Map; import java.util.stream.Collectors; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * Produce a report of imported emissions. diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/model/TripDelaysAgregator.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/model/TripDelaysAgregator.java index 19c0874903f..e622654172b 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/model/TripDelaysAgregator.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/model/TripDelaysAgregator.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.model.EmpiricalDelay; public class TripDelaysAgregator { diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/model/TripDelays.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/model/TripDelays.java index f2c648fa6bb..791d6292187 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/model/TripDelays.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/model/TripDelays.java @@ -9,7 +9,7 @@ import java.util.Objects; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.utils.tostring.ToStringBuilder; /** Utility class to store trip-time delays for a given service id. */ diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareAttribute.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareAttribute.java index 7e932add56a..953dbb0fc09 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareAttribute.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareAttribute.java @@ -2,7 +2,7 @@ package org.opentripplanner.ext.fares.model; import java.util.Objects; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.Money; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareAttributeBuilder.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareAttributeBuilder.java index ed215b2f447..c61c95db3f5 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareAttributeBuilder.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareAttributeBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.ext.fares.model; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.Money; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareLegRule.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareLegRule.java index 6a41333227e..0b408c99f37 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareLegRule.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareLegRule.java @@ -9,7 +9,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.fare.FareProduct; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareLegRuleBuilder.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareLegRuleBuilder.java index cab80662310..31c4e1b9c76 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareLegRuleBuilder.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareLegRuleBuilder.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.fare.FareProduct; /** diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareRuleSet.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareRuleSet.java index 29742e98e7c..1ada1f0654f 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareRuleSet.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareRuleSet.java @@ -4,7 +4,7 @@ import java.time.Duration; import java.util.HashSet; import java.util.Set; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; public class FareRuleSet implements Serializable { diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareRulesData.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareRulesData.java index 49d70a55904..6cb41f45569 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareRulesData.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareRulesData.java @@ -7,7 +7,7 @@ import java.time.LocalDate; import java.util.ArrayList; import java.util.List; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; public final class FareRulesData { diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareTransferRule.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareTransferRule.java index 1ce5295ad97..17268fbac18 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareTransferRule.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareTransferRule.java @@ -6,7 +6,7 @@ import java.util.Objects; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.fare.FareProduct; import org.opentripplanner.utils.lang.IntUtils; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareTransferRuleBuilder.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareTransferRuleBuilder.java index 9b219477485..095edf9b266 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareTransferRuleBuilder.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareTransferRuleBuilder.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.fare.FareProduct; public class FareTransferRuleBuilder { diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/model/Timeframe.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/Timeframe.java index e53619f6c4e..8948cfcdf73 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/model/Timeframe.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/model/Timeframe.java @@ -4,7 +4,7 @@ import java.io.Serializable; import java.time.LocalTime; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.utils.tostring.ValueObjectToStringBuilder; /** diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/model/TimeframeBuilder.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/TimeframeBuilder.java index e5cc6494e2a..349fc7b3647 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/model/TimeframeBuilder.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/model/TimeframeBuilder.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.fares.model; import java.time.LocalTime; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; public class TimeframeBuilder { diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/DefaultFareService.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/DefaultFareService.java index e6d7e788c70..db3b086af16 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/DefaultFareService.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/DefaultFareService.java @@ -16,7 +16,7 @@ import java.util.Set; import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareAttribute; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.ext.fares.service.gtfs.v1.custom.CombinedInterlinedTransitLeg; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/FareAndId.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/FareAndId.java index 49fa5bf239e..689a4517f6e 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/FareAndId.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/FareAndId.java @@ -1,6 +1,6 @@ package org.opentripplanner.ext.fares.service.gtfs.v1; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.Money; /** Holds fare and corresponding fareId */ diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/GtfsFareServiceFactory.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/GtfsFareServiceFactory.java index 4334a2104bd..60aff8bd837 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/GtfsFareServiceFactory.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/GtfsFareServiceFactory.java @@ -9,7 +9,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareAttribute; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareRule; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareService.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareService.java index 7b25d4be4ae..917a359409d 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareService.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareService.java @@ -15,7 +15,7 @@ import java.util.Set; import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.ext.fares.service.gtfs.v1.DefaultFareService; import org.opentripplanner.model.fare.FareProduct; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareServiceFactory.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareServiceFactory.java index 35983699092..4a42e9250f6 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareServiceFactory.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareServiceFactory.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.databind.JsonNode; import java.util.HashMap; import java.util.Map; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.ext.fares.model.FareRulesData; import org.opentripplanner.ext.fares.service.gtfs.v1.GtfsFareServiceFactory; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HSLFareServiceFactory.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HSLFareServiceFactory.java index 7572ad3f6b4..d18cd456608 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HSLFareServiceFactory.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HSLFareServiceFactory.java @@ -2,7 +2,7 @@ import java.util.Collection; import java.util.Map; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareAttribute; import org.opentripplanner.ext.fares.model.FareRule; import org.opentripplanner.ext.fares.model.FareRuleSet; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HighestFareInFreeTransferWindowFareService.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HighestFareInFreeTransferWindowFareService.java index a1fb923722a..434f5440bc4 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HighestFareInFreeTransferWindowFareService.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HighestFareInFreeTransferWindowFareService.java @@ -5,7 +5,7 @@ import java.util.Currency; import java.util.List; import java.util.Optional; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.ext.fares.service.gtfs.v1.DefaultFareService; import org.opentripplanner.model.fare.FareProduct; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HighestFareInFreeTransferWindowFareServiceFactory.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HighestFareInFreeTransferWindowFareServiceFactory.java index 61eb89dd3d0..54e6f94681b 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HighestFareInFreeTransferWindowFareServiceFactory.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HighestFareInFreeTransferWindowFareServiceFactory.java @@ -6,7 +6,7 @@ import java.time.Duration; import java.util.HashMap; import java.util.Map; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.ext.fares.model.FareRulesData; import org.opentripplanner.ext.fares.service.gtfs.v1.GtfsFareServiceFactory; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareFactory.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareFactory.java index 988297745ce..7e58ac26611 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareFactory.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareFactory.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.databind.JsonNode; import java.util.HashMap; import java.util.Map; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.ext.fares.model.FareRulesData; import org.opentripplanner.ext.fares.service.gtfs.v1.GtfsFareServiceFactory; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java index df5f6433594..40d662faa34 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java @@ -14,8 +14,8 @@ import java.util.Set; import java.util.UUID; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.ext.fares.service.gtfs.v1.DefaultFareService; import org.opentripplanner.model.fare.FareMedium; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/AreaMatcher.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/AreaMatcher.java index a6b60cda5b8..568bef8e229 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/AreaMatcher.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/AreaMatcher.java @@ -10,7 +10,7 @@ import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.transit.model.site.StopLocation; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/FareLookupService.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/FareLookupService.java index 33d14d9e430..81418257eb5 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/FareLookupService.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/FareLookupService.java @@ -12,7 +12,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTransferRule; import org.opentripplanner.model.fare.FareOffer; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2Service.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2Service.java index 9f9b20625cf..7785bbc05c8 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2Service.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2Service.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTransferRule; import org.opentripplanner.model.fare.FareOffer; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2ServiceBuilder.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2ServiceBuilder.java index 13f61cb84ef..98b74719a9a 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2ServiceBuilder.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2ServiceBuilder.java @@ -8,7 +8,7 @@ import java.time.LocalDate; import java.util.Arrays; import java.util.List; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTransferRule; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/NetworkMatcher.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/NetworkMatcher.java index 29822bbc891..519eba569bc 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/NetworkMatcher.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/NetworkMatcher.java @@ -5,7 +5,7 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.model.plan.TransitLeg; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/TimeframeMatcher.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/TimeframeMatcher.java index 357aa270c4c..ba22f850b9a 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/TimeframeMatcher.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/TimeframeMatcher.java @@ -5,7 +5,7 @@ import java.time.LocalDate; import java.time.ZonedDateTime; import java.util.Collection; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.Timeframe; import org.opentripplanner.model.plan.TransitLeg; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/custom/OregonHopFareFactory.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/custom/OregonHopFareFactory.java index 9e248512713..0bff4d84dda 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/custom/OregonHopFareFactory.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/custom/OregonHopFareFactory.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Optional; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTransferRule; import org.opentripplanner.ext.fares.model.FareTransferRuleBuilder; 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 94ffafdf714..f2a37337dd8 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapper.java @@ -6,7 +6,7 @@ import java.util.stream.Stream; import org.locationtech.jts.geom.Point; import org.locationtech.jts.geom.prep.PreparedGeometryFactory; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.model.GraphBuilderModule; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.graph.Graph; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/FlexIndex.java b/application/src/ext/java/org/opentripplanner/ext/flex/FlexIndex.java index c8d4a7c6e0f..f1c50fea7cf 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/FlexIndex.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/FlexIndex.java @@ -9,7 +9,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.site.GroupStop; 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 ef2f7ac2e0a..0092f28c3dd 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Map; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.flexpathcalculator.DirectFlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.StreetFlexPathCalculator; 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 0e7371215a7..dc9398034bb 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java @@ -8,8 +8,8 @@ import java.util.Set; import javax.annotation.Nullable; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.ext.flex.edgetype.FlexTripEdge; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.fare.FareOffer; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java b/application/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java index 52d40bc0ccc..a58e17eff94 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java @@ -3,8 +3,8 @@ import java.time.LocalDate; import java.util.Objects; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPath; import org.opentripplanner.ext.flex.trip.FlexTrip; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/filter/FilterMapper.java b/application/src/ext/java/org/opentripplanner/ext/flex/filter/FilterMapper.java index 68c7e52ba5b..35f2bdb06af 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/filter/FilterMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/filter/FilterMapper.java @@ -2,7 +2,7 @@ import java.util.ArrayList; import java.util.List; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.modes.ExcludeAllTransitFilter; import org.opentripplanner.routing.api.request.request.filter.AllowAllTransitFilter; import org.opentripplanner.routing.api.request.request.filter.TransitFilter; 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 3fd7b93473f..ce40eb85ec4 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 @@ -7,7 +7,7 @@ import java.util.Objects; import java.util.stream.Stream; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.FlexAccessEgress; import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.ext.flex.FlexPathDurations; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackAdapter.java b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackAdapter.java index 4c47b920907..c14e730edf1 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackAdapter.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackAdapter.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.flex.template; import java.util.Collection; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.street.model.vertex.TransitStopVertex; import org.opentripplanner.transfer.regular.model.PathTransfer; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java index 29ad26bf544..43857641a8e 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java @@ -2,7 +2,7 @@ import java.util.Collection; import java.util.List; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.ext.flex.FlexPathDurations; import org.opentripplanner.ext.flex.edgetype.FlexTripEdge; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java index b719567b303..595b86bafbd 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java @@ -8,7 +8,7 @@ import java.util.Collection; import java.util.List; import java.util.Optional; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.place.api.NearbyStop; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java index 78adc0696e5..caa3999b18b 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java @@ -2,7 +2,7 @@ import java.util.Collection; import java.util.List; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.ext.flex.FlexPathDurations; import org.opentripplanner.ext.flex.edgetype.FlexTripEdge; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java b/application/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java index 0bbcaccab3e..07956e14544 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Objects; import java.util.Set; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTripBuilder.java b/application/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTripBuilder.java index 5dd1e447bcb..3468151868f 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTripBuilder.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTripBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.ext.flex.trip; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; import org.opentripplanner.transit.model.timetable.Trip; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java b/application/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java index 25fef4bc52b..7ec27df09fa 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.ScheduledFlexPathCalculator; import org.opentripplanner.model.PickDrop; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripBuilder.java b/application/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripBuilder.java index ce7a4aca14f..f81a342d6f2 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripBuilder.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripBuilder.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.flex.trip; import java.util.List; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.StopTime; public class ScheduledDeviatedTripBuilder 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 410effd8397..218dfbed20b 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 @@ -9,7 +9,7 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.TimePenaltyCalculator; import org.opentripplanner.model.PickDrop; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java b/application/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java index 2a2405afa6d..87124d32970 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.flex.trip; import java.util.List; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.StopTime; import org.opentripplanner.routing.api.request.framework.TimePenalty; 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 5b4f752f6af..ee7bf6e7dc9 100644 --- a/application/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java +++ b/application/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java @@ -44,8 +44,8 @@ import org.apache.lucene.search.suggest.document.ContextSuggestField; import org.apache.lucene.search.suggest.document.SuggestIndexSearcher; import org.apache.lucene.store.ByteBuffersDirectory; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.stopconsolidation.StopConsolidationService; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.site.StopType; diff --git a/application/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java b/application/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java index 60b4677a8dc..8208f9eab0e 100644 --- a/application/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java +++ b/application/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.geocoder; import java.util.Collection; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; /** * A package-private helper type for transporting data before serializing. diff --git a/application/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java b/application/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java index 1e8faf1cd9a..413ae8af308 100644 --- a/application/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java +++ b/application/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * A result of a fuzzy stop cluster geocoding search. A cluster is defined as a group of stops that 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 871cdf556e3..7ac32fe75b8 100644 --- a/application/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java @@ -11,8 +11,8 @@ import java.util.Optional; import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.stopconsolidation.StopConsolidationService; import org.opentripplanner.ext.stopconsolidation.model.StopReplacement; import org.opentripplanner.model.FeedInfo; diff --git a/application/src/ext/java/org/opentripplanner/ext/ojp/mapping/FilterMapper.java b/application/src/ext/java/org/opentripplanner/ext/ojp/mapping/FilterMapper.java index 27c29ec3044..c4a5f5987f3 100644 --- a/application/src/ext/java/org/opentripplanner/ext/ojp/mapping/FilterMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/ojp/mapping/FilterMapper.java @@ -14,7 +14,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import org.opentripplanner.api.model.transit.FeedScopedIdMapper; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; class FilterMapper { diff --git a/application/src/ext/java/org/opentripplanner/ext/ojp/mapping/StopEventParamsMapper.java b/application/src/ext/java/org/opentripplanner/ext/ojp/mapping/StopEventParamsMapper.java index ac62322332d..433ffcade77 100644 --- a/application/src/ext/java/org/opentripplanner/ext/ojp/mapping/StopEventParamsMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/ojp/mapping/StopEventParamsMapper.java @@ -20,7 +20,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import org.opentripplanner.api.model.transit.FeedScopedIdMapper; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.ojp.service.CallAtStopService; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.service.ArrivalDeparture; diff --git a/application/src/ext/java/org/opentripplanner/ext/ojp/mapping/TextMapper.java b/application/src/ext/java/org/opentripplanner/ext/ojp/mapping/TextMapper.java index 7f1334b60a9..2baf268c182 100644 --- a/application/src/ext/java/org/opentripplanner/ext/ojp/mapping/TextMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/ojp/mapping/TextMapper.java @@ -3,7 +3,7 @@ import de.vdv.ojp20.InternationalTextStructure; import de.vdv.ojp20.siri.DefaultedTextStructure; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; class TextMapper { diff --git a/application/src/ext/java/org/opentripplanner/ext/ojp/service/CallAtStopService.java b/application/src/ext/java/org/opentripplanner/ext/ojp/service/CallAtStopService.java index 611aa88c289..77a08380dae 100644 --- a/application/src/ext/java/org/opentripplanner/ext/ojp/service/CallAtStopService.java +++ b/application/src/ext/java/org/opentripplanner/ext/ojp/service/CallAtStopService.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Optional; import java.util.Set; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.FeedInfo; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.place.NearbyStopFinder; diff --git a/application/src/ext/java/org/opentripplanner/ext/ojp/service/OjpService.java b/application/src/ext/java/org/opentripplanner/ext/ojp/service/OjpService.java index 64f4794c2f8..b6766ab6b8a 100644 --- a/application/src/ext/java/org/opentripplanner/ext/ojp/service/OjpService.java +++ b/application/src/ext/java/org/opentripplanner/ext/ojp/service/OjpService.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Optional; import org.opentripplanner.api.model.transit.FeedScopedIdMapper; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.ojp.mapping.RouteRequestMapper; import org.opentripplanner.ext.ojp.mapping.StopEventParamsMapper; import org.opentripplanner.ext.ojp.mapping.StopEventResponseMapper; diff --git a/application/src/ext/java/org/opentripplanner/ext/parkAndRideApi/ParkAndRideResource.java b/application/src/ext/java/org/opentripplanner/ext/parkAndRideApi/ParkAndRideResource.java index f95bd6fd8c2..1369b95792a 100644 --- a/application/src/ext/java/org/opentripplanner/ext/parkAndRideApi/ParkAndRideResource.java +++ b/application/src/ext/java/org/opentripplanner/ext/parkAndRideApi/ParkAndRideResource.java @@ -11,7 +11,7 @@ import jakarta.ws.rs.core.Response.Status; import java.util.Optional; import org.locationtech.jts.geom.Envelope; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.place.NearbyStopFinder; import org.opentripplanner.place.nearbystopfinder.StraightLineNearbyStopFinder; import org.opentripplanner.service.vehicleparking.VehicleParkingService; 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 a886ebf4401..a035b4d8602 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 @@ -4,7 +4,7 @@ import java.util.List; import java.util.Optional; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.street.geometry.SphericalDistanceLibrary; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transfer.constrained.model.ConstrainedTransfer; diff --git a/application/src/ext/java/org/opentripplanner/ext/sorlandsbanen/SorlandsbanenNorwayService.java b/application/src/ext/java/org/opentripplanner/ext/sorlandsbanen/SorlandsbanenNorwayService.java index a9abf3f017a..1871b6657b0 100644 --- a/application/src/ext/java/org/opentripplanner/ext/sorlandsbanen/SorlandsbanenNorwayService.java +++ b/application/src/ext/java/org/opentripplanner/ext/sorlandsbanen/SorlandsbanenNorwayService.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.function.BiFunction; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.raptor.api.path.RaptorPath; import org.opentripplanner.raptor.extensions.extrasearch.ExtraMcRouterSearch; diff --git a/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationParser.java b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationParser.java index 2adddd62128..17badfeb583 100644 --- a/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationParser.java +++ b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationParser.java @@ -10,7 +10,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.commons.lang3.BooleanUtils; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.stopconsolidation.model.ConsolidatedStopGroup; public class StopConsolidationParser { diff --git a/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java index d294b0f5772..4c63671572e 100644 --- a/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java +++ b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.stopconsolidation.model.StopReplacement; import org.opentripplanner.transit.model.organization.Agency; import org.opentripplanner.transit.model.site.StopLocation; diff --git a/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java index 706e60caf82..d1c7763d1b0 100644 --- a/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java +++ b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java @@ -5,7 +5,7 @@ import java.util.Optional; import java.util.stream.Stream; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.stopconsolidation.StopConsolidationRepository; import org.opentripplanner.ext.stopconsolidation.StopConsolidationService; import org.opentripplanner.ext.stopconsolidation.model.ConsolidatedStopGroup; diff --git a/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopGroup.java b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopGroup.java index 6303db70dcf..0c5f2f6eaa4 100644 --- a/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopGroup.java +++ b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopGroup.java @@ -1,6 +1,6 @@ package org.opentripplanner.ext.stopconsolidation.model; import java.util.Collection; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; public record ConsolidatedStopGroup(FeedScopedId primary, Collection secondaries) {} diff --git a/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/StopReplacement.java b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/StopReplacement.java index 1fa46d707f7..6fc2f20ea15 100644 --- a/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/StopReplacement.java +++ b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/StopReplacement.java @@ -1,6 +1,6 @@ package org.opentripplanner.ext.stopconsolidation.model; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.site.StopLocation; public record StopReplacement(StopLocation primary, FeedScopedId secondary) {} diff --git a/application/src/ext/java/org/opentripplanner/ext/transferanalyzer/DirectTransferAnalyzer.java b/application/src/ext/java/org/opentripplanner/ext/transferanalyzer/DirectTransferAnalyzer.java index 51b0a8b7818..2675a96a901 100644 --- a/application/src/ext/java/org/opentripplanner/ext/transferanalyzer/DirectTransferAnalyzer.java +++ b/application/src/ext/java/org/opentripplanner/ext/transferanalyzer/DirectTransferAnalyzer.java @@ -9,7 +9,7 @@ import java.util.Objects; import java.util.stream.Collectors; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.transferanalyzer.annotations.TransferCouldNotBeRouted; import org.opentripplanner.ext.transferanalyzer.annotations.TransferRoutingDistanceTooLong; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; diff --git a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/LayerFilters.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/LayerFilters.java index 9a1509db7b5..7fe5eaf8c15 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/LayerFilters.java +++ b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/LayerFilters.java @@ -8,7 +8,7 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; -import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.time.LocalDateRange; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.timetable.Trip; diff --git a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapper.java index 7aa99cccab7..18044e13346 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapper.java @@ -7,7 +7,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.core.model.i18n.I18NStringMapper; +import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.site.AreaStop; diff --git a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapper.java index 91630f2436b..061143408d2 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapper.java @@ -9,8 +9,8 @@ import java.util.Locale; import java.util.stream.Collectors; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.core.model.i18n.I18NStringMapper; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.json.ObjectMappers; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.transit.model.site.Station; 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 c60123e0ad5..5b90bd98b97 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 @@ -10,7 +10,7 @@ import java.util.List; import java.util.Locale; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.core.model.i18n.I18NStringMapper; +import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.routing.alertpatch.AlertEffect; import org.opentripplanner.routing.alertpatch.TransitAlert; diff --git a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java index fa1bb3a0a26..567df688dae 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java @@ -11,7 +11,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.core.model.i18n.I18NStringMapper; +import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; import org.opentripplanner.framework.json.ObjectMappers; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.transit.model.network.TripPattern; diff --git a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingGroupPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingGroupPropertyMapper.java index 93835c4bad0..c026fb6b8ed 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingGroupPropertyMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingGroupPropertyMapper.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Locale; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.core.model.i18n.I18NStringMapper; +import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; import org.opentripplanner.framework.json.ObjectMappers; import org.opentripplanner.inspector.vector.KeyValue; diff --git a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingPropertyMapper.java index 2c31e5291c7..cc1eb92a2c5 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingPropertyMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingPropertyMapper.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Locale; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.core.model.i18n.I18NStringMapper; +import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.service.vehicleparking.model.VehicleParking; diff --git a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/StadtnaviVehicleParkingPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/StadtnaviVehicleParkingPropertyMapper.java index 772dd13c98f..42437cfe39a 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/StadtnaviVehicleParkingPropertyMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/StadtnaviVehicleParkingPropertyMapper.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Locale; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.core.model.i18n.I18NStringMapper; +import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; import org.opentripplanner.framework.json.ObjectMappers; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.service.vehicleparking.model.VehicleParking; diff --git a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRealtimeVehicleRentalStationPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRealtimeVehicleRentalStationPropertyMapper.java index d513797122f..26232c6a88f 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRealtimeVehicleRentalStationPropertyMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRealtimeVehicleRentalStationPropertyMapper.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Locale; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.core.model.i18n.I18NStringMapper; +import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation; diff --git a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalPropertyMapper.java index b1e4b3b15c5..297aa1b3f41 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalPropertyMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalPropertyMapper.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Locale; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.core.model.i18n.I18NStringMapper; +import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; diff --git a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalStationPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalStationPropertyMapper.java index be4d13d2927..3512e9dfcc0 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalStationPropertyMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalStationPropertyMapper.java @@ -6,7 +6,7 @@ import java.util.Locale; import java.util.stream.Collectors; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.core.model.i18n.I18NStringMapper; +import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation; 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 4d4c4ec4952..290bd33026d 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 @@ -4,8 +4,8 @@ import com.fasterxml.jackson.databind.ObjectReader; import java.io.IOException; import java.util.List; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.json.ObjectMappers; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehicleparking.model.VehicleParkingSpaces; diff --git a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java index 201eda154c3..a9ec17f629f 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java +++ b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java @@ -13,9 +13,9 @@ import java.util.Objects; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.LocalizedString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.LocalizedString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.io.OtpHttpClient; import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.framework.json.ObjectMappers; diff --git a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiFacilitiesDownloader.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiFacilitiesDownloader.java index 764fa0314be..5552f96bb5f 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiFacilitiesDownloader.java +++ b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiFacilitiesDownloader.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Map; import java.util.function.BiFunction; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.io.HttpHeaders; import org.opentripplanner.framework.io.OtpHttpClient; import org.opentripplanner.framework.io.OtpHttpClientException; diff --git a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiHubToVehicleParkingGroupMapper.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiHubToVehicleParkingGroupMapper.java index 86fdc8af4ee..f4e5d4d3438 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiHubToVehicleParkingGroupMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiHubToVehicleParkingGroupMapper.java @@ -8,10 +8,10 @@ import java.util.List; import java.util.Map; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.i18n.TranslatedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.TranslatedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehicleparking.model.VehicleParkingGroup; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiHubsDownloader.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiHubsDownloader.java index 6507500c63f..84083a06a75 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiHubsDownloader.java +++ b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiHubsDownloader.java @@ -9,7 +9,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.io.HttpHeaders; import org.opentripplanner.framework.io.OtpHttpClient; import org.opentripplanner.framework.io.OtpHttpClientException; diff --git a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiParkPatch.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiParkPatch.java index d4acc13c4be..98d404ad6d4 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiParkPatch.java +++ b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiParkPatch.java @@ -1,6 +1,6 @@ package org.opentripplanner.ext.vehicleparking.liipi; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * Contains updates to a {@link LiipiParkUpdater} park. diff --git a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiParkToVehicleParkingMapper.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiParkToVehicleParkingMapper.java index e818e4b58a0..f512eda5196 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiParkToVehicleParkingMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiParkToVehicleParkingMapper.java @@ -12,10 +12,10 @@ import java.util.Map; import java.util.Optional; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.i18n.TranslatedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.TranslatedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehicleparking.model.VehicleParkingGroup; import org.opentripplanner.service.vehicleparking.model.VehicleParkingSpaces; diff --git a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiParkUpdater.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiParkUpdater.java index 0525ab9e8c3..d042091f4ce 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiParkUpdater.java +++ b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiParkUpdater.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.io.HttpHeaders; import org.opentripplanner.framework.io.JsonDataListDownloader; import org.opentripplanner.framework.io.OtpHttpClientFactory; 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 8aaf6e286ad..ac6c29bcf75 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 @@ -8,10 +8,10 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.i18n.TranslatedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.TranslatedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.osm.OsmOpeningHoursParser; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehicleparking.model.VehicleParkingSpaces; 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 b0257510d1d..fbfa3e14b28 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 @@ -5,7 +5,7 @@ import java.util.List; import java.util.stream.Stream; import org.entur.siri21.util.SiriXml; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.io.HttpHeaders; import org.opentripplanner.framework.io.OtpHttpClient; import org.opentripplanner.framework.io.OtpHttpClientFactory; diff --git a/application/src/main/java/org/opentripplanner/api/common/LocationStringParser.java b/application/src/main/java/org/opentripplanner/api/common/LocationStringParser.java index 54d6b5c5a86..44c37d61617 100644 --- a/application/src/main/java/org/opentripplanner/api/common/LocationStringParser.java +++ b/application/src/main/java/org/opentripplanner/api/common/LocationStringParser.java @@ -3,7 +3,7 @@ import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.GenericLocation; /** diff --git a/application/src/main/java/org/opentripplanner/api/common/Message.java b/application/src/main/java/org/opentripplanner/api/common/Message.java index 89bde9d2f58..24dfaf87bca 100644 --- a/application/src/main/java/org/opentripplanner/api/common/Message.java +++ b/application/src/main/java/org/opentripplanner/api/common/Message.java @@ -1,7 +1,7 @@ package org.opentripplanner.api.common; import java.util.Locale; -import org.opentripplanner.core.framework.resources.ResourceBundleAdaptor; +import org.opentripplanner.core.domain.framework.resources.ResourceBundleAdaptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/api/model/transit/DefaultFeedIdMapper.java b/application/src/main/java/org/opentripplanner/api/model/transit/DefaultFeedIdMapper.java index 0d8efbb1cd0..ca6876f0141 100644 --- a/application/src/main/java/org/opentripplanner/api/model/transit/DefaultFeedIdMapper.java +++ b/application/src/main/java/org/opentripplanner/api/model/transit/DefaultFeedIdMapper.java @@ -1,7 +1,7 @@ package org.opentripplanner.api.model.transit; import java.util.Optional; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * An id mapper that passes input and output ids through with the feed id. diff --git a/application/src/main/java/org/opentripplanner/api/model/transit/FeedScopedIdMapper.java b/application/src/main/java/org/opentripplanner/api/model/transit/FeedScopedIdMapper.java index b39a01b603b..5afe31bd5fc 100644 --- a/application/src/main/java/org/opentripplanner/api/model/transit/FeedScopedIdMapper.java +++ b/application/src/main/java/org/opentripplanner/api/model/transit/FeedScopedIdMapper.java @@ -6,7 +6,7 @@ import java.util.Optional; import javax.annotation.Nullable; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * Handles mapping from external IDs into feed-scoped ones. diff --git a/application/src/main/java/org/opentripplanner/api/model/transit/HideFeedIdMapper.java b/application/src/main/java/org/opentripplanner/api/model/transit/HideFeedIdMapper.java index 3d55ffd2b57..1be59a5ce60 100644 --- a/application/src/main/java/org/opentripplanner/api/model/transit/HideFeedIdMapper.java +++ b/application/src/main/java/org/opentripplanner/api/model/transit/HideFeedIdMapper.java @@ -2,7 +2,7 @@ import java.util.Objects; import java.util.Optional; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * An id mapper that appends a configured feed id to all input ids and strips the 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 623aeaeb94b..04444ffae9b 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java @@ -17,7 +17,7 @@ import java.time.format.DateTimeFormatter; import java.util.Optional; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.framework.graphql.scalar.DateScalarFactory; import org.opentripplanner.framework.graphql.scalar.DurationScalarFactory; import org.opentripplanner.framework.json.ObjectMappers; diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/GraphQLUtils.java b/application/src/main/java/org/opentripplanner/apis/gtfs/GraphQLUtils.java index 653959c6aa9..af57d61c8ea 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/GraphQLUtils.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/GraphQLUtils.java @@ -8,8 +8,8 @@ import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLInputField; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLRoutingErrorCode; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLWheelchairBoarding; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.model.StopTime; import org.opentripplanner.place.api.PlaceType; import org.opentripplanner.routing.api.response.InputField; diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/AlertImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/AlertImpl.java index 592dd299685..5006baf2edb 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/AlertImpl.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/AlertImpl.java @@ -25,9 +25,9 @@ import org.opentripplanner.apis.gtfs.model.StopOnRouteModel; import org.opentripplanner.apis.gtfs.model.StopOnTripModel; import org.opentripplanner.apis.gtfs.model.UnknownModel; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.TranslatedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.TranslatedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.graphql.GraphQLUtils; import org.opentripplanner.routing.alertpatch.EntitySelector; import org.opentripplanner.routing.alertpatch.EntitySelector.DirectionAndRoute; 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 86a8efb2599..b8dc727db6d 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,7 @@ import org.opentripplanner.apis.gtfs.support.filter.PatternByDateFilterUtil; import org.opentripplanner.apis.gtfs.support.sort.AlertsConnectionOrdering; import org.opentripplanner.apis.gtfs.support.time.LocalDateRangeUtil; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.ext.fares.service.gtfs.GtfsFaresService; import org.opentripplanner.ext.fares.service.gtfs.v1.DefaultFareService; 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 0779a308ef6..21bce808b6f 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 @@ -24,8 +24,8 @@ import org.opentripplanner.apis.gtfs.support.filter.PatternByDateFilterUtil; import org.opentripplanner.apis.gtfs.support.time.LocalDateRangeUtil; import org.opentripplanner.apis.gtfs.support.time.OffsetDateTimeRangeUtil; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.LocalDateRange; import org.opentripplanner.model.StopTimesInPattern; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.place.api.NearbyStop; 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 366dde6f059..e2a39f33be4 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 @@ -26,7 +26,7 @@ import org.opentripplanner.apis.gtfs.model.TripOccupancy; import org.opentripplanner.apis.gtfs.service.ApiTransitService; import org.opentripplanner.apis.support.SemanticHash; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.routing.alertpatch.EntitySelector; import org.opentripplanner.routing.alertpatch.TransitAlert; diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripOnServiceDateImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripOnServiceDateImpl.java index b8b8825f6f3..73b736d3b72 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripOnServiceDateImpl.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripOnServiceDateImpl.java @@ -10,7 +10,7 @@ import org.opentripplanner.apis.gtfs.GtfsGraphQLRequestContext; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; import org.opentripplanner.apis.gtfs.model.RealTimeTripStateModel; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.transit.model.network.ReplacedByRelation; import org.opentripplanner.transit.model.network.ReplacementForRelation; diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java b/application/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java index c34a303cb65..cb491dc028e 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java @@ -338,7 +338,7 @@ public static class GraphQLBicycleParkingPreferencesInput { private List filters; private List preferred; - private org.opentripplanner.core.model.basic.Cost unpreferredCost; + private org.opentripplanner.core.domain.model.basic.Cost unpreferredCost; public GraphQLBicycleParkingPreferencesInput(Map args) { if (args != null) { @@ -354,7 +354,7 @@ public GraphQLBicycleParkingPreferencesInput(Map args) { .map(o -> o == null ? null : new GraphQLParkingFilterInput(o)) .collect(Collectors.toList()); } - this.unpreferredCost = (org.opentripplanner.core.model.basic.Cost) args.get( + this.unpreferredCost = (org.opentripplanner.core.domain.model.basic.Cost) args.get( "unpreferredCost" ); } @@ -368,7 +368,7 @@ public List getGraphQLPreferred() { return this.preferred; } - public org.opentripplanner.core.model.basic.Cost getGraphQLUnpreferredCost() { + public org.opentripplanner.core.domain.model.basic.Cost getGraphQLUnpreferredCost() { return this.unpreferredCost; } @@ -381,7 +381,7 @@ public void setGraphQLPreferred(List preferred) { } public void setGraphQLUnpreferredCost( - org.opentripplanner.core.model.basic.Cost unpreferredCost + org.opentripplanner.core.domain.model.basic.Cost unpreferredCost ) { this.unpreferredCost = unpreferredCost; } @@ -389,7 +389,7 @@ public void setGraphQLUnpreferredCost( public static class GraphQLBicyclePreferencesInput { - private org.opentripplanner.core.model.basic.Cost boardCost; + private org.opentripplanner.core.domain.model.basic.Cost boardCost; private GraphQLCyclingOptimizationInput optimization; private GraphQLBicycleParkingPreferencesInput parking; private Double reluctance; @@ -399,7 +399,7 @@ public static class GraphQLBicyclePreferencesInput { public GraphQLBicyclePreferencesInput(Map args) { if (args != null) { - this.boardCost = (org.opentripplanner.core.model.basic.Cost) args.get("boardCost"); + this.boardCost = (org.opentripplanner.core.domain.model.basic.Cost) args.get("boardCost"); this.optimization = new GraphQLCyclingOptimizationInput( (Map) args.get("optimization") ); @@ -415,7 +415,7 @@ public GraphQLBicyclePreferencesInput(Map args) { } } - public org.opentripplanner.core.model.basic.Cost getGraphQLBoardCost() { + public org.opentripplanner.core.domain.model.basic.Cost getGraphQLBoardCost() { return this.boardCost; } @@ -443,7 +443,7 @@ public GraphQLBicycleWalkPreferencesInput getGraphQLWalk() { return this.walk; } - public void setGraphQLBoardCost(org.opentripplanner.core.model.basic.Cost boardCost) { + public void setGraphQLBoardCost(org.opentripplanner.core.domain.model.basic.Cost boardCost) { this.boardCost = boardCost; } @@ -517,19 +517,19 @@ public void setGraphQLDestinationBicyclePolicy( public static class GraphQLBicycleWalkPreferencesCostInput { - private org.opentripplanner.core.model.basic.Cost mountDismountCost; + private org.opentripplanner.core.domain.model.basic.Cost mountDismountCost; private Double reluctance; public GraphQLBicycleWalkPreferencesCostInput(Map args) { if (args != null) { - this.mountDismountCost = (org.opentripplanner.core.model.basic.Cost) args.get( + this.mountDismountCost = (org.opentripplanner.core.domain.model.basic.Cost) args.get( "mountDismountCost" ); this.reluctance = (Double) args.get("reluctance"); } } - public org.opentripplanner.core.model.basic.Cost getGraphQLMountDismountCost() { + public org.opentripplanner.core.domain.model.basic.Cost getGraphQLMountDismountCost() { return this.mountDismountCost; } @@ -538,7 +538,7 @@ public Double getGraphQLReluctance() { } public void setGraphQLMountDismountCost( - org.opentripplanner.core.model.basic.Cost mountDismountCost + org.opentripplanner.core.domain.model.basic.Cost mountDismountCost ) { this.mountDismountCost = mountDismountCost; } @@ -862,7 +862,7 @@ public static class GraphQLCarParkingPreferencesInput { private List filters; private List preferred; - private org.opentripplanner.core.model.basic.Cost unpreferredCost; + private org.opentripplanner.core.domain.model.basic.Cost unpreferredCost; public GraphQLCarParkingPreferencesInput(Map args) { if (args != null) { @@ -878,7 +878,7 @@ public GraphQLCarParkingPreferencesInput(Map args) { .map(o -> o == null ? null : new GraphQLParkingFilterInput(o)) .collect(Collectors.toList()); } - this.unpreferredCost = (org.opentripplanner.core.model.basic.Cost) args.get( + this.unpreferredCost = (org.opentripplanner.core.domain.model.basic.Cost) args.get( "unpreferredCost" ); } @@ -892,7 +892,7 @@ public List getGraphQLPreferred() { return this.preferred; } - public org.opentripplanner.core.model.basic.Cost getGraphQLUnpreferredCost() { + public org.opentripplanner.core.domain.model.basic.Cost getGraphQLUnpreferredCost() { return this.unpreferredCost; } @@ -905,7 +905,7 @@ public void setGraphQLPreferred(List preferred) { } public void setGraphQLUnpreferredCost( - org.opentripplanner.core.model.basic.Cost unpreferredCost + org.opentripplanner.core.domain.model.basic.Cost unpreferredCost ) { this.unpreferredCost = unpreferredCost; } @@ -913,14 +913,14 @@ public void setGraphQLUnpreferredCost( public static class GraphQLCarPreferencesInput { - private org.opentripplanner.core.model.basic.Cost boardCost; + private org.opentripplanner.core.domain.model.basic.Cost boardCost; private GraphQLCarParkingPreferencesInput parking; private Double reluctance; private GraphQLCarRentalPreferencesInput rental; public GraphQLCarPreferencesInput(Map args) { if (args != null) { - this.boardCost = (org.opentripplanner.core.model.basic.Cost) args.get("boardCost"); + this.boardCost = (org.opentripplanner.core.domain.model.basic.Cost) args.get("boardCost"); this.parking = new GraphQLCarParkingPreferencesInput( (Map) args.get("parking") ); @@ -931,7 +931,7 @@ public GraphQLCarPreferencesInput(Map args) { } } - public org.opentripplanner.core.model.basic.Cost getGraphQLBoardCost() { + public org.opentripplanner.core.domain.model.basic.Cost getGraphQLBoardCost() { return this.boardCost; } @@ -947,7 +947,7 @@ public GraphQLCarRentalPreferencesInput getGraphQLRental() { return this.rental; } - public void setGraphQLBoardCost(org.opentripplanner.core.model.basic.Cost boardCost) { + public void setGraphQLBoardCost(org.opentripplanner.core.domain.model.basic.Cost boardCost) { this.boardCost = boardCost; } @@ -1154,12 +1154,14 @@ public enum GraphQLDependentFareProductFilter { public static class GraphQLDestinationBicyclePolicyInput { private Boolean allowKeeping; - private org.opentripplanner.core.model.basic.Cost keepingCost; + private org.opentripplanner.core.domain.model.basic.Cost keepingCost; public GraphQLDestinationBicyclePolicyInput(Map args) { if (args != null) { this.allowKeeping = (Boolean) args.get("allowKeeping"); - this.keepingCost = (org.opentripplanner.core.model.basic.Cost) args.get("keepingCost"); + this.keepingCost = (org.opentripplanner.core.domain.model.basic.Cost) args.get( + "keepingCost" + ); } } @@ -1167,7 +1169,7 @@ public Boolean getGraphQLAllowKeeping() { return this.allowKeeping; } - public org.opentripplanner.core.model.basic.Cost getGraphQLKeepingCost() { + public org.opentripplanner.core.domain.model.basic.Cost getGraphQLKeepingCost() { return this.keepingCost; } @@ -1175,7 +1177,9 @@ public void setGraphQLAllowKeeping(Boolean allowKeeping) { this.allowKeeping = allowKeeping; } - public void setGraphQLKeepingCost(org.opentripplanner.core.model.basic.Cost keepingCost) { + public void setGraphQLKeepingCost( + org.opentripplanner.core.domain.model.basic.Cost keepingCost + ) { this.keepingCost = keepingCost; } } @@ -1183,12 +1187,14 @@ public void setGraphQLKeepingCost(org.opentripplanner.core.model.basic.Cost keep public static class GraphQLDestinationScooterPolicyInput { private Boolean allowKeeping; - private org.opentripplanner.core.model.basic.Cost keepingCost; + private org.opentripplanner.core.domain.model.basic.Cost keepingCost; public GraphQLDestinationScooterPolicyInput(Map args) { if (args != null) { this.allowKeeping = (Boolean) args.get("allowKeeping"); - this.keepingCost = (org.opentripplanner.core.model.basic.Cost) args.get("keepingCost"); + this.keepingCost = (org.opentripplanner.core.domain.model.basic.Cost) args.get( + "keepingCost" + ); } } @@ -1196,7 +1202,7 @@ public Boolean getGraphQLAllowKeeping() { return this.allowKeeping; } - public org.opentripplanner.core.model.basic.Cost getGraphQLKeepingCost() { + public org.opentripplanner.core.domain.model.basic.Cost getGraphQLKeepingCost() { return this.keepingCost; } @@ -1204,7 +1210,9 @@ public void setGraphQLAllowKeeping(Boolean allowKeeping) { this.allowKeeping = allowKeeping; } - public void setGraphQLKeepingCost(org.opentripplanner.core.model.basic.Cost keepingCost) { + public void setGraphQLKeepingCost( + org.opentripplanner.core.domain.model.basic.Cost keepingCost + ) { this.keepingCost = keepingCost; } } @@ -1913,12 +1921,12 @@ public void setGraphQLOriginModesWithParentStation( public static class GraphQLLinearCostFunctionInput { private Double coefficient; - private org.opentripplanner.core.model.basic.Cost constant; + private org.opentripplanner.core.domain.model.basic.Cost constant; public GraphQLLinearCostFunctionInput(Map args) { if (args != null) { this.coefficient = (Double) args.get("coefficient"); - this.constant = (org.opentripplanner.core.model.basic.Cost) args.get("constant"); + this.constant = (org.opentripplanner.core.domain.model.basic.Cost) args.get("constant"); } } @@ -1926,7 +1934,7 @@ public Double getGraphQLCoefficient() { return this.coefficient; } - public org.opentripplanner.core.model.basic.Cost getGraphQLConstant() { + public org.opentripplanner.core.domain.model.basic.Cost getGraphQLConstant() { return this.constant; } @@ -1934,7 +1942,7 @@ public void setGraphQLCoefficient(Double coefficient) { this.coefficient = coefficient; } - public void setGraphQLConstant(org.opentripplanner.core.model.basic.Cost constant) { + public void setGraphQLConstant(org.opentripplanner.core.domain.model.basic.Cost constant) { this.constant = constant; } } @@ -5887,21 +5895,21 @@ public void setGraphQLIncludeRealTimeCancellations(Boolean includeRealTimeCancel public static class GraphQLTransferPreferencesInput { - private org.opentripplanner.core.model.basic.Cost cost; + private org.opentripplanner.core.domain.model.basic.Cost cost; private Integer maximumAdditionalTransfers; private Integer maximumTransfers; private java.time.Duration slack; public GraphQLTransferPreferencesInput(Map args) { if (args != null) { - this.cost = (org.opentripplanner.core.model.basic.Cost) args.get("cost"); + this.cost = (org.opentripplanner.core.domain.model.basic.Cost) args.get("cost"); this.maximumAdditionalTransfers = (Integer) args.get("maximumAdditionalTransfers"); this.maximumTransfers = (Integer) args.get("maximumTransfers"); this.slack = (java.time.Duration) args.get("slack"); } } - public org.opentripplanner.core.model.basic.Cost getGraphQLCost() { + public org.opentripplanner.core.domain.model.basic.Cost getGraphQLCost() { return this.cost; } @@ -5917,7 +5925,7 @@ public java.time.Duration getGraphQLSlack() { return this.slack; } - public void setGraphQLCost(org.opentripplanner.core.model.basic.Cost cost) { + public void setGraphQLCost(org.opentripplanner.core.domain.model.basic.Cost cost) { this.cost = cost; } @@ -6502,21 +6510,21 @@ public enum GraphQLViaLocationType { public static class GraphQLWalkPreferencesInput { - private org.opentripplanner.core.model.basic.Cost boardCost; + private org.opentripplanner.core.domain.model.basic.Cost boardCost; private Double reluctance; private Double safetyFactor; private Double speed; public GraphQLWalkPreferencesInput(Map args) { if (args != null) { - this.boardCost = (org.opentripplanner.core.model.basic.Cost) args.get("boardCost"); + this.boardCost = (org.opentripplanner.core.domain.model.basic.Cost) args.get("boardCost"); this.reluctance = (Double) args.get("reluctance"); this.safetyFactor = (Double) args.get("safetyFactor"); this.speed = (Double) args.get("speed"); } } - public org.opentripplanner.core.model.basic.Cost getGraphQLBoardCost() { + public org.opentripplanner.core.domain.model.basic.Cost getGraphQLBoardCost() { return this.boardCost; } @@ -6532,7 +6540,7 @@ public Double getGraphQLSpeed() { return this.speed; } - public void setGraphQLBoardCost(org.opentripplanner.core.model.basic.Cost boardCost) { + public void setGraphQLBoardCost(org.opentripplanner.core.domain.model.basic.Cost boardCost) { this.boardCost = boardCost; } diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml b/application/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml index 3d21729de59..8140a2bc39d 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml @@ -27,7 +27,7 @@ config: GeoJson: org.locationtech.jts.geom.Geometry Grams: org.opentripplanner.framework.model.Gram Duration: java.time.Duration - Cost: org.opentripplanner.core.model.basic.Cost + Cost: org.opentripplanner.core.domain.model.basic.Cost CoordinateValue: Double Locale: java.util.Locale OffsetDateTime: java.time.OffsetDateTime diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/AlertsConnectionFilterMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/AlertsConnectionFilterMapper.java index cdd5874b8e4..8e0deec6321 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/AlertsConnectionFilterMapper.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/AlertsConnectionFilterMapper.java @@ -9,7 +9,7 @@ import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLAlertsFilterSelectInput; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLOffsetDateTimeRangeInput; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.routing.alertpatch.AlertCause; import org.opentripplanner.routing.alertpatch.AlertEffect; import org.opentripplanner.routing.alertpatch.AlertSeverity; diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/CanceledTripsFilterMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/CanceledTripsFilterMapper.java index de36481b97f..2c830fa3436 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/CanceledTripsFilterMapper.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/CanceledTripsFilterMapper.java @@ -14,8 +14,8 @@ import javax.annotation.Nullable; import org.opentripplanner.apis.gtfs.support.time.OffsetDateTimeRangeUtil; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.model.time.LocalDateRange; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.transit.api.request.TripOnServiceDateRequest; import org.opentripplanner.transit.model.basic.MainAndSubMode; import org.opentripplanner.transit.model.basic.TransitMode; diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapper.java index 106a7d93c19..96e35b6ada1 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapper.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapper.java @@ -17,7 +17,7 @@ import org.opentripplanner.api.parameter.QualifiedModeSet; import org.opentripplanner.apis.gtfs.GtfsGraphQLRequestContext; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.graphql.GraphQLUtils; import org.opentripplanner.framework.time.ZoneIdFallback; import org.opentripplanner.model.GenericLocation; 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 cbdaf55e52f..4e83b734539 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 @@ -14,7 +14,7 @@ import javax.annotation.Nullable; import org.opentripplanner.apis.gtfs.GtfsGraphQLRequestContext; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.graphql.GraphQLUtils; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.routing.api.request.RouteRequest; diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/SelectRequestMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/SelectRequestMapper.java index 6d75c7950bc..e5edce76e10 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/SelectRequestMapper.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/SelectRequestMapper.java @@ -5,7 +5,7 @@ import org.opentripplanner.apis.gtfs.GraphQLUtils; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLTransitFilterSelectInput; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.request.filter.SelectRequest; import org.opentripplanner.utils.collection.CollectionUtils; 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 2bb878cbb32..2aaba9c9a17 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 @@ -8,7 +8,7 @@ import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.apis.gtfs.mapping.TransitModeMapper; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.routing.api.request.preference.TransferPreferences; import org.opentripplanner.routing.api.request.preference.TransitPreferences; diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ViaLocationMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ViaLocationMapper.java index 6a0b5c8e9e7..2f91630e0c4 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ViaLocationMapper.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ViaLocationMapper.java @@ -7,7 +7,7 @@ import javax.annotation.Nullable; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.via.PassThroughViaLocation; import org.opentripplanner.routing.api.request.via.ViaLocation; import org.opentripplanner.routing.api.request.via.VisitViaLocation; diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/model/OffsetDateTimeRange.java b/application/src/main/java/org/opentripplanner/apis/gtfs/model/OffsetDateTimeRange.java index 4ed7ced4007..4bd37c00c9a 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/model/OffsetDateTimeRange.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/model/OffsetDateTimeRange.java @@ -4,7 +4,7 @@ import java.time.ZoneId; import java.util.Comparator; import javax.annotation.Nullable; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.time.TimePeriod; /** * A range of time with inclusive start and exclusive end {@code [start, end)}. Both bounds are diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/service/ApiTransitService.java b/application/src/main/java/org/opentripplanner/apis/gtfs/service/ApiTransitService.java index 9e8ef83ed42..92c8a8649da 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/service/ApiTransitService.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/service/ApiTransitService.java @@ -10,9 +10,9 @@ import java.util.stream.Stream; import javax.annotation.Nullable; import org.opentripplanner.apis.gtfs.model.StopCallOnTripOnServiceDate; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.LocalDateRange; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.transit.api.request.CancellationPolicy; diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/support/filter/PatternByDateFilterUtil.java b/application/src/main/java/org/opentripplanner/apis/gtfs/support/filter/PatternByDateFilterUtil.java index 0c3039084bd..6ec5f416c52 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/support/filter/PatternByDateFilterUtil.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/support/filter/PatternByDateFilterUtil.java @@ -1,7 +1,7 @@ package org.opentripplanner.apis.gtfs.support.filter; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; -import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.time.LocalDateRange; import org.opentripplanner.transit.service.PatternByServiceDatesFilter; import org.opentripplanner.transit.service.TransitService; diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/support/time/LocalDateRangeUtil.java b/application/src/main/java/org/opentripplanner/apis/gtfs/support/time/LocalDateRangeUtil.java index ba68cda983a..6affe0575e2 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/support/time/LocalDateRangeUtil.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/support/time/LocalDateRangeUtil.java @@ -4,7 +4,7 @@ import javax.annotation.Nullable; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.time.LocalDateRange; public class LocalDateRangeUtil { diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/support/time/OffsetDateTimeRangeUtil.java b/application/src/main/java/org/opentripplanner/apis/gtfs/support/time/OffsetDateTimeRangeUtil.java index ac586f70f72..5704fd3b473 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/support/time/OffsetDateTimeRangeUtil.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/support/time/OffsetDateTimeRangeUtil.java @@ -5,7 +5,7 @@ import javax.annotation.Nullable; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.time.TimePeriod; /** * Utilities for mapping the GraphQL {@code OffsetDateTimeRangeInput} to the domain type diff --git a/application/src/main/java/org/opentripplanner/apis/support/graphql/injectdoc/ApiDocumentationProfile.java b/application/src/main/java/org/opentripplanner/apis/support/graphql/injectdoc/ApiDocumentationProfile.java index b4160555927..4c476045b31 100644 --- a/application/src/main/java/org/opentripplanner/apis/support/graphql/injectdoc/ApiDocumentationProfile.java +++ b/application/src/main/java/org/opentripplanner/apis/support/graphql/injectdoc/ApiDocumentationProfile.java @@ -1,6 +1,6 @@ package org.opentripplanner.apis.support.graphql.injectdoc; -import org.opentripplanner.core.model.doc.DocumentedEnum; +import org.opentripplanner.core.domain.model.doc.DocumentedEnum; public enum ApiDocumentationProfile implements DocumentedEnum { DEFAULT, diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchemaFactory.java b/application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchemaFactory.java index 5ecc6c4269f..cd1ca999730 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchemaFactory.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchemaFactory.java @@ -118,7 +118,7 @@ import org.opentripplanner.apis.transmodel.model.timetable.TimetabledPassingTimeType; import org.opentripplanner.apis.transmodel.model.timetable.TripMetadataType; import org.opentripplanner.apis.transmodel.support.GqlUtil; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.plan.legreference.LegReference; import org.opentripplanner.model.plan.legreference.LegReferenceSerializer; import org.opentripplanner.place.api.NearbyStop; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/GenericLocationMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/GenericLocationMapper.java index a5999355289..3bdb183f1f5 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/GenericLocationMapper.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/GenericLocationMapper.java @@ -8,7 +8,7 @@ import org.opentripplanner.apis.transmodel.model.framework.DatedServiceJourneyReferenceInputType; import org.opentripplanner.apis.transmodel.model.framework.PointInJourneyPatternReferenceInputType; import org.opentripplanner.apis.transmodel.support.OneOfInputValidator; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.routing.api.request.TripLocation; import org.opentripplanner.routing.api.request.TripOnDateReference; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TransitFilterOldWayMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TransitFilterOldWayMapper.java index 51908daab97..7443ef9d344 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TransitFilterOldWayMapper.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TransitFilterOldWayMapper.java @@ -9,7 +9,7 @@ import org.opentripplanner.apis.transmodel.model.TransmodelTransportSubmode; import org.opentripplanner.apis.transmodel.support.DataFetcherDecorator; import org.opentripplanner.apis.transmodel.support.GqlUtil; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.request.TransitRequestBuilder; import org.opentripplanner.routing.api.request.request.filter.SelectRequest; import org.opentripplanner.transit.model.basic.MainAndSubMode; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TripViaLocationMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TripViaLocationMapper.java index 77e87016b5c..fa158a50e38 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TripViaLocationMapper.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TripViaLocationMapper.java @@ -14,7 +14,7 @@ import org.opentripplanner.apis.transmodel.model.plan.TripQuery; import org.opentripplanner.apis.transmodel.model.plan.ViaLocationInputType; import org.opentripplanner.apis.transmodel.support.OneOfInputValidator; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.via.PassThroughViaLocation; import org.opentripplanner.routing.api.request.via.ViaLocation; import org.opentripplanner.routing.api.request.via.VisitViaLocation; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java index 9387fe803b0..b7882fcb2c7 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java @@ -6,8 +6,8 @@ import java.util.EnumSet; import java.util.List; import java.util.function.Function; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.doc.DocumentedEnum; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.doc.DocumentedEnum; import org.opentripplanner.model.plan.VertexType; import org.opentripplanner.model.plan.leg.ViaLocationType; import org.opentripplanner.model.plan.walkstep.AbsoluteDirection; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/JourneyWhiteListed.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/JourneyWhiteListed.java index 870bb1a6f51..a7ad911dc16 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/JourneyWhiteListed.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/JourneyWhiteListed.java @@ -9,7 +9,7 @@ import java.util.Set; import org.opentripplanner.api.model.transit.FeedScopedIdMapper; import org.opentripplanner.apis.transmodel.support.GqlUtil; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; public class JourneyWhiteListed { 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 0bce7108bdf..be1f97b6b8e 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 @@ -8,7 +8,7 @@ import graphql.schema.GraphQLInputObjectField; import graphql.schema.GraphQLInputObjectType; import java.util.Map; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.framework.graphql.scalar.CostScalarFactory; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.utils.time.DurationUtils; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/et/EstimatedCallType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/et/EstimatedCallType.java index c1f6d4db96b..7944e3c08ef 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/et/EstimatedCallType.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/et/EstimatedCallType.java @@ -26,8 +26,8 @@ import org.opentripplanner.apis.transmodel.model.framework.TransmodelScalars; import org.opentripplanner.apis.transmodel.model.timetable.EmpiricalDelayType; import org.opentripplanner.apis.transmodel.support.GqlUtil; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.routing.alertpatch.StopCondition; import org.opentripplanner.routing.alertpatch.TransitAlert; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/AffectsType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/AffectsType.java index 8d14ab2580b..1ea062a6250 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/AffectsType.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/AffectsType.java @@ -11,7 +11,7 @@ import org.opentripplanner.apis.transmodel.model.framework.TransmodelScalars; import org.opentripplanner.apis.transmodel.model.stop.StopPlaceType; import org.opentripplanner.apis.transmodel.support.GqlUtil; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.alertpatch.EntitySelector; import org.opentripplanner.transit.model.timetable.TripIdAndServiceDate; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/PtSituationElementType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/PtSituationElementType.java index 9a85ce38c7b..5aa2ca22339 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/PtSituationElementType.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/PtSituationElementType.java @@ -21,8 +21,8 @@ import org.opentripplanner.apis.transmodel.model.EnumTypes; import org.opentripplanner.apis.transmodel.model.stop.MonoOrMultiModalStation; import org.opentripplanner.apis.transmodel.support.GqlUtil; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.TranslatedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.TranslatedString; import org.opentripplanner.routing.alertpatch.AlertUrl; import org.opentripplanner.routing.alertpatch.EntitySelector; import org.opentripplanner.routing.alertpatch.TransitAlert; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/MonoOrMultiModalStation.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/MonoOrMultiModalStation.java index d1c0bebe867..4cffb8c7586 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/MonoOrMultiModalStation.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/MonoOrMultiModalStation.java @@ -2,9 +2,9 @@ import java.time.ZoneId; import java.util.Collection; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.site.MultiModalStation; import org.opentripplanner.transit.model.site.Station; import org.opentripplanner.transit.model.site.StopLocation; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java index fa65d6c6a7f..1f5d8147b45 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java @@ -28,7 +28,7 @@ import org.opentripplanner.apis.transmodel.model.plan.JourneyWhiteListed; import org.opentripplanner.apis.transmodel.model.scalars.GeoJSONCoordinatesScalar; import org.opentripplanner.apis.transmodel.support.GqlUtil; -import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; import org.opentripplanner.framework.graphql.GraphQLUtils; import org.opentripplanner.transit.api.request.CancellationPolicy; import org.opentripplanner.transit.api.request.TripTimeOnDateRequest; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java index 7ec6c241169..420e15def95 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java @@ -36,7 +36,7 @@ import org.opentripplanner.apis.transmodel.model.framework.TransmodelDirectives; import org.opentripplanner.apis.transmodel.model.plan.JourneyWhiteListed; import org.opentripplanner.apis.transmodel.support.GqlUtil; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.graphql.GraphQLUtils; import org.opentripplanner.transit.api.request.CancellationPolicy; import org.opentripplanner.transit.api.request.TripTimeOnDateRequest; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/DatedServiceJourneyQuery.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/DatedServiceJourneyQuery.java index 3049d330458..a2b907926de 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/DatedServiceJourneyQuery.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/DatedServiceJourneyQuery.java @@ -12,7 +12,7 @@ import org.opentripplanner.apis.transmodel.model.EnumTypes; import org.opentripplanner.apis.transmodel.model.framework.TransmodelScalars; import org.opentripplanner.apis.transmodel.support.GqlUtil; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.api.model.FilterValues; import org.opentripplanner.transit.api.request.TripOnServiceDateRequest; import org.opentripplanner.transit.api.request.TripOnServiceDateRequestBuilder; diff --git a/application/src/main/java/org/opentripplanner/framework/graphql/GraphQLUtils.java b/application/src/main/java/org/opentripplanner/framework/graphql/GraphQLUtils.java index 0bbad7cea9c..c6ee8f12128 100644 --- a/application/src/main/java/org/opentripplanner/framework/graphql/GraphQLUtils.java +++ b/application/src/main/java/org/opentripplanner/framework/graphql/GraphQLUtils.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; /** * This class should always be used when translating fields or handling locales in GraphQL queries. 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 4363e6d9a15..f824b67b1c4 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 graphql.schema.GraphQLScalarType; import java.util.Locale; import java.util.NoSuchElementException; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.utils.time.DurationUtils; public class CostScalarFactory { 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 8001fd12150..bd2ae1339cb 100644 --- a/application/src/main/java/org/opentripplanner/framework/model/TimeAndCost.java +++ b/application/src/main/java/org/opentripplanner/framework/model/TimeAndCost.java @@ -2,7 +2,7 @@ import java.time.Duration; import java.time.temporal.ChronoUnit; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.utils.time.DurationUtils; /** diff --git a/application/src/main/java/org/opentripplanner/gbfs/GbfsGeofencingZoneMapper.java b/application/src/main/java/org/opentripplanner/gbfs/GbfsGeofencingZoneMapper.java index 39416a50ebe..e2cbeba3967 100644 --- a/application/src/main/java/org/opentripplanner/gbfs/GbfsGeofencingZoneMapper.java +++ b/application/src/main/java/org/opentripplanner/gbfs/GbfsGeofencingZoneMapper.java @@ -13,8 +13,8 @@ import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.operation.valid.IsValidOp; import org.locationtech.jts.operation.valid.TopologyValidationError; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.geometry.UnsupportedGeometryException; diff --git a/application/src/main/java/org/opentripplanner/gbfs/network/GeofencingZoneOtpPhase.java b/application/src/main/java/org/opentripplanner/gbfs/network/GeofencingZoneOtpPhase.java index b67a237acc5..2834074e640 100644 --- a/application/src/main/java/org/opentripplanner/gbfs/network/GeofencingZoneOtpPhase.java +++ b/application/src/main/java/org/opentripplanner/gbfs/network/GeofencingZoneOtpPhase.java @@ -1,6 +1,6 @@ package org.opentripplanner.gbfs.network; -import org.opentripplanner.core.model.doc.DocumentedEnum; +import org.opentripplanner.core.domain.model.doc.DocumentedEnum; /** * The OTP phase that computes and applies a network's geofencing zones. Configured per network as diff --git a/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsFreeVehicleStatusMapper.java b/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsFreeVehicleStatusMapper.java index 7c92c5d84a0..120eb0f947b 100644 --- a/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsFreeVehicleStatusMapper.java +++ b/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsFreeVehicleStatusMapper.java @@ -8,10 +8,10 @@ import javax.annotation.Nullable; import org.mobilitydata.gbfs.v2_3.free_bike_status.GBFSBike; import org.mobilitydata.gbfs.v2_3.free_bike_status.GBFSRentalUris; -import org.opentripplanner.core.model.basic.Distance; -import org.opentripplanner.core.model.basic.Ratio; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.basic.Distance; +import org.opentripplanner.core.domain.model.basic.Ratio; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.RentalVehicleFuel; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStationUris; diff --git a/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsGeofencingZoneMapper.java b/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsGeofencingZoneMapper.java index 6424b4fdc8e..df5e82487ea 100644 --- a/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsGeofencingZoneMapper.java +++ b/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsGeofencingZoneMapper.java @@ -7,8 +7,8 @@ import org.mobilitydata.gbfs.v2_3.geofencing_zones.GBFSFeature; import org.mobilitydata.gbfs.v2_3.geofencing_zones.GBFSGeofencingZones; import org.mobilitydata.gbfs.v2_3.geofencing_zones.GBFSRule; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; /** diff --git a/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsStationInformationMapper.java b/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsStationInformationMapper.java index 646745a8392..a3435a096f5 100644 --- a/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsStationInformationMapper.java +++ b/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsStationInformationMapper.java @@ -4,8 +4,8 @@ import java.util.stream.Collectors; import org.mobilitydata.gbfs.v2_3.station_information.GBFSRentalUris; import org.mobilitydata.gbfs.v2_3.station_information.GBFSStation; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.gbfs.support.UnknownVehicleTypeFilter; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation; diff --git a/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsSystemInformationMapper.java b/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsSystemInformationMapper.java index 749fe94ef36..85367026d50 100644 --- a/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsSystemInformationMapper.java +++ b/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsSystemInformationMapper.java @@ -1,8 +1,8 @@ package org.opentripplanner.gbfs.v2; import org.mobilitydata.gbfs.v2_3.system_information.GBFSData; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem; class GbfsSystemInformationMapper { diff --git a/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsVehicleTypeMapper.java b/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsVehicleTypeMapper.java index ac9c381adeb..f74b45f9063 100644 --- a/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsVehicleTypeMapper.java +++ b/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsVehicleTypeMapper.java @@ -2,8 +2,8 @@ import javax.annotation.Nullable; import org.mobilitydata.gbfs.v2_3.vehicle_types.GBFSVehicleType; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.street.model.RentalFormFactor; import org.opentripplanner.utils.logging.Throttle; diff --git a/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsFeedMapper.java b/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsFeedMapper.java index 80a275d3d29..8f10c7ede2c 100644 --- a/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsFeedMapper.java +++ b/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsFeedMapper.java @@ -17,8 +17,8 @@ import org.mobilitydata.gbfs.v3_0.vehicle_status.GBFSVehicleStatus; import org.mobilitydata.gbfs.v3_0.vehicle_types.GBFSVehicleType; import org.mobilitydata.gbfs.v3_0.vehicle_types.GBFSVehicleTypes; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.TranslatedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.TranslatedString; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.gbfs.GbfsDataSourceParameters; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; diff --git a/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsGeofencingZoneMapper.java b/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsGeofencingZoneMapper.java index 22fe61bb4af..cae0f296f5a 100644 --- a/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsGeofencingZoneMapper.java +++ b/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsGeofencingZoneMapper.java @@ -10,7 +10,7 @@ import org.mobilitydata.gbfs.v3_0.geofencing_zones.GBFSGeofencingZones; import org.mobilitydata.gbfs.v3_0.geofencing_zones.GBFSName; import org.mobilitydata.gbfs.v3_0.geofencing_zones.GBFSRule; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; /** diff --git a/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsStationInformationMapper.java b/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsStationInformationMapper.java index 3e08385c8dc..49fdb6db3fb 100644 --- a/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsStationInformationMapper.java +++ b/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsStationInformationMapper.java @@ -10,7 +10,7 @@ import org.mobilitydata.gbfs.v3_0.station_information.GBFSRentalUris; import org.mobilitydata.gbfs.v3_0.station_information.GBFSShortName; import org.mobilitydata.gbfs.v3_0.station_information.GBFSStation; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.gbfs.support.UnknownVehicleTypeFilter; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation; diff --git a/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsVehicleStatusMapper.java b/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsVehicleStatusMapper.java index 87f7db8449d..320d8c064c0 100644 --- a/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsVehicleStatusMapper.java +++ b/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsVehicleStatusMapper.java @@ -6,10 +6,10 @@ import java.util.Map; import javax.annotation.Nullable; import org.mobilitydata.gbfs.v3_0.vehicle_status.GBFSVehicle; -import org.opentripplanner.core.model.basic.Distance; -import org.opentripplanner.core.model.basic.Ratio; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.basic.Distance; +import org.opentripplanner.core.domain.model.basic.Ratio; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.RentalVehicleFuel; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem; diff --git a/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsVehicleTypeMapper.java b/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsVehicleTypeMapper.java index 07dd408c80d..d9a5a6fc156 100644 --- a/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsVehicleTypeMapper.java +++ b/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsVehicleTypeMapper.java @@ -5,7 +5,7 @@ import javax.annotation.Nullable; import org.mobilitydata.gbfs.v3_0.vehicle_types.GBFSName; import org.mobilitydata.gbfs.v3_0.vehicle_types.GBFSVehicleType; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.street.model.RentalFormFactor; import org.opentripplanner.utils.logging.Throttle; 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 c72877d3f19..882db1ba107 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java @@ -7,7 +7,7 @@ import java.util.Objects; import java.util.Queue; import javax.annotation.Nullable; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; import org.opentripplanner.ext.emission.EmissionRepository; import org.opentripplanner.ext.empiricaldelay.EmpiricalDelayRepository; import org.opentripplanner.ext.stopconsolidation.StopConsolidationRepository; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/configure/GraphBuilderModule.java b/application/src/main/java/org/opentripplanner/graph_builder/configure/GraphBuilderModule.java index b3301b8a78b..0f57485d5ea 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/configure/GraphBuilderModule.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/configure/GraphBuilderModule.java @@ -3,7 +3,7 @@ import dagger.Module; import dagger.Provides; import jakarta.inject.Singleton; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; import org.opentripplanner.graph_builder.GraphBuilder; import org.opentripplanner.graph_builder.GraphBuilderDataSources; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeGeometry.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeGeometry.java index 4588e7776fc..800830f8a4d 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeGeometry.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeGeometry.java @@ -1,6 +1,6 @@ package org.opentripplanner.graph_builder.issues; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssue; public record BogusShapeGeometry(FeedScopedId shapeId) implements DataImportIssue { diff --git a/application/src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeGeometryCaught.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeGeometryCaught.java index 686d5737e59..11caafd4b24 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeGeometryCaught.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeGeometryCaught.java @@ -1,6 +1,6 @@ package org.opentripplanner.graph_builder.issues; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssue; import org.opentripplanner.model.StopTime; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/issues/ShapeGeometryTooFar.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/ShapeGeometryTooFar.java index db10bdc62ae..4fb20b2488b 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/issues/ShapeGeometryTooFar.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/issues/ShapeGeometryTooFar.java @@ -1,6 +1,6 @@ package org.opentripplanner.graph_builder.issues; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssue; public record ShapeGeometryTooFar( diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/AddTransitEntitiesToGraph.java b/application/src/main/java/org/opentripplanner/graph_builder/module/AddTransitEntitiesToGraph.java index a318f6a4db0..1a4969dcce3 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/AddTransitEntitiesToGraph.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/AddTransitEntitiesToGraph.java @@ -10,8 +10,8 @@ import java.util.Optional; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.model.TransitDataImport; import org.opentripplanner.service.streetdetails.StreetDetailsRepository; import org.opentripplanner.service.streetdetails.model.Level; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/AddTransitEntitiesToTimetable.java b/application/src/main/java/org/opentripplanner/graph_builder/module/AddTransitEntitiesToTimetable.java index 27c23db83d8..9516e8ccc1b 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/AddTransitEntitiesToTimetable.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/AddTransitEntitiesToTimetable.java @@ -1,7 +1,7 @@ package org.opentripplanner.graph_builder.module; import java.util.Collection; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.model.FeedInfo; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModule.java b/application/src/main/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModule.java index 7fb9ed27697..04d7068a611 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModule.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModule.java @@ -13,8 +13,8 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Point; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.LocalizedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.LocalizedString; import org.opentripplanner.graph_builder.model.GraphBuilderModule; import org.opentripplanner.service.osminfo.OsmInfoGraphBuildService; import org.opentripplanner.service.osminfo.model.Platform; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/RouteToCentroidStationIdsValidator.java b/application/src/main/java/org/opentripplanner/graph_builder/module/RouteToCentroidStationIdsValidator.java index fd84cee950a..b02418ef988 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/RouteToCentroidStationIdsValidator.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/RouteToCentroidStationIdsValidator.java @@ -2,7 +2,7 @@ import java.util.Collection; import java.util.stream.Collectors; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.model.GraphBuilderModule; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/TransitWithFutureDateValidator.java b/application/src/main/java/org/opentripplanner/graph_builder/module/TransitWithFutureDateValidator.java index 3d860d55aae..a51c81eaaea 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/TransitWithFutureDateValidator.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/TransitWithFutureDateValidator.java @@ -4,7 +4,7 @@ import java.time.LocalDate; import java.time.ZoneId; import java.util.HashSet; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issues.NoFutureDates; import org.opentripplanner.model.calendar.CalendarServiceData; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/cache/CacheTask.java b/application/src/main/java/org/opentripplanner/graph_builder/module/cache/CacheTask.java index d8b693d2a2a..02abe61856b 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/cache/CacheTask.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/cache/CacheTask.java @@ -1,6 +1,6 @@ package org.opentripplanner.graph_builder.module.cache; -import org.opentripplanner.core.model.doc.DocumentedEnum; +import org.opentripplanner.core.domain.model.doc.DocumentedEnum; /** * Identifies a graph-build computation that can be persisted to a file cache between builds. diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java b/application/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java index 03cf9d5e80e..292eb41c9d6 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; import org.opentripplanner.datastore.api.CompositeDataSource; import org.opentripplanner.datastore.api.DataSource; import org.opentripplanner.ext.dataoverlay.EdgeUpdaterModule; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/geometry/GeometryProcessor.java b/application/src/main/java/org/opentripplanner/graph_builder/module/geometry/GeometryProcessor.java index e57b6c13059..d3dc9ae55bc 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/geometry/GeometryProcessor.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/geometry/GeometryProcessor.java @@ -16,7 +16,7 @@ import org.locationtech.jts.geom.impl.PackedCoordinateSequence; import org.locationtech.jts.linearref.LinearLocation; import org.locationtech.jts.linearref.LocationIndexedLine; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issues.BogusShapeDistanceTraveled; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/geometry/ShapeSegmentKey.java b/application/src/main/java/org/opentripplanner/graph_builder/module/geometry/ShapeSegmentKey.java index 7e2e06c62d9..51f2d13f531 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/geometry/ShapeSegmentKey.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/geometry/ShapeSegmentKey.java @@ -1,6 +1,6 @@ package org.opentripplanner.graph_builder.module.geometry; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; class ShapeSegmentKey { diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/BarrierEdgeBuilder.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/BarrierEdgeBuilder.java index 2aa1b66c452..d3e4f99fc8e 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/BarrierEdgeBuilder.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/BarrierEdgeBuilder.java @@ -5,7 +5,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.osm.model.OsmNode; import org.opentripplanner.osm.model.OsmWay; import org.opentripplanner.street.geometry.GeometryUtils; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/EdgeNamer.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/EdgeNamer.java index 7e38785de43..f471554885a 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/EdgeNamer.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/EdgeNamer.java @@ -1,7 +1,7 @@ package org.opentripplanner.graph_builder.module.osm; import java.util.Optional; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.graph_builder.module.osm.model.StreetEdgePair; import org.opentripplanner.graph_builder.module.osm.storage.OsmDatabase; import org.opentripplanner.osm.model.OsmEntity; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/ElevatorProcessor.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/ElevatorProcessor.java index 7043d42cd98..acce2640aa9 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/ElevatorProcessor.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/ElevatorProcessor.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; import java.util.function.Consumer; -import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issue.api.Issue; import org.opentripplanner.graph_builder.issues.AllWaysOfElevatorNodeOnSameLevel; 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 aecc3038444..e8819f2c187 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 @@ -21,7 +21,7 @@ import javax.annotation.Nullable; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.model.GraphBuilderModule; import org.opentripplanner.graph_builder.module.cache.CacheTask; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/ParkingProcessor.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/ParkingProcessor.java index 72db1657c80..014041a7349 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/ParkingProcessor.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/ParkingProcessor.java @@ -13,10 +13,10 @@ import java.util.function.Predicate; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Envelope; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.LocalizedStringFormat; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.LocalizedStringFormat; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issues.InvalidVehicleParkingCapacity; import org.opentripplanner.graph_builder.issues.IsolatedParkAndRide; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/internal/naming/DefaultNamer.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/internal/naming/DefaultNamer.java index 944802ed428..c4c7c5c3f76 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/internal/naming/DefaultNamer.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/internal/naming/DefaultNamer.java @@ -1,6 +1,6 @@ package org.opentripplanner.graph_builder.module.osm.internal.naming; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.graph_builder.module.osm.EdgeNamer; import org.opentripplanner.graph_builder.module.osm.model.StreetEdgePair; import org.opentripplanner.graph_builder.module.osm.storage.OsmDatabase; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/internal/walkablearea/WalkableAreaBuilder.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/internal/walkablearea/WalkableAreaBuilder.java index bb6231596e7..3c3e543e5ef 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/internal/walkablearea/WalkableAreaBuilder.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/internal/walkablearea/WalkableAreaBuilder.java @@ -18,7 +18,7 @@ import org.opentripplanner.astar.model.GraphPath; import org.opentripplanner.astar.model.ShortestPathTree; import org.opentripplanner.astar.spi.SkipEdgeStrategy; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.framework.application.OTPRequestTimeoutException; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.module.cache.KeyValueCache; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/storage/VertexGenerator.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/storage/VertexGenerator.java index 58489bf78f7..a1a64a1e775 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/storage/VertexGenerator.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/storage/VertexGenerator.java @@ -18,8 +18,8 @@ import java.util.Objects; import java.util.Set; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issues.BarrierIntersectingHighway; import org.opentripplanner.graph_builder.issues.DifferentLevelsSharingBarrier; diff --git a/application/src/main/java/org/opentripplanner/gtfs/GenerateTripPatternsOperation.java b/application/src/main/java/org/opentripplanner/gtfs/GenerateTripPatternsOperation.java index 896b307f9ec..73a51dd1f3c 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/GenerateTripPatternsOperation.java +++ b/application/src/main/java/org/opentripplanner/gtfs/GenerateTripPatternsOperation.java @@ -9,8 +9,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issues.TripDegenerate; diff --git a/application/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsModule.java b/application/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsModule.java index 71db8f81f10..b9484e298d0 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsModule.java +++ b/application/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsModule.java @@ -5,9 +5,9 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.LocalDateRange; import org.opentripplanner.ext.fares.service.gtfs.v1.GtfsFareServiceFactory; import org.opentripplanner.ext.flex.FlexTripsMapper; import org.opentripplanner.framework.application.OTPFeature; 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 c6312101fdd..0e0ce8e7cf9 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/interlining/InterlineProcessor.java +++ b/application/src/main/java/org/opentripplanner/gtfs/interlining/InterlineProcessor.java @@ -11,7 +11,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issues.InterliningTeleport; import org.opentripplanner.gtfs.mapping.StaySeatedNotAllowed; 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 daa07616afd..9f2e20c8784 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/BoardingAreaMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/BoardingAreaMapper.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.Optional; import java.util.function.Function; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.site.BoardingArea; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.utils.collection.MapUtils; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/DirectionMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/DirectionMapper.java index 731af06ded7..41418ce0958 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/DirectionMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/DirectionMapper.java @@ -1,6 +1,6 @@ package org.opentripplanner.gtfs.mapping; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.transit.model.timetable.Direction; 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 ac06e8e6223..a01ef12121d 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/EntranceMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/EntranceMapper.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.site.Entrance; import org.opentripplanner.transit.model.site.Station; import org.opentripplanner.utils.collection.MapUtils; 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 583a83dc7d0..7c4b9785859 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/FareAttributeMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/FareAttributeMapper.java @@ -4,7 +4,7 @@ import java.util.Currency; import java.util.HashMap; import java.util.Map; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareAttribute; import org.opentripplanner.ext.fares.model.FareAttributeBuilder; import org.opentripplanner.transit.model.basic.Money; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/FareLegRuleMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/FareLegRuleMapper.java index ce0d3a8d9f6..9e9164e4363 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/FareLegRuleMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/FareLegRuleMapper.java @@ -7,7 +7,7 @@ import javax.annotation.Nullable; import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.Area; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareDistance; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.Timeframe; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/FareProductMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/FareProductMapper.java index 386e646410d..481a60a1fd5 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/FareProductMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/FareProductMapper.java @@ -5,7 +5,7 @@ import java.util.HashSet; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.fare.FareMedium; import org.opentripplanner.model.fare.FareProduct; import org.opentripplanner.model.fare.RiderCategory; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/FareTransferRuleMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/FareTransferRuleMapper.java index f4ac90d7925..d760be0fc3a 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/FareTransferRuleMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/FareTransferRuleMapper.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareTransferRule; import org.opentripplanner.ext.fares.model.TimeLimitType; import org.opentripplanner.model.fare.FareProduct; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToTransitDataImportMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToTransitDataImportMapper.java index 52052d0df7a..6b53d92ab7c 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToTransitDataImportMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToTransitDataImportMapper.java @@ -11,7 +11,7 @@ import org.onebusaway.gtfs.model.Stop; import org.onebusaway.gtfs.services.GtfsDao; import org.onebusaway.gtfs.services.GtfsRelationalDao; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareRulesData; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/IdFactory.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/IdFactory.java index 76281ddbe9d..4645f68da8d 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/IdFactory.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/IdFactory.java @@ -3,7 +3,7 @@ import java.util.Objects; import javax.annotation.Nullable; import org.onebusaway.gtfs.model.AgencyAndId; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.utils.lang.StringUtils; /** 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 5494b930ff6..a3d37926902 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/LocationGroupMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/LocationGroupMapper.java @@ -8,8 +8,8 @@ import org.onebusaway.gtfs.model.Location; import org.onebusaway.gtfs.model.LocationGroup; import org.onebusaway.gtfs.model.Stop; -import org.opentripplanner.core.model.i18n.LocalizedString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.LocalizedString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.transit.model.site.GroupStop; import org.opentripplanner.transit.service.SiteRepositoryBuilder; import org.opentripplanner.utils.collection.MapUtils; 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 8b8a401a377..e5d3f823f75 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/LocationMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/LocationMapper.java @@ -6,7 +6,7 @@ import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.operation.valid.IsValidOp; import org.onebusaway.gtfs.model.Location; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issue.api.Issue; import org.opentripplanner.street.geometry.GeometryUtils; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/NoticeAssignmentMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/NoticeAssignmentMapper.java index 5f39ffa22dd..faaaca30380 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/NoticeAssignmentMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/NoticeAssignmentMapper.java @@ -9,7 +9,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.onebusaway.gtfs.model.NoticeAssignment; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.transit.model.basic.Notice; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/NoticeMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/NoticeMapper.java index 7047680cef2..66018afc75a 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/NoticeMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/NoticeMapper.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.Notice; /** 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 0b4ebd47067..275135cfb4c 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/PathwayNodeMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/PathwayNodeMapper.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Optional; import java.util.function.Function; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.site.PathwayNode; import org.opentripplanner.transit.model.site.Station; import org.opentripplanner.utils.collection.MapUtils; 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 1f2dd858499..078e47533a7 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/RouteMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/RouteMapper.java @@ -6,8 +6,8 @@ import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.network.GroupOfRoutes; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/RouteNetworkAssignmentMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/RouteNetworkAssignmentMapper.java index c7344b2b548..5c38740450f 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/RouteNetworkAssignmentMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/RouteNetworkAssignmentMapper.java @@ -4,7 +4,7 @@ import com.google.common.collect.Multimap; import java.util.Collection; import org.onebusaway.gtfs.model.RouteNetworkAssignment; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * Keeps the mapping between GTFS route and their network IDs. These assignments don't result diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/ServiceDateMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/ServiceDateMapper.java index 1dac67deac8..cfef318606b 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/ServiceDateMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/ServiceDateMapper.java @@ -1,7 +1,7 @@ package org.opentripplanner.gtfs.mapping; import java.time.LocalDate; -import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.time.LocalDateRange; /** Responsible for mapping GTFS ServiceDate into the OTP model. */ class ServiceDateMapper { 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 6c466dd7741..a34adee4c1f 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/ShapePointMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/ShapePointMapper.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** Responsible for mapping GTFS ShapePoint into the OTP model. */ class ShapePointMapper { diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/StopAreaMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/StopAreaMapper.java index 940c68d1530..e9dda237e40 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/StopAreaMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/StopAreaMapper.java @@ -4,7 +4,7 @@ import com.google.common.collect.Multimap; import java.util.Collection; import org.onebusaway.gtfs.model.StopAreaElement; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; class StopAreaMapper { 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 d2881e94fb8..e506f78d752 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/StopMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/StopMapper.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.function.Function; import org.onebusaway.gtfs.model.Stop; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.site.FareZone; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/StopMappingWrapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/StopMappingWrapper.java index 16fada4f9c4..f442bd0aafa 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/StopMappingWrapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/StopMappingWrapper.java @@ -1,8 +1,8 @@ package org.opentripplanner.gtfs.mapping; import org.onebusaway.gtfs.model.Stop; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.site.StationElement; import org.opentripplanner.transit.model.site.StopLevel; 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 c097b2fb2d0..4eb263f5445 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java @@ -7,7 +7,7 @@ import org.onebusaway.gtfs.model.Location; import org.onebusaway.gtfs.model.LocationGroup; import org.onebusaway.gtfs.model.Stop; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.model.StopTime; import org.opentripplanner.utils.collection.MapUtils; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/TimeframeMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/TimeframeMapper.java index fcb09433f64..319e3a62d60 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/TimeframeMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/TimeframeMapper.java @@ -5,7 +5,7 @@ import java.time.LocalTime; import java.util.Collection; import java.util.Objects; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.Timeframe; class TimeframeMapper { diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/TranslationHelper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/TranslationHelper.java index 4c32ec46809..b6e5a4c702d 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/TranslationHelper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/TranslationHelper.java @@ -13,9 +13,9 @@ import org.onebusaway.csv_entities.schema.annotations.CsvFields; import org.onebusaway.gtfs.model.FeedInfo; import org.onebusaway.gtfs.model.Translation; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.i18n.TranslatedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.TranslatedString; /** * This helper is util for translating wanted text found in GTFS's translation.txt -file. 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 4ae0ad44eec..fd3ff98b10c 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.routing.api.request.framework.TimePenalty; import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.utils.collection.MapUtils; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/TripSegmentMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/TripSegmentMapper.java index 50ac16a6ddc..5eb162b20f3 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/TripSegmentMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/TripSegmentMapper.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; import org.onebusaway.gtfs.model.TripSegment; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.TripStopTimes; import org.opentripplanner.transit.model.timetable.StopTimeKey; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/WheelchairAccessibilityMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/WheelchairAccessibilityMapper.java index 5a18ec3b65d..e5f042aa9e1 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/WheelchairAccessibilityMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/WheelchairAccessibilityMapper.java @@ -1,6 +1,6 @@ package org.opentripplanner.gtfs.mapping; -import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; class WheelchairAccessibilityMapper { diff --git a/application/src/main/java/org/opentripplanner/inspector/vector/KeyValue.java b/application/src/main/java/org/opentripplanner/inspector/vector/KeyValue.java index 9c1f1d97e5b..3671b6a9112 100644 --- a/application/src/main/java/org/opentripplanner/inspector/vector/KeyValue.java +++ b/application/src/main/java/org/opentripplanner/inspector/vector/KeyValue.java @@ -3,8 +3,8 @@ import java.util.Collection; import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * A key value pair that represents data being sent to the vector tile library for visualisation diff --git a/application/src/main/java/org/opentripplanner/inspector/vector/stop/StopLocationPropertyMapper.java b/application/src/main/java/org/opentripplanner/inspector/vector/stop/StopLocationPropertyMapper.java index 0fe458c6523..1bd5d78db76 100644 --- a/application/src/main/java/org/opentripplanner/inspector/vector/stop/StopLocationPropertyMapper.java +++ b/application/src/main/java/org/opentripplanner/inspector/vector/stop/StopLocationPropertyMapper.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Locale; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.core.model.i18n.I18NStringMapper; +import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.transit.model.site.StopLocation; diff --git a/application/src/main/java/org/opentripplanner/model/GenericLocation.java b/application/src/main/java/org/opentripplanner/model/GenericLocation.java index 6f5f06b7b46..fc0ec9943fc 100644 --- a/application/src/main/java/org/opentripplanner/model/GenericLocation.java +++ b/application/src/main/java/org/opentripplanner/model/GenericLocation.java @@ -3,7 +3,7 @@ import java.util.Objects; import javax.annotation.Nullable; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.TripLocation; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.utils.lang.StringUtils; diff --git a/application/src/main/java/org/opentripplanner/model/StopTime.java b/application/src/main/java/org/opentripplanner/model/StopTime.java index e2c4dd53bcf..d688ecc5f94 100644 --- a/application/src/main/java/org/opentripplanner/model/StopTime.java +++ b/application/src/main/java/org/opentripplanner/model/StopTime.java @@ -4,7 +4,7 @@ import static org.opentripplanner.model.PickDrop.NONE; import java.util.List; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.transit.model.site.AreaStop; import org.opentripplanner.transit.model.site.GroupStop; import org.opentripplanner.transit.model.site.StopLocation; diff --git a/application/src/main/java/org/opentripplanner/model/TransitDataImport.java b/application/src/main/java/org/opentripplanner/model/TransitDataImport.java index f928419e69a..4c1bab6e1f9 100644 --- a/application/src/main/java/org/opentripplanner/model/TransitDataImport.java +++ b/application/src/main/java/org/opentripplanner/model/TransitDataImport.java @@ -3,7 +3,7 @@ import com.google.common.collect.Multimap; import java.util.Collection; import java.util.Map; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.transfer.constrained.model.ConstrainedTransfer; import org.opentripplanner.transit.model.basic.Notice; diff --git a/application/src/main/java/org/opentripplanner/model/TripTimeOnDate.java b/application/src/main/java/org/opentripplanner/model/TripTimeOnDate.java index 5a87f5dc995..436a71d52d9 100644 --- a/application/src/main/java/org/opentripplanner/model/TripTimeOnDate.java +++ b/application/src/main/java/org/opentripplanner/model/TripTimeOnDate.java @@ -9,7 +9,7 @@ import java.util.Optional; import java.util.stream.IntStream; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.transit.model.network.ReplacedByRelation; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.site.StopLocation; diff --git a/application/src/main/java/org/opentripplanner/model/calendar/CalendarService.java b/application/src/main/java/org/opentripplanner/model/calendar/CalendarService.java index d6b6aa8f649..630786ea43a 100644 --- a/application/src/main/java/org/opentripplanner/model/calendar/CalendarService.java +++ b/application/src/main/java/org/opentripplanner/model/calendar/CalendarService.java @@ -2,7 +2,7 @@ import java.time.LocalDate; import java.util.Set; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; public interface CalendarService { /** 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 7e93e718613..aabbbc16bc5 100644 --- a/application/src/main/java/org/opentripplanner/model/calendar/CalendarServiceData.java +++ b/application/src/main/java/org/opentripplanner/model/calendar/CalendarServiceData.java @@ -11,7 +11,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.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/ServiceCalendar.java b/application/src/main/java/org/opentripplanner/model/calendar/ServiceCalendar.java index e0889519e05..09706759eda 100644 --- a/application/src/main/java/org/opentripplanner/model/calendar/ServiceCalendar.java +++ b/application/src/main/java/org/opentripplanner/model/calendar/ServiceCalendar.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.util.Objects; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.LocalDateRange; /** * Note that I decided to call this class ServiceCalendar instead of Calendar, so as to avoid 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 16190521468..8f20eb1c72f 100644 --- a/application/src/main/java/org/opentripplanner/model/calendar/ServiceCalendarDate.java +++ b/application/src/main/java/org/opentripplanner/model/calendar/ServiceCalendarDate.java @@ -4,7 +4,7 @@ import java.io.Serializable; import java.time.LocalDate; import java.util.Objects; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.utils.tostring.ToStringBuilder; /** diff --git a/application/src/main/java/org/opentripplanner/model/calendar/impl/CalendarServiceDataFactoryImpl.java b/application/src/main/java/org/opentripplanner/model/calendar/impl/CalendarServiceDataFactoryImpl.java index bbb4c7d0735..713181c979a 100644 --- a/application/src/main/java/org/opentripplanner/model/calendar/impl/CalendarServiceDataFactoryImpl.java +++ b/application/src/main/java/org/opentripplanner/model/calendar/impl/CalendarServiceDataFactoryImpl.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.calendar.CalendarServiceData; import org.opentripplanner.model.calendar.ServiceCalendar; import org.opentripplanner.model.calendar.ServiceCalendarDate; diff --git a/application/src/main/java/org/opentripplanner/model/calendar/impl/CalendarServiceImpl.java b/application/src/main/java/org/opentripplanner/model/calendar/impl/CalendarServiceImpl.java index 613b7882d7f..13a27965199 100644 --- a/application/src/main/java/org/opentripplanner/model/calendar/impl/CalendarServiceImpl.java +++ b/application/src/main/java/org/opentripplanner/model/calendar/impl/CalendarServiceImpl.java @@ -5,7 +5,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.calendar.CalendarService; import org.opentripplanner.model.calendar.CalendarServiceData; diff --git a/application/src/main/java/org/opentripplanner/model/calendar/impl/MultipleCalendarsForServiceIdException.java b/application/src/main/java/org/opentripplanner/model/calendar/impl/MultipleCalendarsForServiceIdException.java index 29b5b28efb4..f21ddfa13be 100644 --- a/application/src/main/java/org/opentripplanner/model/calendar/impl/MultipleCalendarsForServiceIdException.java +++ b/application/src/main/java/org/opentripplanner/model/calendar/impl/MultipleCalendarsForServiceIdException.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.model.calendar.impl; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; class MultipleCalendarsForServiceIdException extends RuntimeException { 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 7ff26a989fd..e6169e8e888 100644 --- a/application/src/main/java/org/opentripplanner/model/fare/FareMedium.java +++ b/application/src/main/java/org/opentripplanner/model/fare/FareMedium.java @@ -1,7 +1,7 @@ package org.opentripplanner.model.fare; import java.util.Objects; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.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 393a22685fa..9c2769eebc0 100644 --- a/application/src/main/java/org/opentripplanner/model/fare/FareProduct.java +++ b/application/src/main/java/org/opentripplanner/model/fare/FareProduct.java @@ -6,7 +6,7 @@ import java.util.Objects; import java.util.UUID; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.Money; import org.opentripplanner.utils.lang.Sandbox; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/main/java/org/opentripplanner/model/fare/FareProductBuilder.java b/application/src/main/java/org/opentripplanner/model/fare/FareProductBuilder.java index 3a58ef315d2..c3bb897a0a6 100644 --- a/application/src/main/java/org/opentripplanner/model/fare/FareProductBuilder.java +++ b/application/src/main/java/org/opentripplanner/model/fare/FareProductBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.model.fare; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.Money; /** 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 9f8428218a5..00344a45c03 100644 --- a/application/src/main/java/org/opentripplanner/model/fare/RiderCategory.java +++ b/application/src/main/java/org/opentripplanner/model/fare/RiderCategory.java @@ -2,7 +2,7 @@ import java.io.Serializable; import java.util.Objects; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.utils.lang.Sandbox; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/main/java/org/opentripplanner/model/fare/RiderCategoryBuilder.java b/application/src/main/java/org/opentripplanner/model/fare/RiderCategoryBuilder.java index ce0d66d9546..9e9fb29def2 100644 --- a/application/src/main/java/org/opentripplanner/model/fare/RiderCategoryBuilder.java +++ b/application/src/main/java/org/opentripplanner/model/fare/RiderCategoryBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.model.fare; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; public class RiderCategoryBuilder { diff --git a/application/src/main/java/org/opentripplanner/model/impl/DefaultTransitDataImport.java b/application/src/main/java/org/opentripplanner/model/impl/DefaultTransitDataImport.java index 1807729a4d2..39c78418d29 100644 --- a/application/src/main/java/org/opentripplanner/model/impl/DefaultTransitDataImport.java +++ b/application/src/main/java/org/opentripplanner/model/impl/DefaultTransitDataImport.java @@ -8,7 +8,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.model.FeedInfo; import org.opentripplanner.model.TransitDataImport; diff --git a/application/src/main/java/org/opentripplanner/model/impl/TransitDataImportBuilder.java b/application/src/main/java/org/opentripplanner/model/impl/TransitDataImportBuilder.java index c24a0cbe148..01560414521 100644 --- a/application/src/main/java/org/opentripplanner/model/impl/TransitDataImportBuilder.java +++ b/application/src/main/java/org/opentripplanner/model/impl/TransitDataImportBuilder.java @@ -9,8 +9,8 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.LocalDateRange; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.gtfs.mapping.StaySeatedNotAllowed; 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 12cf6fafd2b..d853e1eb882 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/Itinerary.java +++ b/application/src/main/java/org/opentripplanner/model/plan/Itinerary.java @@ -9,7 +9,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Nullable; -import org.opentripplanner.core.model.basic.NormalizedCost; +import org.opentripplanner.core.domain.model.basic.NormalizedCost; import org.opentripplanner.ext.flex.FlexibleTransitLeg; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.model.SystemNotice; diff --git a/application/src/main/java/org/opentripplanner/model/plan/ItineraryBuilder.java b/application/src/main/java/org/opentripplanner/model/plan/ItineraryBuilder.java index c9dc012faa7..465d850c5be 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/ItineraryBuilder.java +++ b/application/src/main/java/org/opentripplanner/model/plan/ItineraryBuilder.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Function; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.model.SystemNotice; import org.opentripplanner.street.model.path.ElevationChange; 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 2a0c81ce0d8..b48bd0fa0d3 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.core.model.basic.NormalizedCost; +import org.opentripplanner.core.domain.model.basic.NormalizedCost; import org.opentripplanner.utils.tostring.ValueObjectToStringBuilder; /** 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 1b5f782f268..fc2d54a6caf 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/Leg.java +++ b/application/src/main/java/org/opentripplanner/model/plan/Leg.java @@ -9,8 +9,8 @@ import java.util.stream.Stream; import javax.annotation.Nullable; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.fare.FareOffer; import org.opentripplanner.model.plan.leg.LegCallTime; 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 9fc4a1c3d96..7edd5a27f0e 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/Place.java +++ b/application/src/main/java/org/opentripplanner/model/plan/Place.java @@ -1,9 +1,9 @@ package org.opentripplanner.model.plan; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.LocalizedString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.LocalizedString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.model.plan.leg.ViaLocationType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; diff --git a/application/src/main/java/org/opentripplanner/model/plan/leg/ScheduledTransitLeg.java b/application/src/main/java/org/opentripplanner/model/plan/leg/ScheduledTransitLeg.java index 6c390c143ff..6e8a699d392 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/leg/ScheduledTransitLeg.java +++ b/application/src/main/java/org/opentripplanner/model/plan/leg/ScheduledTransitLeg.java @@ -11,9 +11,9 @@ import java.util.Set; import javax.annotation.Nullable; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.basic.Cost; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.fare.FareOffer; import org.opentripplanner.model.plan.Emission; diff --git a/application/src/main/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializer.java b/application/src/main/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializer.java index a09920d718b..5cc06586665 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializer.java +++ b/application/src/main/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializer.java @@ -9,7 +9,7 @@ import java.time.format.DateTimeFormatter; import java.util.Base64; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 c1c2d5bc55c..6751ddcebd3 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 @@ -5,7 +5,7 @@ import java.util.OptionalInt; import java.util.function.Predicate; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.plan.leg.ScheduledTransitLeg; import org.opentripplanner.model.plan.leg.ScheduledTransitLegBuilder; import org.opentripplanner.routing.algorithm.mapping.AlertToLegMapper; diff --git a/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCut.java b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCut.java index c9ee5e1d013..b14f0a56148 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCut.java +++ b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCut.java @@ -1,7 +1,7 @@ package org.opentripplanner.model.plan.paging.cursor; import java.time.Instant; -import org.opentripplanner.core.model.basic.NormalizedCost; +import org.opentripplanner.core.domain.model.basic.NormalizedCost; import org.opentripplanner.model.plan.ItinerarySortKey; /** 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 2543d9b9ce3..f3262138a40 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,7 +3,7 @@ import java.time.Duration; import java.time.Instant; import javax.annotation.Nullable; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.SortOrder; import org.opentripplanner.utils.collection.ListSection; 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 bd0ee49d51f..3591a8c24d5 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,7 +6,7 @@ import java.time.Duration; import java.time.Instant; import javax.annotation.Nullable; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.SortOrder; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorInput.java b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorInput.java index 32a23e9d993..d773da39bd5 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorInput.java +++ b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorInput.java @@ -1,7 +1,7 @@ package org.opentripplanner.model.plan.paging.cursor; import java.time.Instant; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.model.plan.ItinerarySortKey; /** 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 5b335627880..565df6ccc48 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,7 +1,7 @@ package org.opentripplanner.model.plan.paging.cursor; import javax.annotation.Nullable; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.framework.token.TokenSchema; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.SortOrder; diff --git a/application/src/main/java/org/opentripplanner/model/plan/walkstep/WalkStep.java b/application/src/main/java/org/opentripplanner/model/plan/walkstep/WalkStep.java index 5696a38dfeb..8116f5408a9 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/walkstep/WalkStep.java +++ b/application/src/main/java/org/opentripplanner/model/plan/walkstep/WalkStep.java @@ -4,7 +4,7 @@ import java.util.Objects; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.model.plan.walkstep.verticaltransportation.VerticalTransportationUse; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.street.model.edge.Edge; diff --git a/application/src/main/java/org/opentripplanner/model/plan/walkstep/WalkStepBuilder.java b/application/src/main/java/org/opentripplanner/model/plan/walkstep/WalkStepBuilder.java index 82a23881a32..dceeed15135 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/walkstep/WalkStepBuilder.java +++ b/application/src/main/java/org/opentripplanner/model/plan/walkstep/WalkStepBuilder.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.model.plan.walkstep.verticaltransportation.VerticalTransportationUse; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.street.model.edge.Edge; diff --git a/application/src/main/java/org/opentripplanner/netex/NetexBundle.java b/application/src/main/java/org/opentripplanner/netex/NetexBundle.java index 06754899454..53894459025 100644 --- a/application/src/main/java/org/opentripplanner/netex/NetexBundle.java +++ b/application/src/main/java/org/opentripplanner/netex/NetexBundle.java @@ -6,8 +6,8 @@ import java.util.Collection; import java.util.List; import java.util.Set; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.datastore.api.CompositeDataSource; import org.opentripplanner.datastore.api.DataSource; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; diff --git a/application/src/main/java/org/opentripplanner/netex/NetexModule.java b/application/src/main/java/org/opentripplanner/netex/NetexModule.java index 17fa5718d48..3335235d270 100644 --- a/application/src/main/java/org/opentripplanner/netex/NetexModule.java +++ b/application/src/main/java/org/opentripplanner/netex/NetexModule.java @@ -3,8 +3,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Queue; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.model.time.LocalDateRange; import org.opentripplanner.ext.flex.FlexTripsMapper; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; diff --git a/application/src/main/java/org/opentripplanner/netex/configure/NetexConfigure.java b/application/src/main/java/org/opentripplanner/netex/configure/NetexConfigure.java index 12f61f310bb..ed872992471 100644 --- a/application/src/main/java/org/opentripplanner/netex/configure/NetexConfigure.java +++ b/application/src/main/java/org/opentripplanner/netex/configure/NetexConfigure.java @@ -2,7 +2,7 @@ import java.util.ArrayList; import java.util.List; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; import org.opentripplanner.datastore.api.CompositeDataSource; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.model.ConfiguredCompositeDataSource; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/FlexStopsMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/FlexStopsMapper.java index 950fb4f9f71..d8f5befd831 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/FlexStopsMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/FlexStopsMapper.java @@ -6,7 +6,7 @@ import javax.annotation.Nullable; import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issue.api.Issue; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/GroupOfStationsMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/GroupOfStationsMapper.java index bc254589bb7..746d30e0a90 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/GroupOfStationsMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/GroupOfStationsMapper.java @@ -3,9 +3,9 @@ import jakarta.xml.bind.JAXBElement; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/HeadsignMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/HeadsignMapper.java index 5f8dc71df43..d5a4e75997b 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/HeadsignMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/HeadsignMapper.java @@ -2,7 +2,7 @@ import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.netex.config.SwissProfile; import org.rutebanken.netex.model.DestinationDisplay; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/MultiModalStationMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/MultiModalStationMapper.java index 2f6b16afb9a..733668d5974 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/MultiModalStationMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/MultiModalStationMapper.java @@ -2,7 +2,7 @@ import java.util.Collection; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java index 25e1a296c10..8ef0e917f73 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java @@ -11,8 +11,8 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.calendar.ServiceCalendar; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/NoticeAssignmentMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/NoticeAssignmentMapper.java index 9ca5742c50d..f55cfb036dc 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/NoticeAssignmentMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/NoticeAssignmentMapper.java @@ -4,7 +4,7 @@ import com.google.common.collect.Multimap; import java.util.Collection; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.StopTime; import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalMap; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/NoticeMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/NoticeMapper.java index 4b1ac9f7b98..09ada4f10bc 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/NoticeMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/NoticeMapper.java @@ -1,6 +1,6 @@ package org.opentripplanner.netex.mapping; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; import org.opentripplanner.transit.model.basic.Notice; import org.opentripplanner.transit.model.framework.DefaultEntityById; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/QuayMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/QuayMapper.java index f32ef7b9df0..a7b3aead53b 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/QuayMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/QuayMapper.java @@ -4,9 +4,9 @@ import java.util.Collection; import javax.annotation.Nullable; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/RouteMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/RouteMapper.java index 0fa1067412e..3eb790656bd 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/RouteMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/RouteMapper.java @@ -6,8 +6,8 @@ import java.util.HashSet; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.netex.index.api.NetexEntityIndexReadOnlyView; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/StationMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/StationMapper.java index e983030883f..c230b3c94b5 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/StationMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/StationMapper.java @@ -8,10 +8,10 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.i18n.TranslatedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.TranslatedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; import org.opentripplanner.netex.support.JAXBUtils; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/StopAndStationMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/StopAndStationMapper.java index b36ae5ea9b5..94e03c6c316 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/StopAndStationMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/StopAndStationMapper.java @@ -14,8 +14,8 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issue.api.Issue; import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalVersionMapById; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapper.java index 2a7cdc791bd..ebbb20de82f 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapper.java @@ -12,7 +12,7 @@ import java.util.Objects; import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.StopTime; import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalMap; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/TariffZoneMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/TariffZoneMapper.java index fee31bfdb19..63dabace723 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/TariffZoneMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/TariffZoneMapper.java @@ -4,7 +4,7 @@ import com.google.common.collect.Multimap; import java.time.LocalDateTime; import java.util.Collection; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalVersionMapById; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; import org.opentripplanner.transit.model.site.FareZone; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/TransferMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/TransferMapper.java index ceff7db08a9..784c8422681 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/TransferMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/TransferMapper.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Map; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.netex.config.SwissProfile; import org.opentripplanner.netex.issues.InterchangeMaxWaitTimeNotGuaranteed; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/TripCalendarBuilder.java b/application/src/main/java/org/opentripplanner/netex/mapping/TripCalendarBuilder.java index 53d40e3b04e..97abe457d80 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/TripCalendarBuilder.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/TripCalendarBuilder.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalMap; import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalMapById; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/TripMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/TripMapper.java index 4b574299dce..258d54050b2 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/TripMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/TripMapper.java @@ -4,9 +4,9 @@ import java.util.Map; import java.util.function.Supplier; import javax.annotation.Nullable; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalMap; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java index a628429b13c..6baafb223b2 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java @@ -12,8 +12,8 @@ import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.StopTime; import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalMap; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java index 82eee0d9939..bf41de90556 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java @@ -6,7 +6,7 @@ import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; import org.opentripplanner.service.vehicleparking.model.VehicleParking; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/WheelChairMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/WheelChairMapper.java index 5445975fe73..cdcfeda27d4 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/WheelChairMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/WheelChairMapper.java @@ -1,7 +1,7 @@ package org.opentripplanner.netex.mapping; import java.util.Optional; -import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; import org.rutebanken.netex.model.AccessibilityAssessment; import org.rutebanken.netex.model.AccessibilityLimitation; import org.rutebanken.netex.model.AccessibilityLimitations_RelStructure; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/calendar/CalendarServiceBuilder.java b/application/src/main/java/org/opentripplanner/netex/mapping/calendar/CalendarServiceBuilder.java index 842e23f51a9..f6863a8c303 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/calendar/CalendarServiceBuilder.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/calendar/CalendarServiceBuilder.java @@ -8,8 +8,8 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.LocalDateRange; import org.opentripplanner.model.calendar.ServiceCalendar; import org.opentripplanner.model.calendar.ServiceCalendarDate; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/support/FeedScopedIdFactory.java b/application/src/main/java/org/opentripplanner/netex/mapping/support/FeedScopedIdFactory.java index 8bd3b0801cf..c258e0a84be 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/support/FeedScopedIdFactory.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/support/FeedScopedIdFactory.java @@ -1,6 +1,6 @@ package org.opentripplanner.netex.mapping.support; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * GTFS uses the term agency_id, which is used to scope the ids of all other elements in OTP. Since diff --git a/application/src/main/java/org/opentripplanner/osm/model/OsmEntity.java b/application/src/main/java/org/opentripplanner/osm/model/OsmEntity.java index e0e85482811..969abe364f5 100644 --- a/application/src/main/java/org/opentripplanner/osm/model/OsmEntity.java +++ b/application/src/main/java/org/opentripplanner/osm/model/OsmEntity.java @@ -23,10 +23,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.annotation.Nullable; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.i18n.TranslatedString; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.TranslatedString; import org.opentripplanner.graph_builder.module.osm.OsmModule; import org.opentripplanner.osm.OsmProvider; import org.opentripplanner.street.model.StreetTraversalPermission; diff --git a/application/src/main/java/org/opentripplanner/osm/wayproperty/CreativeNamer.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/CreativeNamer.java index 427f9f3dae6..901a449a96a 100644 --- a/application/src/main/java/org/opentripplanner/osm/wayproperty/CreativeNamer.java +++ b/application/src/main/java/org/opentripplanner/osm/wayproperty/CreativeNamer.java @@ -1,6 +1,6 @@ package org.opentripplanner.osm.wayproperty; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.osm.model.OsmEntity; /** diff --git a/application/src/main/java/org/opentripplanner/osm/wayproperty/LocalizedStringMapper.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/LocalizedStringMapper.java index 5c6a50dffba..3022f1429ab 100644 --- a/application/src/main/java/org/opentripplanner/osm/wayproperty/LocalizedStringMapper.java +++ b/application/src/main/java/org/opentripplanner/osm/wayproperty/LocalizedStringMapper.java @@ -8,10 +8,10 @@ import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.opentripplanner.core.framework.resources.ResourceBundleSingleton; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.LocalizedString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.framework.resources.ResourceBundleSingleton; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.LocalizedString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.osm.model.OsmEntity; class LocalizedStringMapper { diff --git a/application/src/main/java/org/opentripplanner/osm/wayproperty/WayPropertySet.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/WayPropertySet.java index e0e5be227b2..f36a0974e73 100644 --- a/application/src/main/java/org/opentripplanner/osm/wayproperty/WayPropertySet.java +++ b/application/src/main/java/org/opentripplanner/osm/wayproperty/WayPropertySet.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.List; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.framework.functional.FunctionUtils.TriFunction; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.osm.model.OsmEntity; diff --git a/application/src/main/java/org/opentripplanner/place/NearbyPlaceFinder.java b/application/src/main/java/org/opentripplanner/place/NearbyPlaceFinder.java index ed528564196..b41b5568940 100644 --- a/application/src/main/java/org/opentripplanner/place/NearbyPlaceFinder.java +++ b/application/src/main/java/org/opentripplanner/place/NearbyPlaceFinder.java @@ -1,7 +1,7 @@ package org.opentripplanner.place; import java.util.List; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.place.api.PlaceAtDistance; import org.opentripplanner.place.api.PlaceType; import org.opentripplanner.transit.model.basic.TransitMode; diff --git a/application/src/main/java/org/opentripplanner/place/api/NearbyStop.java b/application/src/main/java/org/opentripplanner/place/api/NearbyStop.java index 7ed01d94aa9..0e4c5d30baa 100644 --- a/application/src/main/java/org/opentripplanner/place/api/NearbyStop.java +++ b/application/src/main/java/org/opentripplanner/place/api/NearbyStop.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Locale; import java.util.Objects; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.place.nearbystopfinder.ChronologicalGraphPath; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.search.state.State; diff --git a/application/src/main/java/org/opentripplanner/place/api/PatternAtStop.java b/application/src/main/java/org/opentripplanner/place/api/PatternAtStop.java index c2e5d160cd4..cc060e0e5ca 100644 --- a/application/src/main/java/org/opentripplanner/place/api/PatternAtStop.java +++ b/application/src/main/java/org/opentripplanner/place/api/PatternAtStop.java @@ -6,7 +6,7 @@ import java.util.Base64; import java.util.List; import java.util.Objects; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.site.StopLocation; diff --git a/application/src/main/java/org/opentripplanner/place/nearbystopfinder/CompositeNearbyStopFilter.java b/application/src/main/java/org/opentripplanner/place/nearbystopfinder/CompositeNearbyStopFilter.java index 54844e0058b..dae0794a204 100644 --- a/application/src/main/java/org/opentripplanner/place/nearbystopfinder/CompositeNearbyStopFilter.java +++ b/application/src/main/java/org/opentripplanner/place/nearbystopfinder/CompositeNearbyStopFilter.java @@ -5,7 +5,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.place.api.NearbyStop; /** diff --git a/application/src/main/java/org/opentripplanner/place/nearbystopfinder/FlexTripNearbyStopFilter.java b/application/src/main/java/org/opentripplanner/place/nearbystopfinder/FlexTripNearbyStopFilter.java index 700d5466abb..f2396e72493 100644 --- a/application/src/main/java/org/opentripplanner/place/nearbystopfinder/FlexTripNearbyStopFilter.java +++ b/application/src/main/java/org/opentripplanner/place/nearbystopfinder/FlexTripNearbyStopFilter.java @@ -1,7 +1,7 @@ package org.opentripplanner.place.nearbystopfinder; import java.util.Collection; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.place.api.NearbyStop; import org.opentripplanner.transit.service.TransitService; diff --git a/application/src/main/java/org/opentripplanner/place/nearbystopfinder/NearbyStopFilter.java b/application/src/main/java/org/opentripplanner/place/nearbystopfinder/NearbyStopFilter.java index 0d9a3d2d1c2..ecb0480708d 100644 --- a/application/src/main/java/org/opentripplanner/place/nearbystopfinder/NearbyStopFilter.java +++ b/application/src/main/java/org/opentripplanner/place/nearbystopfinder/NearbyStopFilter.java @@ -1,7 +1,7 @@ package org.opentripplanner.place.nearbystopfinder; import java.util.Collection; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.place.api.NearbyStop; /** diff --git a/application/src/main/java/org/opentripplanner/place/nearbystopfinder/NearbyStopFinderVisitor.java b/application/src/main/java/org/opentripplanner/place/nearbystopfinder/NearbyStopFinderVisitor.java index 1a5b915d08e..77cb89b043f 100644 --- a/application/src/main/java/org/opentripplanner/place/nearbystopfinder/NearbyStopFinderVisitor.java +++ b/application/src/main/java/org/opentripplanner/place/nearbystopfinder/NearbyStopFinderVisitor.java @@ -10,7 +10,7 @@ import java.util.Set; import java.util.function.Predicate; import org.opentripplanner.astar.spi.TraverseVisitor; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.place.api.NearbyStop; import org.opentripplanner.street.model.edge.Edge; diff --git a/application/src/main/java/org/opentripplanner/place/nearbystopfinder/PatternNearbyStopFilter.java b/application/src/main/java/org/opentripplanner/place/nearbystopfinder/PatternNearbyStopFilter.java index 51291a51822..4b78831f570 100644 --- a/application/src/main/java/org/opentripplanner/place/nearbystopfinder/PatternNearbyStopFilter.java +++ b/application/src/main/java/org/opentripplanner/place/nearbystopfinder/PatternNearbyStopFilter.java @@ -4,7 +4,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.place.api.NearbyStop; import org.opentripplanner.transit.model.network.TripPattern; diff --git a/application/src/main/java/org/opentripplanner/place/placefinder/PlaceFinderTraverseVisitor.java b/application/src/main/java/org/opentripplanner/place/placefinder/PlaceFinderTraverseVisitor.java index 9e3ce3124cd..cb2a21f34ed 100644 --- a/application/src/main/java/org/opentripplanner/place/placefinder/PlaceFinderTraverseVisitor.java +++ b/application/src/main/java/org/opentripplanner/place/placefinder/PlaceFinderTraverseVisitor.java @@ -7,7 +7,7 @@ import java.util.Set; import org.opentripplanner.astar.spi.SkipEdgeStrategy; import org.opentripplanner.astar.spi.TraverseVisitor; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.place.api.PatternAtStop; import org.opentripplanner.place.api.PlaceAtDistance; import org.opentripplanner.place.api.PlaceType; diff --git a/application/src/main/java/org/opentripplanner/place/placefinder/StreetNearbyPlaceFinder.java b/application/src/main/java/org/opentripplanner/place/placefinder/StreetNearbyPlaceFinder.java index 41e992426ee..df480547f88 100644 --- a/application/src/main/java/org/opentripplanner/place/placefinder/StreetNearbyPlaceFinder.java +++ b/application/src/main/java/org/opentripplanner/place/placefinder/StreetNearbyPlaceFinder.java @@ -6,7 +6,7 @@ import java.util.List; import org.opentripplanner.astar.spi.SkipEdgeStrategy; import org.opentripplanner.astar.spi.TraverseVisitor; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.application.OTPRequestTimeoutException; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.place.NearbyPlaceFinder; diff --git a/application/src/main/java/org/opentripplanner/routing/alertpatch/AlertCalendar.java b/application/src/main/java/org/opentripplanner/routing/alertpatch/AlertCalendar.java index 7ae8c3277a8..0b4c8212ec8 100644 --- a/application/src/main/java/org/opentripplanner/routing/alertpatch/AlertCalendar.java +++ b/application/src/main/java/org/opentripplanner/routing/alertpatch/AlertCalendar.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Objects; import java.util.Optional; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.utils.tostring.ToStringBuilder; /** diff --git a/application/src/main/java/org/opentripplanner/routing/alertpatch/EntityKey.java b/application/src/main/java/org/opentripplanner/routing/alertpatch/EntityKey.java index e4c0fdaa28a..61cbc918d03 100644 --- a/application/src/main/java/org/opentripplanner/routing/alertpatch/EntityKey.java +++ b/application/src/main/java/org/opentripplanner/routing/alertpatch/EntityKey.java @@ -1,6 +1,6 @@ package org.opentripplanner.routing.alertpatch; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.timetable.Direction; /** diff --git a/application/src/main/java/org/opentripplanner/routing/alertpatch/EntitySelector.java b/application/src/main/java/org/opentripplanner/routing/alertpatch/EntitySelector.java index ff8a91ea2b9..8f049f90454 100644 --- a/application/src/main/java/org/opentripplanner/routing/alertpatch/EntitySelector.java +++ b/application/src/main/java/org/opentripplanner/routing/alertpatch/EntitySelector.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.timetable.Direction; /** diff --git a/application/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java b/application/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java index 7ee1b925aac..d34897a11eb 100644 --- a/application/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java +++ b/application/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java @@ -7,9 +7,9 @@ import java.util.Optional; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; import org.opentripplanner.transit.model.framework.TransitBuilder; diff --git a/application/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlertBuilder.java b/application/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlertBuilder.java index 4fa0965033a..16405e8f353 100644 --- a/application/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlertBuilder.java +++ b/application/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlertBuilder.java @@ -6,8 +6,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; public class TransitAlertBuilder extends AbstractEntityBuilder { 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 071563bbf3e..c2dac23e27d 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 @@ -11,7 +11,7 @@ import java.util.function.Consumer; import java.util.function.Function; import javax.annotation.Nullable; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.ext.accessibilityscore.DecorateWithAccessibilityScore; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.model.plan.Itinerary; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java index aaddc731839..dbf7eaf49c9 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.OptionalInt; import java.util.stream.Collectors; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.routing.algorithm.filterchain.filters.transit.TransitGeneralizedCostFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java index 38b70ea5810..686b1ab699c 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.OptionalInt; import javax.annotation.Nullable; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterResult.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterResult.java index 2ed0d1ac7a1..52011cf8455 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterResult.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterResult.java @@ -1,6 +1,6 @@ package org.opentripplanner.routing.algorithm.filterchain.filters.transit; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.utils.tostring.ToStringBuilder; /** 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 a7f016aeb9f..b9578177663 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,7 +4,7 @@ import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCost.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCost.java index cd8269ae844..ee8ab04b797 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCost.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCost.java @@ -4,7 +4,7 @@ import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.GroupByFilter; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByAllSameStations.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByAllSameStations.java index ec801855d58..97158ce3a16 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByAllSameStations.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByAllSameStations.java @@ -2,7 +2,7 @@ import java.util.List; import java.util.stream.Collectors; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.GroupId; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameFirstOrLastTrip.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameFirstOrLastTrip.java index 88517b95742..149350a3b2e 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameFirstOrLastTrip.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameFirstOrLastTrip.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.GroupId; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameRoutesAndStops.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameRoutesAndStops.java index 51cea0b048c..f1ec1c8c321 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameRoutesAndStops.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameRoutesAndStops.java @@ -2,7 +2,7 @@ import java.util.List; import java.util.stream.Stream; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.GroupId; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/paging/DefaultPageCursorInput.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/paging/DefaultPageCursorInput.java index 5944bea32c1..bb26a1aac63 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/paging/DefaultPageCursorInput.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/paging/DefaultPageCursorInput.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.algorithm.filterchain.paging; import java.time.Instant; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.paging.cursor.PageCursorInput; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/AlertToLegMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/AlertToLegMapper.java index c52e0f6880c..e0926d0f1a8 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/AlertToLegMapper.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/AlertToLegMapper.java @@ -8,8 +8,8 @@ import java.util.List; import java.util.Set; import java.util.function.Function; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.model.plan.TransitLeg; import org.opentripplanner.model.plan.leg.StopArrival; import org.opentripplanner.routing.alertpatch.StopCondition; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/LegsToItineraryMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/LegsToItineraryMapper.java index 86ac99137c8..d4bdcaa2378 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/LegsToItineraryMapper.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/LegsToItineraryMapper.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.street.model.path.ElevationChange; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java index ceffaf4620e..13ce4e80ae4 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java @@ -7,8 +7,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import org.opentripplanner.core.model.basic.Cost; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.ext.carpooling.internal.CarpoolItineraryMapper; import org.opentripplanner.ext.carpooling.routing.CarpoolAccessEgress; import org.opentripplanner.framework.application.OTPFeature; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapper.java index 5a732c75c9d..671524492ec 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapper.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapper.java @@ -10,8 +10,8 @@ import javax.annotation.Nullable; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.LocalizedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.LocalizedString; import org.opentripplanner.model.plan.walkstep.RelativeDirection; import org.opentripplanner.model.plan.walkstep.WalkStep; import org.opentripplanner.model.plan.walkstep.WalkStepBuilder; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/StreetPathToLegsMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/StreetPathToLegsMapper.java index eed4e0a44b8..cc6e00a7a74 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/StreetPathToLegsMapper.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/StreetPathToLegsMapper.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.ext.flex.FlexibleTransitLeg; import org.opentripplanner.ext.flex.edgetype.FlexTripEdge; import org.opentripplanner.framework.application.OTPFeature; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/TripPlanMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/TripPlanMapper.java index ce0827fa3d2..558587c3f64 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/TripPlanMapper.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/TripPlanMapper.java @@ -2,7 +2,7 @@ import java.time.Instant; import java.util.List; -import org.opentripplanner.core.model.i18n.LocalizedString; +import org.opentripplanner.core.domain.model.i18n.LocalizedString; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java index 3e221b09c1d..e188ec2bef2 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java @@ -9,7 +9,7 @@ import java.util.concurrent.CompletionException; import java.util.stream.IntStream; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.CarpoolingService; import org.opentripplanner.ext.dataoverlay.configuration.DataOverlayParameterBindings; import org.opentripplanner.ext.flex.FlexParameters; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/startonboardaccess/TripAndServiceDateResolver.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/startonboardaccess/TripAndServiceDateResolver.java index 17be03f1d80..a9e06e1ad5b 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/startonboardaccess/TripAndServiceDateResolver.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/startonboardaccess/TripAndServiceDateResolver.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.algorithm.raptoradapter.router.startonboardaccess; import java.time.LocalDate; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.TripOnDateReference; import org.opentripplanner.routing.api.request.TripOnDateReferenceWithTripAndDate; import org.opentripplanner.routing.api.request.TripOnDateReferenceWithTripOnServiceDateId; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/startonboardaccess/TripLocationResolver.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/startonboardaccess/TripLocationResolver.java index 5b960c72a10..e7085e653a1 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/startonboardaccess/TripLocationResolver.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/startonboardaccess/TripLocationResolver.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.api.response.InputField; import org.opentripplanner.routing.api.response.RoutingError; import org.opentripplanner.routing.api.response.RoutingErrorCode; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTripSchedule.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTripSchedule.java index 63fbd18a309..93ac3bb4854 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTripSchedule.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTripSchedule.java @@ -1,6 +1,6 @@ package org.opentripplanner.routing.algorithm.raptoradapter.transit.cost; -import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; import org.opentripplanner.raptor.spi.RaptorTripSchedule; public interface DefaultTripSchedule extends RaptorTripSchedule { diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostLinearFunction.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostLinearFunction.java index 942580e2c40..4ad7d30dd43 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostLinearFunction.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostLinearFunction.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.algorithm.raptoradapter.transit.cost; import java.util.Objects; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.raptor.spi.RaptorCostConverter; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.routing.api.request.framework.LinearFunctionSerialization; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculator.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculator.java index ad0d597929b..ecf9ba3bc3c 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculator.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculator.java @@ -1,6 +1,6 @@ package org.opentripplanner.routing.algorithm.raptoradapter.transit.cost; -import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; import org.opentripplanner.raptor.spi.RaptorCostCalculator; import org.opentripplanner.raptor.spi.RaptorCostConverter; import org.opentripplanner.raptor.spi.RaptorTransferConstraint; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyBoardOrAlightEvent.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyBoardOrAlightEvent.java index 9473438c82d..fd804d6bd56 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyBoardOrAlightEvent.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyBoardOrAlightEvent.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.algorithm.raptoradapter.transit.frequency; import java.time.LocalDate; -import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; import org.opentripplanner.raptor.spi.RaptorBoardOrAlightEvent; import org.opentripplanner.raptor.spi.RaptorTransferConstraint; import org.opentripplanner.raptor.spi.RaptorTripPattern; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/GeneralizedCostParametersMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/GeneralizedCostParametersMapper.java index 68746fdb4ee..4f558b24f3e 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/GeneralizedCostParametersMapper.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/GeneralizedCostParametersMapper.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.Set; import java.util.function.Function; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.raptor.spi.RaptorTripPattern; import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.GeneralizedCostParameters; import org.opentripplanner.routing.api.request.RouteRequest; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/LookupStopIndexCallback.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/LookupStopIndexCallback.java index 829a2fa9a94..8daf635d884 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/LookupStopIndexCallback.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/LookupStopIndexCallback.java @@ -2,7 +2,7 @@ import java.util.Collection; import java.util.stream.IntStream; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * The raptor mapper does not have access to the transit layer, so it needs help to diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java index dbc35bb3e74..e883ba26850 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.raptor.api.model.GeneralizedCostRelaxFunction; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TimetableUpdateMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TimetableUpdateMapper.java index 10e7d3fd72e..f1ca66219b0 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TimetableUpdateMapper.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TimetableUpdateMapper.java @@ -12,7 +12,7 @@ import java.util.SortedSet; import java.util.function.Function; import java.util.stream.Collectors; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitData; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripPatternForDate; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilter.java index 5047da906cf..f6d7a6c5bb6 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilter.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilter.java @@ -4,8 +4,8 @@ import java.util.Set; import java.util.function.Predicate; import javax.annotation.Nullable; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.PickDrop; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.request.filter.TransitFilter; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilterBuilder.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilterBuilder.java index 72c8486e3af..9a34fa16ccc 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilterBuilder.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilterBuilder.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.request.filter.AllowAllTransitFilter; import org.opentripplanner.routing.api.request.request.filter.TransitFilter; 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 423cf6fe0ec..45792bbcac4 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,7 @@ import java.util.Arrays; import java.util.BitSet; -import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; import org.opentripplanner.raptor.spi.IntIterator; import org.opentripplanner.raptor.spi.IntIterators; import org.opentripplanner.raptor.spi.RaptorRoute; 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 52449a25ea9..feded512a4b 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 @@ -1,7 +1,7 @@ package org.opentripplanner.routing.algorithm.raptoradapter.transit.request; import java.time.LocalDate; -import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; import org.opentripplanner.raptor.spi.IntIterator; import org.opentripplanner.raptor.spi.RaptorTripPattern; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripPatternForDate; diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/TripLocation.java b/application/src/main/java/org/opentripplanner/routing/api/request/TripLocation.java index 4056fea9f5a..fa28f4219ac 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/TripLocation.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/TripLocation.java @@ -3,7 +3,7 @@ import java.time.Instant; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * Identifies a position on-board a specific transit trip. Used to start a trip planning search diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/TripOnDateReference.java b/application/src/main/java/org/opentripplanner/routing/api/request/TripOnDateReference.java index ad2255a8fce..9643d2a0794 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/TripOnDateReference.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/TripOnDateReference.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.api.request; import java.time.LocalDate; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; public sealed interface TripOnDateReference permits TripOnDateReferenceWithTripOnServiceDateId, TripOnDateReferenceWithTripAndDate diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/TripOnDateReferenceWithTripAndDate.java b/application/src/main/java/org/opentripplanner/routing/api/request/TripOnDateReferenceWithTripAndDate.java index 9fc504d2afc..7a79093c35a 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/TripOnDateReferenceWithTripAndDate.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/TripOnDateReferenceWithTripAndDate.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.api.request; import java.time.LocalDate; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * A reference to a trip on date with an id representing the trip and a date identifying on which diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/TripOnDateReferenceWithTripOnServiceDateId.java b/application/src/main/java/org/opentripplanner/routing/api/request/TripOnDateReferenceWithTripOnServiceDateId.java index 351eb20c7a1..c774afaec61 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/TripOnDateReferenceWithTripOnServiceDateId.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/TripOnDateReferenceWithTripOnServiceDateId.java @@ -1,6 +1,6 @@ package org.opentripplanner.routing.api.request; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * A reference to a trip on date with a single id referencing the specific trip on service date. diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/framework/CostLinearFunction.java b/application/src/main/java/org/opentripplanner/routing/api/request/framework/CostLinearFunction.java index 3d653405064..68672a44677 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/framework/CostLinearFunction.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/framework/CostLinearFunction.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.api.request.framework; import java.time.Duration; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; /** * A linear function to calculate a new cost based on a cost value input. 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 44f37902007..312df233eb6 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,7 +7,7 @@ import java.util.function.BiFunction; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.utils.lang.IntUtils; import org.opentripplanner.utils.lang.StringUtils; import org.opentripplanner.utils.lang.Units; diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenalty.java b/application/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenalty.java index cc416f5ac0b..4f1be0e8e58 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenalty.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenalty.java @@ -2,7 +2,7 @@ import java.time.Duration; import java.util.Objects; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.utils.lang.Units; 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 5ad89994097..52114440f29 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 @@ -2,7 +2,7 @@ import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.utils.tostring.ToStringBuilder; /** 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 6891c4dd2ac..138ad26a090 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 @@ -8,7 +8,7 @@ import java.io.Serializable; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.street.model.VehicleRoutingOptimizeType; import org.opentripplanner.utils.lang.Units; import org.opentripplanner.utils.tostring.ToStringBuilder; 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 142fe1a217b..7a780e47f75 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 @@ -6,7 +6,7 @@ import java.time.Duration; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.utils.lang.DoubleUtils; import org.opentripplanner.utils.lang.Units; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/DirectTransitPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/DirectTransitPreferences.java index 8b36f200225..a76125727c4 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/DirectTransitPreferences.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/DirectTransitPreferences.java @@ -4,7 +4,7 @@ import java.util.Objects; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.utils.tostring.ToStringBuilder; 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 e31641713bf..844597f2c0e 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 @@ -4,7 +4,7 @@ import java.time.Duration; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.utils.lang.Units; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterDebugProfile.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterDebugProfile.java index 53d15dfe32d..6f733e59bb4 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterDebugProfile.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterDebugProfile.java @@ -1,6 +1,6 @@ package org.opentripplanner.routing.api.request.preference; -import org.opentripplanner.core.model.doc.DocumentedEnum; +import org.opentripplanner.core.domain.model.doc.DocumentedEnum; /** * This enum controls the number of itineraries returned with debug information - itineraries 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 08ed0ec99f2..667348b38c7 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 @@ -7,7 +7,7 @@ import java.time.Duration; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.routing.algorithm.transferoptimization.api.TransferOptimizationParameters; import org.opentripplanner.utils.lang.Units; import org.opentripplanner.utils.time.DurationUtils; 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 2c78a737ded..84e6c2f1ee8 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,7 +7,7 @@ import java.util.Objects; import java.util.Optional; import java.util.function.Consumer; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.routing.api.request.framework.DurationForEnum; import org.opentripplanner.transit.model.basic.TransitMode; 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 a4dba756468..527914d622f 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 @@ -6,7 +6,7 @@ import java.util.Objects; import java.util.Set; import java.util.function.Consumer; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.routing.api.request.preference.filter.VehicleParkingFilter; import org.opentripplanner.routing.api.request.preference.filter.VehicleParkingSelect; import org.opentripplanner.utils.tostring.ToStringBuilder; 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 c4e581d5ac8..33b17597470 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 @@ -5,7 +5,7 @@ import java.util.Objects; import java.util.Set; import java.util.function.Consumer; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.street.search.request.RentalRequest; import org.opentripplanner.utils.lang.DoubleUtils; import org.opentripplanner.utils.lang.Units; 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 da994c8b7b6..224d3c26d7d 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 @@ -4,7 +4,7 @@ import java.time.Duration; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.utils.lang.Units; import org.opentripplanner.utils.tostring.ToStringBuilder; 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 cd609662d9d..7ead768c115 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 @@ -6,7 +6,7 @@ import java.io.Serializable; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.utils.lang.Units; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/request/TransitRequest.java b/application/src/main/java/org/opentripplanner/routing/api/request/request/TransitRequest.java index bfb7994e651..6dda2c7f0b0 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/request/TransitRequest.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/request/TransitRequest.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.List; import java.util.Objects; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.modes.ExcludeAllTransitFilter; import org.opentripplanner.routing.api.request.DebugRaptor; import org.opentripplanner.routing.api.request.request.filter.AllowAllTransitFilter; diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/request/TransitRequestBuilder.java b/application/src/main/java/org/opentripplanner/routing/api/request/request/TransitRequestBuilder.java index 458d580662a..9330fba3f64 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/request/TransitRequestBuilder.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/request/TransitRequestBuilder.java @@ -2,7 +2,7 @@ import java.util.List; import java.util.function.Consumer; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.modes.ExcludeAllTransitFilter; import org.opentripplanner.routing.api.request.DebugRaptor; import org.opentripplanner.routing.api.request.DebugRaptorBuilder; 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 8dc4a184b2e..a392a9800d8 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,7 +4,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.modes.AllowTransitModeFilter; import org.opentripplanner.transit.model.basic.MainAndSubMode; import org.opentripplanner.transit.model.basic.NarrowedTransitMode; 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 907ea35e726..553d1fe696c 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,7 +5,7 @@ import java.util.Comparator; import java.util.List; import java.util.Objects; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/via/AbstractViaLocation.java b/application/src/main/java/org/opentripplanner/routing/api/request/via/AbstractViaLocation.java index 906a9a99870..31ed72abb84 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/via/AbstractViaLocation.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/via/AbstractViaLocation.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; public abstract class AbstractViaLocation implements ViaLocation { 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 ca05867b81b..73c881e5a81 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,7 +2,7 @@ import java.util.Collection; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.utils.tostring.ToStringBuilder; /** diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/via/ViaLocation.java b/application/src/main/java/org/opentripplanner/routing/api/request/via/ViaLocation.java index 0328196f04e..ce4d74b8114 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/via/ViaLocation.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/via/ViaLocation.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; /** 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 f82bc183d36..aaff89d65ca 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,7 +5,7 @@ import java.util.Objects; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.utils.time.DurationUtils; diff --git a/application/src/main/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImpl.java b/application/src/main/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImpl.java index 7674874a921..20ab69216f0 100644 --- a/application/src/main/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImpl.java +++ b/application/src/main/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImpl.java @@ -7,7 +7,7 @@ import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; import java.util.stream.Collectors; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.alertpatch.StopCondition; import org.opentripplanner.routing.alertpatch.TransitAlert; import org.opentripplanner.routing.services.TransitAlertService; diff --git a/application/src/main/java/org/opentripplanner/routing/impl/TransitAlertServiceImpl.java b/application/src/main/java/org/opentripplanner/routing/impl/TransitAlertServiceImpl.java index 1a92972b052..8e87cd9c860 100644 --- a/application/src/main/java/org/opentripplanner/routing/impl/TransitAlertServiceImpl.java +++ b/application/src/main/java/org/opentripplanner/routing/impl/TransitAlertServiceImpl.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.alertpatch.EntityKey; import org.opentripplanner.routing.alertpatch.EntitySelector; import org.opentripplanner.routing.alertpatch.StopCondition; diff --git a/application/src/main/java/org/opentripplanner/routing/linking/LinkingContextFactory.java b/application/src/main/java/org/opentripplanner/routing/linking/LinkingContextFactory.java index 5cdecc02330..7c020ebd1ab 100644 --- a/application/src/main/java/org/opentripplanner/routing/linking/LinkingContextFactory.java +++ b/application/src/main/java/org/opentripplanner/routing/linking/LinkingContextFactory.java @@ -17,7 +17,7 @@ import javax.annotation.Nullable; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.GeometryFactory; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.routing.api.response.InputField; import org.opentripplanner.routing.api.response.RoutingError; diff --git a/application/src/main/java/org/opentripplanner/routing/linking/internal/VertexCreationService.java b/application/src/main/java/org/opentripplanner/routing/linking/internal/VertexCreationService.java index 08216800d9f..944d903eb7b 100644 --- a/application/src/main/java/org/opentripplanner/routing/linking/internal/VertexCreationService.java +++ b/application/src/main/java/org/opentripplanner/routing/linking/internal/VertexCreationService.java @@ -3,9 +3,9 @@ import java.util.List; import javax.annotation.Nullable; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.LocalizedString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.LocalizedString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.street.linking.LinkingDirection; import org.opentripplanner.street.linking.TemporaryVerticesContainer; import org.opentripplanner.street.linking.VertexLinker; diff --git a/application/src/main/java/org/opentripplanner/routing/refetch/RefetchItineraryService.java b/application/src/main/java/org/opentripplanner/routing/refetch/RefetchItineraryService.java index 5e0d4379b83..9253933c0bc 100644 --- a/application/src/main/java/org/opentripplanner/routing/refetch/RefetchItineraryService.java +++ b/application/src/main/java/org/opentripplanner/routing/refetch/RefetchItineraryService.java @@ -9,7 +9,7 @@ import java.util.Set; import javax.annotation.Nullable; import org.opentripplanner.astar.strategy.DurationSkipEdgeStrategy; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.framework.application.OTPRequestTimeoutException; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.model.plan.Itinerary; diff --git a/application/src/main/java/org/opentripplanner/routing/services/TransitAlertService.java b/application/src/main/java/org/opentripplanner/routing/services/TransitAlertService.java index eb361cab4d5..58e7cc78b60 100644 --- a/application/src/main/java/org/opentripplanner/routing/services/TransitAlertService.java +++ b/application/src/main/java/org/opentripplanner/routing/services/TransitAlertService.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.List; import java.util.Set; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.alertpatch.StopCondition; import org.opentripplanner.routing.alertpatch.TransitAlert; import org.opentripplanner.transit.api.request.TransitAlertRequest; diff --git a/application/src/main/java/org/opentripplanner/service/osminfo/model/Platform.java b/application/src/main/java/org/opentripplanner/service/osminfo/model/Platform.java index 545c86283c4..173bad79eb4 100644 --- a/application/src/main/java/org/opentripplanner/service/osminfo/model/Platform.java +++ b/application/src/main/java/org/opentripplanner/service/osminfo/model/Platform.java @@ -2,6 +2,6 @@ import java.util.Set; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; public record Platform(I18NString name, Geometry geometry, Set references) {} diff --git a/application/src/main/java/org/opentripplanner/service/realtimevehicles/model/RealtimeVehicle.java b/application/src/main/java/org/opentripplanner/service/realtimevehicles/model/RealtimeVehicle.java index 9937aa4de24..b297356a0d7 100644 --- a/application/src/main/java/org/opentripplanner/service/realtimevehicles/model/RealtimeVehicle.java +++ b/application/src/main/java/org/opentripplanner/service/realtimevehicles/model/RealtimeVehicle.java @@ -2,7 +2,7 @@ import java.time.Instant; import java.util.Optional; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.OccupancyStatus; diff --git a/application/src/main/java/org/opentripplanner/service/realtimevehicles/model/RealtimeVehicleBuilder.java b/application/src/main/java/org/opentripplanner/service/realtimevehicles/model/RealtimeVehicleBuilder.java index 403e6fee896..d065e857607 100644 --- a/application/src/main/java/org/opentripplanner/service/realtimevehicles/model/RealtimeVehicleBuilder.java +++ b/application/src/main/java/org/opentripplanner/service/realtimevehicles/model/RealtimeVehicleBuilder.java @@ -1,7 +1,7 @@ package org.opentripplanner.service.realtimevehicles.model; import java.time.Instant; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.realtimevehicles.model.RealtimeVehicle.StopStatus; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.site.StopLocation; 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 4cbc3030b9a..579dc451fe5 100644 --- a/application/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java +++ b/application/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java @@ -19,8 +19,8 @@ import java.util.Set; import java.util.regex.Pattern; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.LocalDateRange; import org.opentripplanner.datastore.api.OtpDataStoreConfig; import org.opentripplanner.ext.dataoverlay.configuration.DataOverlayConfig; import org.opentripplanner.ext.datastore.gs.config.GsConfig; diff --git a/application/src/main/java/org/opentripplanner/standalone/config/configure/DeduplicatorServiceModule.java b/application/src/main/java/org/opentripplanner/standalone/config/configure/DeduplicatorServiceModule.java index 81601657437..0643a9c6539 100644 --- a/application/src/main/java/org/opentripplanner/standalone/config/configure/DeduplicatorServiceModule.java +++ b/application/src/main/java/org/opentripplanner/standalone/config/configure/DeduplicatorServiceModule.java @@ -3,7 +3,7 @@ import dagger.Module; import dagger.Provides; import jakarta.inject.Singleton; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; import org.opentripplanner.transit.model.framework.Deduplicator; @Module diff --git a/application/src/main/java/org/opentripplanner/standalone/config/configure/LoadConfigModule.java b/application/src/main/java/org/opentripplanner/standalone/config/configure/LoadConfigModule.java index bc75a14d8d3..b938132c35c 100644 --- a/application/src/main/java/org/opentripplanner/standalone/config/configure/LoadConfigModule.java +++ b/application/src/main/java/org/opentripplanner/standalone/config/configure/LoadConfigModule.java @@ -4,8 +4,8 @@ import dagger.Provides; import jakarta.inject.Singleton; import java.io.File; -import org.opentripplanner.core.framework.di.TransitServicePeriod; -import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.domain.framework.di.TransitServicePeriod; +import org.opentripplanner.core.domain.model.time.LocalDateRange; import org.opentripplanner.datastore.api.OtpBaseDirectory; import org.opentripplanner.datastore.api.OtpDataStoreConfig; import org.opentripplanner.standalone.config.BuildConfig; 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 5c089fb8220..ebd3e659bad 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 @@ -2,7 +2,7 @@ import java.util.Arrays; import java.util.Optional; -import org.opentripplanner.core.model.doc.DocumentedEnum; +import org.opentripplanner.core.domain.model.doc.DocumentedEnum; import org.opentripplanner.utils.lang.StringUtils; /** 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 bd0e4a787d0..3f80d8043b6 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,7 +36,7 @@ import java.util.Set; import java.util.function.Function; import java.util.regex.Pattern; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.application.OtpAppException; import org.opentripplanner.framework.model.Gram; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; 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 97066e76a7f..7960f449040 100644 --- a/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java +++ b/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java @@ -2,7 +2,7 @@ import jakarta.ws.rs.core.Application; import javax.annotation.Nullable; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; import org.opentripplanner.datastore.api.DataSource; import org.opentripplanner.ext.carpooling.CarpoolingRepository; import org.opentripplanner.ext.carpooling.routing.CarpoolTripVertexResolver; diff --git a/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java b/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java index e370df5b514..75e3ac5d063 100644 --- a/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java +++ b/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java @@ -9,7 +9,7 @@ import org.opentripplanner.apis.gtfs.configure.GtfsSchemaModule; import org.opentripplanner.apis.transmodel.configure.TransmodelSchema; import org.opentripplanner.apis.transmodel.configure.TransmodelSchemaModule; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; import org.opentripplanner.ext.carpooling.CarpoolingRepository; import org.opentripplanner.ext.carpooling.CarpoolingService; import org.opentripplanner.ext.carpooling.configure.CarpoolingModule; diff --git a/application/src/main/java/org/opentripplanner/streetadapter/VertexFactory.java b/application/src/main/java/org/opentripplanner/streetadapter/VertexFactory.java index d19e72e73e3..62ddd071b4d 100644 --- a/application/src/main/java/org/opentripplanner/streetadapter/VertexFactory.java +++ b/application/src/main/java/org/opentripplanner/streetadapter/VertexFactory.java @@ -3,8 +3,8 @@ import java.util.Set; import javax.annotation.Nullable; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.osm.model.OsmNode; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehicleparking.model.VehicleParkingEntrance; diff --git a/application/src/main/java/org/opentripplanner/transfer/constrained/model/ConstrainedTransfer.java b/application/src/main/java/org/opentripplanner/transfer/constrained/model/ConstrainedTransfer.java index 717f1143659..44f0068d5aa 100644 --- a/application/src/main/java/org/opentripplanner/transfer/constrained/model/ConstrainedTransfer.java +++ b/application/src/main/java/org/opentripplanner/transfer/constrained/model/ConstrainedTransfer.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.raptor.spi.RaptorConstrainedTransfer; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/main/java/org/opentripplanner/transit/EntranceResolver.java b/application/src/main/java/org/opentripplanner/transit/EntranceResolver.java index 76e0695cd22..421592a9cf6 100644 --- a/application/src/main/java/org/opentripplanner/transit/EntranceResolver.java +++ b/application/src/main/java/org/opentripplanner/transit/EntranceResolver.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.site.Entrance; @FunctionalInterface diff --git a/application/src/main/java/org/opentripplanner/transit/SiteResolver.java b/application/src/main/java/org/opentripplanner/transit/SiteResolver.java index 68e64765183..052af627c15 100644 --- a/application/src/main/java/org/opentripplanner/transit/SiteResolver.java +++ b/application/src/main/java/org/opentripplanner/transit/SiteResolver.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.site.Entrance; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; diff --git a/application/src/main/java/org/opentripplanner/transit/StopResolver.java b/application/src/main/java/org/opentripplanner/transit/StopResolver.java index 97cef33aa6a..e27832986aa 100644 --- a/application/src/main/java/org/opentripplanner/transit/StopResolver.java +++ b/application/src/main/java/org/opentripplanner/transit/StopResolver.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.site.RegularStop; /** diff --git a/application/src/main/java/org/opentripplanner/transit/api/model/FilterValues.java b/application/src/main/java/org/opentripplanner/transit/api/model/FilterValues.java index a2fba3b95ab..6107ff463e8 100644 --- a/application/src/main/java/org/opentripplanner/transit/api/model/FilterValues.java +++ b/application/src/main/java/org/opentripplanner/transit/api/model/FilterValues.java @@ -4,7 +4,7 @@ import java.util.NoSuchElementException; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.service.TransitService; import org.opentripplanner.utils.tostring.ToStringBuilder; 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 f635ffa5271..79b20148e45 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.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.LocalDateRange; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.transit.api.model.FilterValues; import org.opentripplanner.transit.model.basic.MainAndSubMode; import org.opentripplanner.transit.model.basic.TransitMode; diff --git a/application/src/main/java/org/opentripplanner/transit/api/request/TripOnServiceDateRequestBuilder.java b/application/src/main/java/org/opentripplanner/transit/api/request/TripOnServiceDateRequestBuilder.java index 71c5cd69448..072feb9b797 100644 --- a/application/src/main/java/org/opentripplanner/transit/api/request/TripOnServiceDateRequestBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/api/request/TripOnServiceDateRequestBuilder.java @@ -2,9 +2,9 @@ import java.time.LocalDate; import java.util.List; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.LocalDateRange; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.transit.api.model.FilterValues; import org.opentripplanner.transit.model.filter.selector.FilterRequest; import org.opentripplanner.transit.model.filter.transit.TripOnServiceDateSelectRequest; diff --git a/application/src/main/java/org/opentripplanner/transit/api/request/TripRequest.java b/application/src/main/java/org/opentripplanner/transit/api/request/TripRequest.java index 5cc3ec2ed8a..0bd1c2a06d8 100644 --- a/application/src/main/java/org/opentripplanner/transit/api/request/TripRequest.java +++ b/application/src/main/java/org/opentripplanner/transit/api/request/TripRequest.java @@ -2,7 +2,7 @@ import java.time.LocalDate; import java.util.Objects; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.api.model.FilterValues; import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/main/java/org/opentripplanner/transit/api/request/TripRequestBuilder.java b/application/src/main/java/org/opentripplanner/transit/api/request/TripRequestBuilder.java index aee24410d90..0d9978ed4f0 100644 --- a/application/src/main/java/org/opentripplanner/transit/api/request/TripRequestBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/api/request/TripRequestBuilder.java @@ -3,7 +3,7 @@ import java.time.LocalDate; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.api.model.FilterValues; public class TripRequestBuilder { diff --git a/application/src/main/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequest.java b/application/src/main/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequest.java index a1b168ac098..8074efb165b 100644 --- a/application/src/main/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequest.java +++ b/application/src/main/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequest.java @@ -8,9 +8,9 @@ import java.util.Objects; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.LocalDateRange; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.transit.api.model.FilterValues; import org.opentripplanner.transit.model.basic.TransitMode; diff --git a/application/src/main/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequestBuilder.java b/application/src/main/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequestBuilder.java index 5fbf2dabdc8..eb6e02cf6b8 100644 --- a/application/src/main/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequestBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequestBuilder.java @@ -6,9 +6,9 @@ import java.util.Comparator; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.LocalDateRange; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.transit.api.model.FilterValues; import org.opentripplanner.transit.model.basic.TransitMode; diff --git a/application/src/main/java/org/opentripplanner/transit/model/basic/LocalizedMoney.java b/application/src/main/java/org/opentripplanner/transit/model/basic/LocalizedMoney.java index 284a9028265..8a00b73f652 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/basic/LocalizedMoney.java +++ b/application/src/main/java/org/opentripplanner/transit/model/basic/LocalizedMoney.java @@ -1,7 +1,7 @@ package org.opentripplanner.transit.model.basic; import java.util.Locale; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; public record LocalizedMoney(Money money) implements I18NString { @Override diff --git a/application/src/main/java/org/opentripplanner/transit/model/basic/Notice.java b/application/src/main/java/org/opentripplanner/transit/model/basic/Notice.java index de7514b424d..62cea7a4b7b 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/basic/Notice.java +++ b/application/src/main/java/org/opentripplanner/transit/model/basic/Notice.java @@ -1,7 +1,7 @@ package org.opentripplanner.transit.model.basic; import java.util.Objects; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; /** diff --git a/application/src/main/java/org/opentripplanner/transit/model/basic/NoticeBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/basic/NoticeBuilder.java index cecedf987ad..c3a2d696599 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/basic/NoticeBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/basic/NoticeBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.basic; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; public class NoticeBuilder extends AbstractEntityBuilder { diff --git a/application/src/main/java/org/opentripplanner/transit/model/basic/TransitMode.java b/application/src/main/java/org/opentripplanner/transit/model/basic/TransitMode.java index 5e5ee753aa0..1819662889e 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/basic/TransitMode.java +++ b/application/src/main/java/org/opentripplanner/transit/model/basic/TransitMode.java @@ -2,7 +2,7 @@ import java.util.EnumSet; import java.util.Set; -import org.opentripplanner.core.model.doc.DocumentedEnum; +import org.opentripplanner.core.domain.model.doc.DocumentedEnum; /** * Equivalent to GTFS route_type or to NeTEx TransportMode. diff --git a/application/src/main/java/org/opentripplanner/transit/model/calendar/TripCalendars.java b/application/src/main/java/org/opentripplanner/transit/model/calendar/TripCalendars.java index 89cfa925a35..9e3a024dbd4 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/calendar/TripCalendars.java +++ b/application/src/main/java/org/opentripplanner/transit/model/calendar/TripCalendars.java @@ -14,7 +14,7 @@ import java.util.Set; import java.util.function.Consumer; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.calendar.CalendarServiceData; import org.opentripplanner.utils.time.ServiceDateUtils; import org.slf4j.Logger; diff --git a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TransitAlertMatcherFactory.java b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TransitAlertMatcherFactory.java index 5d717456a37..dd74d4c790a 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TransitAlertMatcherFactory.java +++ b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TransitAlertMatcherFactory.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.filter.transit; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.routing.alertpatch.AlertCause; import org.opentripplanner.routing.alertpatch.AlertEffect; import org.opentripplanner.routing.alertpatch.AlertSeverity; diff --git a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TransitAlertSelectRequest.java b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TransitAlertSelectRequest.java index ce7e7ad49fe..e5b3484bf14 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TransitAlertSelectRequest.java +++ b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TransitAlertSelectRequest.java @@ -2,7 +2,7 @@ import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.routing.alertpatch.AlertCause; import org.opentripplanner.routing.alertpatch.AlertEffect; import org.opentripplanner.routing.alertpatch.AlertSeverity; diff --git a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripMatcherFactory.java b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripMatcherFactory.java index 84237367dce..2f0bf3d7b92 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripMatcherFactory.java +++ b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripMatcherFactory.java @@ -3,7 +3,7 @@ import java.time.LocalDate; import java.util.Set; import java.util.function.Function; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.api.request.TripRequest; import org.opentripplanner.transit.model.filter.expr.ContainsMatcher; import org.opentripplanner.transit.model.filter.expr.EqualityMatcher; diff --git a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactory.java b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactory.java index ed8be4e5bde..2b38a5cc55b 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactory.java +++ b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactory.java @@ -4,9 +4,9 @@ import java.util.Collection; import java.util.function.BiFunction; import java.util.function.Function; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.LocalDateRange; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.model.modes.AllowTransitModeFilter; import org.opentripplanner.transit.api.request.TripOnServiceDateRequest; import org.opentripplanner.transit.model.basic.NarrowedTransitMode; diff --git a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateSelectRequest.java b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateSelectRequest.java index 28f53285bb0..26cb264740d 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateSelectRequest.java +++ b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateSelectRequest.java @@ -2,9 +2,9 @@ import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.LocalDateRange; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.transit.api.model.FilterValues; import org.opentripplanner.transit.model.basic.MainAndSubMode; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripTimeOnDateMatcherFactory.java b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripTimeOnDateMatcherFactory.java index 79ea07dbecd..5234502d943 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripTimeOnDateMatcherFactory.java +++ b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripTimeOnDateMatcherFactory.java @@ -1,8 +1,8 @@ package org.opentripplanner.transit.model.filter.transit; import java.time.Instant; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.model.modes.AllowTransitModeFilter; import org.opentripplanner.transit.api.request.TripTimeOnDateRequest; diff --git a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripTimeOnDateSelectRequest.java b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripTimeOnDateSelectRequest.java index d11299b5d81..26cd01a4b14 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripTimeOnDateSelectRequest.java +++ b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripTimeOnDateSelectRequest.java @@ -2,7 +2,7 @@ import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.api.model.FilterValues; import org.opentripplanner.transit.model.basic.MainAndSubMode; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/main/java/org/opentripplanner/transit/model/framework/AbstractEntityBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/framework/AbstractEntityBuilder.java index 313d3742ce2..2011060ef1c 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/framework/AbstractEntityBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/framework/AbstractEntityBuilder.java @@ -1,7 +1,7 @@ package org.opentripplanner.transit.model.framework; import java.util.Objects; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; public abstract class AbstractEntityBuilder< E extends AbstractTransitEntity, diff --git a/application/src/main/java/org/opentripplanner/transit/model/framework/AbstractTransitEntity.java b/application/src/main/java/org/opentripplanner/transit/model/framework/AbstractTransitEntity.java index 41e5fadf4f4..a9dc1f55d91 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/framework/AbstractTransitEntity.java +++ b/application/src/main/java/org/opentripplanner/transit/model/framework/AbstractTransitEntity.java @@ -2,7 +2,7 @@ import java.io.Serializable; import java.util.Objects; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * All OTP Transit entities should extend this class. The purpose of the class is to enforce a 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 32a2a808938..82b7972d7dd 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 @@ -13,7 +13,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Nullable; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; import org.opentripplanner.utils.tostring.ToStringBuilder; /** diff --git a/application/src/main/java/org/opentripplanner/transit/model/framework/DefaultEntityById.java b/application/src/main/java/org/opentripplanner/transit/model/framework/DefaultEntityById.java index 71c94cac282..100bdc27e42 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/framework/DefaultEntityById.java +++ b/application/src/main/java/org/opentripplanner/transit/model/framework/DefaultEntityById.java @@ -9,7 +9,7 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * The purpose of this class is to provide a map from id to the corresponding entity. It is simply diff --git a/application/src/main/java/org/opentripplanner/transit/model/framework/EntityById.java b/application/src/main/java/org/opentripplanner/transit/model/framework/EntityById.java index 2301dbd7e9d..93453512da5 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/framework/EntityById.java +++ b/application/src/main/java/org/opentripplanner/transit/model/framework/EntityById.java @@ -4,7 +4,7 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Predicate; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * The purpose of this class is to provide a map from id to the corresponding entity. It is simply diff --git a/application/src/main/java/org/opentripplanner/transit/model/framework/EntityNotFoundException.java b/application/src/main/java/org/opentripplanner/transit/model/framework/EntityNotFoundException.java index d29a0dddb87..d1703c59531 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/framework/EntityNotFoundException.java +++ b/application/src/main/java/org/opentripplanner/transit/model/framework/EntityNotFoundException.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.framework; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * This exception is used by the main OTP business logic to signal that one of the diff --git a/application/src/main/java/org/opentripplanner/transit/model/framework/ImmutableEntityById.java b/application/src/main/java/org/opentripplanner/transit/model/framework/ImmutableEntityById.java index 07989b5a4cb..bda53f1374c 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/framework/ImmutableEntityById.java +++ b/application/src/main/java/org/opentripplanner/transit/model/framework/ImmutableEntityById.java @@ -2,7 +2,7 @@ import java.util.Collection; import java.util.Map; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * The purpose of this class is to provide a map from id to the corresponding entity. It is simply diff --git a/application/src/main/java/org/opentripplanner/transit/model/framework/TransitEntity.java b/application/src/main/java/org/opentripplanner/transit/model/framework/TransitEntity.java index cea01238720..3a0b29bded6 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/framework/TransitEntity.java +++ b/application/src/main/java/org/opentripplanner/transit/model/framework/TransitEntity.java @@ -1,7 +1,7 @@ package org.opentripplanner.transit.model.framework; import java.util.Comparator; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; public interface TransitEntity { FeedScopedId getId(); diff --git a/application/src/main/java/org/opentripplanner/transit/model/network/GroupOfRoutes.java b/application/src/main/java/org/opentripplanner/transit/model/network/GroupOfRoutes.java index 0a5b918f437..61fbb40fdad 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/network/GroupOfRoutes.java +++ b/application/src/main/java/org/opentripplanner/transit/model/network/GroupOfRoutes.java @@ -2,7 +2,7 @@ import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; import org.opentripplanner.transit.model.framework.LogInfo; diff --git a/application/src/main/java/org/opentripplanner/transit/model/network/GroupOfRoutesBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/network/GroupOfRoutesBuilder.java index f5bc66f42c5..8ef9950ff35 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/network/GroupOfRoutesBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/network/GroupOfRoutesBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.network; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; /** 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 9f3b0547461..8feb257b87f 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,8 +9,8 @@ import java.util.Locale; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.SubMode; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/main/java/org/opentripplanner/transit/model/network/RouteBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/network/RouteBuilder.java index b9f6ba3b654..1b7ddccf59f 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/network/RouteBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/network/RouteBuilder.java @@ -3,8 +3,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; import org.opentripplanner.transit.model.organization.Agency; 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 4dc6dc1e59b..5dba43f68fc 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 @@ -10,7 +10,7 @@ import java.util.Optional; import java.util.function.Predicate; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; import org.opentripplanner.transit.model.site.RegularStop; 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 fb27ac4dd80..0251f49dbad 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 @@ -10,9 +10,9 @@ import java.util.stream.Stream; import javax.annotation.Nullable; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.PickDrop; import org.opentripplanner.street.geometry.CompactLineStringSequence; import org.opentripplanner.transit.model.basic.SubMode; diff --git a/application/src/main/java/org/opentripplanner/transit/model/network/TripPatternBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/network/TripPatternBuilder.java index 5d5f9426aef..824aeef760b 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/network/TripPatternBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/network/TripPatternBuilder.java @@ -7,7 +7,7 @@ import javax.annotation.Nullable; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.CompactLineStringSequence; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.geometry.SphericalDistanceLibrary; diff --git a/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/EntityAdapter.java b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/EntityAdapter.java index 2f4f12dc5a7..34f9f7decd0 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/EntityAdapter.java +++ b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/EntityAdapter.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.network.grouppriority; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.TransitMode; /** diff --git a/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java index f73edd4df8f..02c38f4e2ed 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java +++ b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java @@ -15,7 +15,7 @@ import java.util.function.Predicate; import java.util.regex.Pattern; import java.util.stream.Collectors; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.request.filter.TransitGroupSelect; import org.opentripplanner.transit.model.basic.TransitMode; 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 b7d45bd5470..511dc642dac 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,7 +7,7 @@ import java.util.Collection; import java.util.List; import java.util.stream.Stream; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.routing.api.request.request.filter.TransitGroupSelect; import org.opentripplanner.transit.model.network.TripPattern; diff --git a/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripAdapter.java b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripAdapter.java index 4ea95894fd6..9ef49e6ca38 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripAdapter.java +++ b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripAdapter.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.network.grouppriority; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.timetable.Trip; diff --git a/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripPatternAdapter.java b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripPatternAdapter.java index 51d0d4af010..d3c20250135 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripPatternAdapter.java +++ b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripPatternAdapter.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.network.grouppriority; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.network.TripPattern; 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 65251b63497..0b6912a8b46 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 @@ -6,7 +6,7 @@ import java.time.ZoneId; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; import org.opentripplanner.transit.model.framework.LogInfo; diff --git a/application/src/main/java/org/opentripplanner/transit/model/organization/AgencyBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/organization/AgencyBuilder.java index 2ba70201604..ba4b44a81e9 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/organization/AgencyBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/organization/AgencyBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.organization; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; public class AgencyBuilder extends AbstractEntityBuilder { diff --git a/application/src/main/java/org/opentripplanner/transit/model/organization/Branding.java b/application/src/main/java/org/opentripplanner/transit/model/organization/Branding.java index 55205d7aa11..a511cb8ce47 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/organization/Branding.java +++ b/application/src/main/java/org/opentripplanner/transit/model/organization/Branding.java @@ -2,7 +2,7 @@ import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; import org.opentripplanner.transit.model.framework.LogInfo; diff --git a/application/src/main/java/org/opentripplanner/transit/model/organization/BrandingBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/organization/BrandingBuilder.java index b25120459b4..86edc41ab89 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/organization/BrandingBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/organization/BrandingBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.organization; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; public class BrandingBuilder extends AbstractEntityBuilder { 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 fb5dd27df6a..d002f1e9392 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 @@ -4,7 +4,7 @@ import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; import org.opentripplanner.transit.model.framework.LogInfo; diff --git a/application/src/main/java/org/opentripplanner/transit/model/organization/OperatorBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/organization/OperatorBuilder.java index 2581bd08af6..b3470f60c32 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/organization/OperatorBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/organization/OperatorBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.organization; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; public class OperatorBuilder extends AbstractEntityBuilder { diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java b/application/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java index dd1cd956d2f..cbbc0d62899 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java @@ -6,9 +6,9 @@ import java.util.function.IntSupplier; import javax.annotation.Nullable; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/AreaStopBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/AreaStopBuilder.java index 65ee210be0c..ae234792afe 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/AreaStopBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/AreaStopBuilder.java @@ -3,8 +3,8 @@ import java.util.Objects; import java.util.function.IntSupplier; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/BoardingArea.java b/application/src/main/java/org/opentripplanner/transit/model/site/BoardingArea.java index 939746275ec..f1602ebc898 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/BoardingArea.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/BoardingArea.java @@ -2,7 +2,7 @@ package org.opentripplanner.transit.model.site; import java.util.Objects; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; /** diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/BoardingAreaBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/BoardingAreaBuilder.java index dff9ff8eeaf..5aaf8657956 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/BoardingAreaBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/BoardingAreaBuilder.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.site; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; public final class BoardingAreaBuilder extends StationElementBuilder diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/Entrance.java b/application/src/main/java/org/opentripplanner/transit/model/site/Entrance.java index 76aba319962..fe965b6b59c 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/Entrance.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/Entrance.java @@ -1,7 +1,7 @@ package org.opentripplanner.transit.model.site; import java.util.Objects; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * A place where a station connects to the street network. Equivalent to GTFS stop location . diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/EntranceBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/EntranceBuilder.java index 3620022f4ce..e3e1d3b84cd 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/EntranceBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/EntranceBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.site; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * A place where a station connects to the street network. Equivalent to GTFS stop location . diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/FareZone.java b/application/src/main/java/org/opentripplanner/transit/model/site/FareZone.java index 9cd2e4a443d..4890b8330e5 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/FareZone.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/FareZone.java @@ -2,7 +2,7 @@ import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; /** diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/FareZoneBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/FareZoneBuilder.java index 428502e5213..0ddbc2c01d2 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/FareZoneBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/FareZoneBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.site; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; public class FareZoneBuilder extends AbstractEntityBuilder { diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/GroupOfStations.java b/application/src/main/java/org/opentripplanner/transit/model/site/GroupOfStations.java index 9bfb14583e8..4d997e48a72 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/GroupOfStations.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/GroupOfStations.java @@ -4,8 +4,8 @@ import java.util.Objects; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/GroupOfStationsBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/GroupOfStationsBuilder.java index bec295b3098..09f938eabc2 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/GroupOfStationsBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/GroupOfStationsBuilder.java @@ -2,8 +2,8 @@ import java.util.HashSet; import java.util.Set; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java b/application/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java index 0d3faeea966..becb904f557 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java @@ -7,8 +7,8 @@ import javax.annotation.Nullable; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.GeometryCollection; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java index 6287cdd3c1b..e58eec18f6f 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java @@ -5,8 +5,8 @@ import java.util.function.IntSupplier; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.GeometryCollection; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/MultiModalStation.java b/application/src/main/java/org/opentripplanner/transit/model/site/MultiModalStation.java index d882f9026e2..14bacada5d7 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/MultiModalStation.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/MultiModalStation.java @@ -2,8 +2,8 @@ import java.util.Collection; import java.util.Objects; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/MultiModalStationBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/MultiModalStationBuilder.java index 59648cf7c80..59aa7a9bc86 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/MultiModalStationBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/MultiModalStationBuilder.java @@ -2,8 +2,8 @@ import java.util.Collection; import java.util.Set; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/Pathway.java b/application/src/main/java/org/opentripplanner/transit/model/site/Pathway.java index f7b594ac0e4..9707e580317 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/Pathway.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/Pathway.java @@ -2,7 +2,7 @@ package org.opentripplanner.transit.model.site; import java.util.Objects; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; public final class Pathway extends AbstractTransitEntity { diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/PathwayBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/PathwayBuilder.java index 20433858432..d07ca9e6f09 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/PathwayBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/PathwayBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.site; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; @SuppressWarnings("UnusedReturnValue") diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/PathwayNode.java b/application/src/main/java/org/opentripplanner/transit/model/site/PathwayNode.java index bf266c4d5dd..b869f9410ad 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/PathwayNode.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/PathwayNode.java @@ -1,7 +1,7 @@ package org.opentripplanner.transit.model.site; import java.util.Objects; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * A place where a station connects to the street network. Equivalent to GTFS stop location . diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/PathwayNodeBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/PathwayNodeBuilder.java index fcdb9b4fb73..0f6e44b5b97 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/PathwayNodeBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/PathwayNodeBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.site; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * A place where a station connects to the street network. Equivalent to GTFS stop location . diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/RegularStop.java b/application/src/main/java/org/opentripplanner/transit/model/site/RegularStop.java index e9e47f99dab..d9c29e1d04a 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/RegularStop.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/RegularStop.java @@ -11,8 +11,8 @@ import java.util.function.IntSupplier; import javax.annotation.Nullable; import org.locationtech.jts.geom.Point; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.transit.model.basic.SubMode; import org.opentripplanner.transit.model.basic.TransitMode; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/RegularStopBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/RegularStopBuilder.java index bcbad0adeed..a83cf4a9724 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/RegularStopBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/RegularStopBuilder.java @@ -9,8 +9,8 @@ import java.util.Objects; import java.util.Set; import java.util.function.IntSupplier; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.TransitEntity; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/Station.java b/application/src/main/java/org/opentripplanner/transit/model/site/Station.java index 29d87844acd..4f8faae3b9e 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/Station.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/Station.java @@ -14,8 +14,8 @@ import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.GeometryCollection; import org.locationtech.jts.geom.Point; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; import org.opentripplanner.transit.model.framework.LogInfo; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/StationBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/StationBuilder.java index 99ca116132f..81fc1ba4d3c 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/StationBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/StationBuilder.java @@ -1,8 +1,8 @@ package org.opentripplanner.transit.model.site; import java.time.ZoneId; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/StationElement.java b/application/src/main/java/org/opentripplanner/transit/model/site/StationElement.java index 560d04fc9b6..d23b367a3d3 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/StationElement.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/StationElement.java @@ -3,9 +3,9 @@ import java.util.List; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/StationElementBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/StationElementBuilder.java index 95aa9351d0a..ae124e86be9 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/StationElementBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/StationElementBuilder.java @@ -1,9 +1,9 @@ package org.opentripplanner.transit.model.site; import javax.annotation.Nullable; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; 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 56e2d9216bf..7b6d662d32c 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 @@ -6,9 +6,9 @@ import java.util.Optional; import javax.annotation.Nullable; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.basic.SubMode; import org.opentripplanner.transit.model.basic.TransitMode; 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 cba442c68d1..7830c7e9148 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 @@ -1,8 +1,8 @@ package org.opentripplanner.transit.model.site; import java.util.Collection; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.LogInfo; import org.opentripplanner.utils.lang.ObjectUtils; diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/OccupancyStatus.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/OccupancyStatus.java index 4c1054b5560..bb35a0601f6 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/OccupancyStatus.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/OccupancyStatus.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.timetable; -import org.opentripplanner.core.model.doc.DocumentedEnum; +import org.opentripplanner.core.domain.model.doc.DocumentedEnum; /** * OccupancyStatus to be exposed in the API. The values are based on GTFS-RT diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java index ec89ea447f1..c97827b8f3c 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java @@ -9,9 +9,9 @@ import java.util.Optional; import java.util.OptionalInt; import javax.annotation.Nullable; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.network.ReplacedByRelation; import org.opentripplanner.transit.model.timetable.booking.BookingInfo; import org.opentripplanner.utils.lang.IntUtils; diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimesBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimesBuilder.java index 629e8108503..bc6661ebac4 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimesBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimesBuilder.java @@ -9,9 +9,9 @@ import java.util.List; import java.util.stream.IntStream; import javax.annotation.Nullable; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.DataValidationException; public class RealTimeTripTimesBuilder { 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 b4940384c85..bd04a1668bc 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 @@ -9,10 +9,10 @@ import java.util.OptionalInt; import java.util.function.Supplier; import javax.annotation.Nullable; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.error.OtpError; import org.opentripplanner.transit.model.framework.DataValidationException; import org.opentripplanner.transit.model.framework.Deduplicator; 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 0cd76274a15..4ae002621cd 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 @@ -3,8 +3,8 @@ import java.util.BitSet; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.transit.model.timetable.booking.BookingInfo; import org.opentripplanner.utils.time.TimeUtils; diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeKey.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeKey.java index c16c218105c..65c6b8b2c27 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeKey.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeKey.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.timetable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; /** diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeKeyBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeKeyBuilder.java index 480456d309a..917baa4c91f 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeKeyBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeKeyBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.timetable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; public class StopTimeKeyBuilder extends AbstractEntityBuilder { diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeToScheduledTripTimesMapper.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeToScheduledTripTimesMapper.java index a6d5e85555d..87495668ce5 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeToScheduledTripTimesMapper.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeToScheduledTripTimesMapper.java @@ -5,8 +5,8 @@ import java.util.Collection; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.model.StopTime; import org.opentripplanner.transit.model.timetable.booking.BookingInfo; diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/Timetable.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/Timetable.java index 6cdadc42aa2..995ca9ff90f 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/Timetable.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/Timetable.java @@ -10,7 +10,7 @@ import java.util.Optional; import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.network.TripPattern; /** diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/TimetableBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TimetableBuilder.java index f6dbb15405b..2fd824287f4 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/TimetableBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/TimetableBuilder.java @@ -7,7 +7,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.network.TripPattern; public class TimetableBuilder { 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 8dee9b675fb..4f592e9df69 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 @@ -7,9 +7,9 @@ import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.SubMode; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripBuilder.java index ae4cd8319e3..80ae464e634 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripBuilder.java @@ -1,8 +1,8 @@ package org.opentripplanner.transit.model.timetable; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; import org.opentripplanner.transit.model.network.BikeAccess; diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripIdAndServiceDate.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripIdAndServiceDate.java index a110ded2c45..28fd5d8ca3e 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripIdAndServiceDate.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripIdAndServiceDate.java @@ -1,7 +1,7 @@ package org.opentripplanner.transit.model.timetable; import java.time.LocalDate; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * Class to use as key in HashMap containing feed id, trip id and service date diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripOnServiceDate.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripOnServiceDate.java index 974f29e4e05..1c265afd5c0 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripOnServiceDate.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripOnServiceDate.java @@ -3,7 +3,7 @@ import java.time.LocalDate; import java.util.List; import java.util.Objects; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; /** diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripOnServiceDateBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripOnServiceDateBuilder.java index 705a6b1ab04..040bf66b608 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripOnServiceDateBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripOnServiceDateBuilder.java @@ -3,7 +3,7 @@ import java.time.LocalDate; import java.util.ArrayList; import java.util.List; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; public class TripOnServiceDateBuilder diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java index 87d03cbf400..ab836f7259c 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java @@ -11,10 +11,10 @@ import java.util.Optional; import java.util.OptionalInt; import javax.annotation.Nullable; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.model.StopTime; import org.opentripplanner.transit.model.framework.DataValidationException; import org.opentripplanner.transit.model.network.ReplacedByRelation; diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimesFactory.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimesFactory.java index 3949dd394d1..e90757c084b 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimesFactory.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimesFactory.java @@ -1,7 +1,7 @@ package org.opentripplanner.transit.model.timetable; import java.util.List; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; import org.opentripplanner.model.StopTime; /** diff --git a/application/src/main/java/org/opentripplanner/transit/repository/DefaultTimetableRepository.java b/application/src/main/java/org/opentripplanner/transit/repository/DefaultTimetableRepository.java index 2e935c008e2..18b1946511f 100644 --- a/application/src/main/java/org/opentripplanner/transit/repository/DefaultTimetableRepository.java +++ b/application/src/main/java/org/opentripplanner/transit/repository/DefaultTimetableRepository.java @@ -26,7 +26,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitData; import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.TimetableUpdateMapper; import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.TripPatternForDateMapper; diff --git a/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepository.java b/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepository.java index 0ffdb5b4e93..945de2e601f 100644 --- a/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepository.java +++ b/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepository.java @@ -2,7 +2,7 @@ import java.time.LocalDate; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.timetable.RealTimeTripUpdate; /** diff --git a/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepositorySnapshot.java b/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepositorySnapshot.java index 3a9b8a084d1..2d024cc1af3 100644 --- a/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepositorySnapshot.java +++ b/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepositorySnapshot.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitData; import org.opentripplanner.transit.model.calendar.TripCalendars; import org.opentripplanner.transit.model.network.Route; 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 c45c3d1b146..b51d38bc6df 100644 --- a/application/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java +++ b/application/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java @@ -22,8 +22,8 @@ import java.util.stream.Stream; import javax.annotation.Nullable; import org.locationtech.jts.geom.Envelope; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.ext.flex.FlexIndex; import org.opentripplanner.framework.application.OTPRequestTimeoutException; import org.opentripplanner.model.FeedInfo; diff --git a/application/src/main/java/org/opentripplanner/transit/service/PatternByServiceDatesFilter.java b/application/src/main/java/org/opentripplanner/transit/service/PatternByServiceDatesFilter.java index 20b6d79877b..e20dc301b9b 100644 --- a/application/src/main/java/org/opentripplanner/transit/service/PatternByServiceDatesFilter.java +++ b/application/src/main/java/org/opentripplanner/transit/service/PatternByServiceDatesFilter.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.Objects; import java.util.function.Function; -import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.time.LocalDateRange; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.Trip; 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 1c5cafb4a38..75ee4dc7701 100644 --- a/application/src/main/java/org/opentripplanner/transit/service/SiteRepository.java +++ b/application/src/main/java/org/opentripplanner/transit/service/SiteRepository.java @@ -9,7 +9,7 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.Nullable; import org.locationtech.jts.geom.Envelope; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.site.AreaStop; import org.opentripplanner.transit.model.site.Entrance; import org.opentripplanner.transit.model.site.GroupOfStations; diff --git a/application/src/main/java/org/opentripplanner/transit/service/SiteRepositoryBuilder.java b/application/src/main/java/org/opentripplanner/transit/service/SiteRepositoryBuilder.java index b59e1bd2c56..7a9785207a8 100644 --- a/application/src/main/java/org/opentripplanner/transit/service/SiteRepositoryBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/service/SiteRepositoryBuilder.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.DefaultEntityById; import org.opentripplanner.transit.model.framework.EntityById; import org.opentripplanner.transit.model.framework.ImmutableEntityById; diff --git a/application/src/main/java/org/opentripplanner/transit/service/TransitRepository.java b/application/src/main/java/org/opentripplanner/transit/service/TransitRepository.java index 3891907c828..055388eb4e5 100644 --- a/application/src/main/java/org/opentripplanner/transit/service/TransitRepository.java +++ b/application/src/main/java/org/opentripplanner/transit/service/TransitRepository.java @@ -25,7 +25,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.model.FeedInfo; import org.opentripplanner.model.calendar.CalendarServiceData; diff --git a/application/src/main/java/org/opentripplanner/transit/service/TransitRepositoryIndex.java b/application/src/main/java/org/opentripplanner/transit/service/TransitRepositoryIndex.java index 421c6c47816..15d0c5b9571 100644 --- a/application/src/main/java/org/opentripplanner/transit/service/TransitRepositoryIndex.java +++ b/application/src/main/java/org/opentripplanner/transit/service/TransitRepositoryIndex.java @@ -9,7 +9,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.FlexIndex; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.framework.application.OTPFeature; diff --git a/application/src/main/java/org/opentripplanner/transit/service/TransitService.java b/application/src/main/java/org/opentripplanner/transit/service/TransitService.java index 57ce10560ee..7391bfeeb9c 100644 --- a/application/src/main/java/org/opentripplanner/transit/service/TransitService.java +++ b/application/src/main/java/org/opentripplanner/transit/service/TransitService.java @@ -12,7 +12,7 @@ import java.util.Set; import javax.annotation.Nullable; import org.locationtech.jts.geom.Envelope; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.FlexIndex; import org.opentripplanner.model.FeedInfo; import org.opentripplanner.model.StopTimesInPattern; diff --git a/application/src/main/java/org/opentripplanner/transit/service/TransitServiceResolver.java b/application/src/main/java/org/opentripplanner/transit/service/TransitServiceResolver.java index af07707dd94..1a6451ec1a2 100644 --- a/application/src/main/java/org/opentripplanner/transit/service/TransitServiceResolver.java +++ b/application/src/main/java/org/opentripplanner/transit/service/TransitServiceResolver.java @@ -1,7 +1,7 @@ package org.opentripplanner.transit.service; import java.util.Objects; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.SiteResolver; import org.opentripplanner.transit.StopResolver; import org.opentripplanner.transit.model.site.Entrance; diff --git a/application/src/main/java/org/opentripplanner/updater/alert/gtfs/AlertsUpdateHandler.java b/application/src/main/java/org/opentripplanner/updater/alert/gtfs/AlertsUpdateHandler.java index a9bc42d37da..ed1ebede6e6 100644 --- a/application/src/main/java/org/opentripplanner/updater/alert/gtfs/AlertsUpdateHandler.java +++ b/application/src/main/java/org/opentripplanner/updater/alert/gtfs/AlertsUpdateHandler.java @@ -15,10 +15,10 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.TranslatedString; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.TranslatedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.gtfs.mapping.DirectionMapper; import org.opentripplanner.routing.alertpatch.AlertCalendar; diff --git a/application/src/main/java/org/opentripplanner/updater/alert/siri/SiriAlertsUpdateHandler.java b/application/src/main/java/org/opentripplanner/updater/alert/siri/SiriAlertsUpdateHandler.java index 9fa7da07d6a..3c0f0e810f9 100644 --- a/application/src/main/java/org/opentripplanner/updater/alert/siri/SiriAlertsUpdateHandler.java +++ b/application/src/main/java/org/opentripplanner/updater/alert/siri/SiriAlertsUpdateHandler.java @@ -9,11 +9,11 @@ import java.util.Map; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.i18n.TranslatedString; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.TranslatedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.routing.alertpatch.AlertCalendar; import org.opentripplanner.routing.alertpatch.AlertUrl; import org.opentripplanner.routing.alertpatch.EntitySelector; diff --git a/application/src/main/java/org/opentripplanner/updater/alert/siri/mapping/AffectsMapper.java b/application/src/main/java/org/opentripplanner/updater/alert/siri/mapping/AffectsMapper.java index 464970ef515..23c93742832 100644 --- a/application/src/main/java/org/opentripplanner/updater/alert/siri/mapping/AffectsMapper.java +++ b/application/src/main/java/org/opentripplanner/updater/alert/siri/mapping/AffectsMapper.java @@ -9,7 +9,7 @@ import java.util.Optional; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.alertpatch.EntitySelector; import org.opentripplanner.routing.alertpatch.StopCondition; import org.opentripplanner.transit.model.timetable.Direction; diff --git a/application/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java b/application/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java index 6eadb60cbbe..fa840e4a17e 100644 --- a/application/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java +++ b/application/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; import org.opentripplanner.ext.carpooling.CarpoolingRepository; import org.opentripplanner.ext.carpooling.routing.CarpoolTripVertexResolver; import org.opentripplanner.ext.carpooling.updater.SiriETCarpoolingUpdater; diff --git a/application/src/main/java/org/opentripplanner/updater/spi/UpdateError.java b/application/src/main/java/org/opentripplanner/updater/spi/UpdateError.java index 049c2d243a0..e046a376deb 100644 --- a/application/src/main/java/org/opentripplanner/updater/spi/UpdateError.java +++ b/application/src/main/java/org/opentripplanner/updater/spi/UpdateError.java @@ -1,7 +1,7 @@ package org.opentripplanner.updater.spi; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * Detailed information about a failure to apply a realtime update, for example for trips or vehicle diff --git a/application/src/main/java/org/opentripplanner/updater/spi/UpdateException.java b/application/src/main/java/org/opentripplanner/updater/spi/UpdateException.java index f7508c85a24..520ae41f3f7 100644 --- a/application/src/main/java/org/opentripplanner/updater/spi/UpdateException.java +++ b/application/src/main/java/org/opentripplanner/updater/spi/UpdateException.java @@ -1,7 +1,7 @@ package org.opentripplanner.updater.spi; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /// An exception for indicating various issues with realtime data. It can be thrown anywhere in the /// handling code for a realtime update and is caught by the UpdateAdapters. diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/CanceledTripHandler.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/CanceledTripHandler.java index ce9502749c5..b550b9c7f25 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/CanceledTripHandler.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/CanceledTripHandler.java @@ -3,7 +3,7 @@ import static org.opentripplanner.updater.spi.UpdateErrorType.NO_TRIP_FOR_CANCELLATION_FOUND; import static org.opentripplanner.updater.trip.UpdateIncrementality.FULL_DATASET; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.RealTimeTripUpdate; import org.opentripplanner.transit.model.timetable.Trip; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/DuplicatedTripHandler.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/DuplicatedTripHandler.java index e57f2d4ed8d..9ad8c4e3c4e 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/DuplicatedTripHandler.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/DuplicatedTripHandler.java @@ -4,8 +4,8 @@ import static org.opentripplanner.updater.spi.UpdateErrorType.OUTSIDE_SERVICE_PERIOD; import static org.opentripplanner.updater.spi.UpdateErrorType.TRIP_NOT_FOUND; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.timetable.RealTimeTripUpdate; import org.opentripplanner.transit.model.timetable.ScheduledTripTimes; import org.opentripplanner.transit.model.timetable.Trip; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/GtfsRealTimeTripUpdateAdapter.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/GtfsRealTimeTripUpdateAdapter.java index f89c67c56a6..889da0d1cd9 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/GtfsRealTimeTripUpdateAdapter.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/GtfsRealTimeTripUpdateAdapter.java @@ -2,7 +2,7 @@ import java.time.LocalDate; import java.util.function.Supplier; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; import org.opentripplanner.transit.repository.TimetableRepository; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.TransitRepository; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/GtfsRealtimeFuzzyTripMatcher.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/GtfsRealtimeFuzzyTripMatcher.java index 79405d536d0..de9516f03f8 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/GtfsRealtimeFuzzyTripMatcher.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/GtfsRealtimeFuzzyTripMatcher.java @@ -4,7 +4,7 @@ import gnu.trove.set.TIntSet; import java.text.ParseException; import java.time.LocalDate; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.gtfs.mapping.DirectionMapper; import org.opentripplanner.transit.model.network.Route; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/NewTripHandler.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/NewTripHandler.java index 7c6f1787c9c..1ea046d504c 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/NewTripHandler.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/NewTripHandler.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.network.StopPattern; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.RealTimeTripTimes; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/RouteFactory.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/RouteFactory.java index b4ec4797cfd..61ec5f71ee5 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/RouteFactory.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/RouteFactory.java @@ -2,9 +2,9 @@ import java.util.Objects; import java.util.Optional; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.gtfs.mapping.TransitModeMapper; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.network.Route; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/ScheduledTripHandler.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/ScheduledTripHandler.java index 0e755b598c0..7dc21f2f4ef 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/ScheduledTripHandler.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/ScheduledTripHandler.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.Map; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.network.StopPattern; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.site.StopLocation; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/StopPositionMapper.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/StopPositionMapper.java index 27e5e6622d6..1c3e4a6f4a6 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/StopPositionMapper.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/StopPositionMapper.java @@ -5,7 +5,7 @@ import java.util.Collections; import java.util.List; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.timetable.Timetable; import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.updater.spi.UpdateException; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/TripTimesUpdater.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/TripTimesUpdater.java index 7506143a2f6..96649393a5f 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/TripTimesUpdater.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/TripTimesUpdater.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; import org.opentripplanner.transit.model.framework.DataValidationException; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/interpolation/BackwardsDelayPropagationType.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/interpolation/BackwardsDelayPropagationType.java index ccaed7ec1e6..6d71c272b90 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/interpolation/BackwardsDelayPropagationType.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/interpolation/BackwardsDelayPropagationType.java @@ -1,6 +1,6 @@ package org.opentripplanner.updater.trip.gtfs.interpolation; -import org.opentripplanner.core.model.doc.DocumentedEnum; +import org.opentripplanner.core.domain.model.doc.DocumentedEnum; /** * The backwards delay propagation type for a GTFS RT trip updater. diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/interpolation/ForwardsDelayPropagationType.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/interpolation/ForwardsDelayPropagationType.java index f2b3697d1dd..9a1b803098c 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/interpolation/ForwardsDelayPropagationType.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/interpolation/ForwardsDelayPropagationType.java @@ -1,6 +1,6 @@ package org.opentripplanner.updater.trip.gtfs.interpolation; -import org.opentripplanner.core.model.doc.DocumentedEnum; +import org.opentripplanner.core.domain.model.doc.DocumentedEnum; public enum ForwardsDelayPropagationType implements DocumentedEnum { NONE, diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/model/GtfsRealtimeMapper.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/model/GtfsRealtimeMapper.java index 9dfcf9551c4..a5bacf0121a 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/model/GtfsRealtimeMapper.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/model/GtfsRealtimeMapper.java @@ -2,7 +2,7 @@ import com.google.transit.realtime.GtfsRealtime.VehicleDescriptor.WheelchairAccessible; import java.util.Optional; -import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; class GtfsRealtimeMapper { diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/model/StopTimeUpdate.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/model/StopTimeUpdate.java index 26848bf8a46..3004cc4de38 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/model/StopTimeUpdate.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/model/StopTimeUpdate.java @@ -7,7 +7,7 @@ import java.util.OptionalInt; import java.util.OptionalLong; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.gtfs.mapping.PickDropMapper; import org.opentripplanner.model.PickDrop; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/model/TripUpdate.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/model/TripUpdate.java index 1720b3d2633..55520677c2e 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/model/TripUpdate.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/model/TripUpdate.java @@ -13,9 +13,9 @@ import java.util.OptionalInt; import java.util.function.Supplier; import java.util.stream.Collectors; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.DataValidationException; import org.opentripplanner.updater.spi.UpdateException; import org.opentripplanner.utils.lang.StringUtils; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/patterncache/TripPatternIdGenerator.java b/application/src/main/java/org/opentripplanner/updater/trip/patterncache/TripPatternIdGenerator.java index 81f76432f55..c8c93a7721d 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/patterncache/TripPatternIdGenerator.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/patterncache/TripPatternIdGenerator.java @@ -1,7 +1,7 @@ package org.opentripplanner.updater.trip.patterncache; import java.util.concurrent.atomic.AtomicInteger; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.gtfs.GenerateTripPatternsOperation; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.timetable.Direction; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/siri/AddedTripBuilder.java b/application/src/main/java/org/opentripplanner/updater/trip/siri/AddedTripBuilder.java index df039904c9d..de0940268e6 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/siri/AddedTripBuilder.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/siri/AddedTripBuilder.java @@ -13,9 +13,9 @@ import java.util.Objects; import java.util.function.Function; import javax.annotation.Nullable; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.StopTime; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.DataValidationException; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/siri/EntityResolver.java b/application/src/main/java/org/opentripplanner/updater/trip/siri/EntityResolver.java index 76f27562c93..10b4577d50f 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/siri/EntityResolver.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/siri/EntityResolver.java @@ -4,7 +4,7 @@ import java.time.LocalDate; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.organization.Operator; import org.opentripplanner.transit.model.site.RegularStop; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/siri/ExtraCallTripBuilder.java b/application/src/main/java/org/opentripplanner/updater/trip/siri/ExtraCallTripBuilder.java index da8f95cc8c0..528f872d943 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/siri/ExtraCallTripBuilder.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/siri/ExtraCallTripBuilder.java @@ -13,8 +13,8 @@ import java.util.Objects; import java.util.function.Function; import javax.annotation.Nullable; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.StopTime; import org.opentripplanner.transit.model.framework.DataValidationException; import org.opentripplanner.transit.model.network.StopPattern; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/siri/ModifiedTripBuilder.java b/application/src/main/java/org/opentripplanner/updater/trip/siri/ModifiedTripBuilder.java index 6b0c38738fb..1fda400d56d 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/siri/ModifiedTripBuilder.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/siri/ModifiedTripBuilder.java @@ -14,7 +14,7 @@ import java.util.Optional; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.DataValidationException; import org.opentripplanner.transit.model.network.StopPattern; import org.opentripplanner.transit.model.network.TripPattern; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriFuzzyTripMatcher.java b/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriFuzzyTripMatcher.java index 87c8d48ca17..769628879ba 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriFuzzyTripMatcher.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriFuzzyTripMatcher.java @@ -14,7 +14,7 @@ import java.util.Set; import java.util.function.BiFunction; import java.util.stream.Collectors; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.calendar.TripCalendars; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.network.TripPattern; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriRealTimeTripUpdateAdapter.java b/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriRealTimeTripUpdateAdapter.java index acaa356412d..4f7b49bcac4 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriRealTimeTripUpdateAdapter.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriRealTimeTripUpdateAdapter.java @@ -1,7 +1,7 @@ package org.opentripplanner.updater.trip.siri; import javax.annotation.Nullable; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; import org.opentripplanner.transit.repository.TimetableRepository; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.TransitRepository; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriRealTimeUpdateHandler.java b/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriRealTimeUpdateHandler.java index a29fde66d7c..ad80047738e 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriRealTimeUpdateHandler.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriRealTimeUpdateHandler.java @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; import org.opentripplanner.transit.model.framework.DataValidationException; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.RealTimeTripTimesBuilder; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/siri/StopTimesMapper.java b/application/src/main/java/org/opentripplanner/updater/trip/siri/StopTimesMapper.java index 84a4c63da4a..e850116e949 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/siri/StopTimesMapper.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/siri/StopTimesMapper.java @@ -2,7 +2,7 @@ import java.time.ZonedDateTime; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; import org.opentripplanner.transit.model.site.RegularStop; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/siri/TimetableHelper.java b/application/src/main/java/org/opentripplanner/updater/trip/siri/TimetableHelper.java index 87ae515610f..69fb741901f 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/siri/TimetableHelper.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/siri/TimetableHelper.java @@ -4,7 +4,7 @@ import java.time.ZonedDateTime; import java.util.function.Supplier; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.transit.model.timetable.OccupancyStatus; import org.opentripplanner.transit.model.timetable.RealTimeTripTimesBuilder; import org.opentripplanner.utils.time.ServiceDateUtils; 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 e9033fd7f85..0ab65a0e3c9 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,7 +1,7 @@ package org.opentripplanner.updater.vehicle_parking; import java.util.Objects; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.utils.lang.IntUtils; public record AvailabiltyUpdate(FeedScopedId vehicleParkingId, int spacesAvailable) { 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 bccdb77a5d1..267de65a1ea 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 @@ -5,7 +5,7 @@ import java.util.concurrent.ExecutionException; import java.util.function.Function; import java.util.stream.Collectors; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehicleparking.VehicleParkingRepository; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehicleparking.model.VehicleParkingSpaces; 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 96137f8b154..9819baf68e9 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 @@ -9,7 +9,7 @@ import java.util.concurrent.ExecutionException; import java.util.function.Function; import java.util.stream.Collectors; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehicleparking.VehicleParkingRepository; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehicleparking.model.VehicleParkingState; 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 6bf8aff9aa8..fc4e6131496 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,7 +30,7 @@ import java.util.function.Function; import java.util.stream.Stream; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.realtimevehicles.RealtimeVehicleRepository; import org.opentripplanner.service.realtimevehicles.model.RealtimeVehicle; import org.opentripplanner.service.realtimevehicles.model.RealtimeVehicle.StopStatus; 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 ea7399eb4e1..518250c0e47 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 @@ -9,7 +9,7 @@ import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ExecutionException; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.retry.OtpRetry; import org.opentripplanner.framework.retry.OtpRetryBuilder; import org.opentripplanner.framework.retry.OtpRetryException; diff --git a/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/params/RentalPickupType.java b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/params/RentalPickupType.java index e2a2e315fe3..93ed25cd4c8 100644 --- a/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/params/RentalPickupType.java +++ b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/params/RentalPickupType.java @@ -3,7 +3,7 @@ import java.util.Collections; import java.util.EnumSet; import java.util.Set; -import org.opentripplanner.core.model.doc.DocumentedEnum; +import org.opentripplanner.core.domain.model.doc.DocumentedEnum; /** * This is temporary and will be removed in a future version of OTP. diff --git a/application/src/main/java/org/opentripplanner/warmup/api/WarmupApi.java b/application/src/main/java/org/opentripplanner/warmup/api/WarmupApi.java index 96cf590c2d9..56d810fa464 100644 --- a/application/src/main/java/org/opentripplanner/warmup/api/WarmupApi.java +++ b/application/src/main/java/org/opentripplanner/warmup/api/WarmupApi.java @@ -1,6 +1,6 @@ package org.opentripplanner.warmup.api; -import org.opentripplanner.core.model.doc.DocumentedEnum; +import org.opentripplanner.core.domain.model.doc.DocumentedEnum; /** Which GraphQL API to use for warmup queries. */ public enum WarmupApi implements DocumentedEnum { diff --git a/application/src/test-fixtures/java/org/opentripplanner/core/model/id/FeedScopedIdForTestFactory.java b/application/src/test-fixtures/java/org/opentripplanner/core/model/id/FeedScopedIdForTestFactory.java index 1703c80dc8a..cf78de29b4f 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/core/model/id/FeedScopedIdForTestFactory.java +++ b/application/src/test-fixtures/java/org/opentripplanner/core/model/id/FeedScopedIdForTestFactory.java @@ -1,5 +1,7 @@ package org.opentripplanner.core.model.id; +import org.opentripplanner.core.domain.model.id.FeedScopedId; + public class FeedScopedIdForTestFactory { public static final String FEED_ID = "F"; diff --git a/application/src/test-fixtures/java/org/opentripplanner/ext/fares/model/FareModelForTest.java b/application/src/test-fixtures/java/org/opentripplanner/ext/fares/model/FareModelForTest.java index 66e83ae4988..0da2586cec8 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/ext/fares/model/FareModelForTest.java +++ b/application/src/test-fixtures/java/org/opentripplanner/ext/fares/model/FareModelForTest.java @@ -4,8 +4,8 @@ import static org.opentripplanner.transit.model._data.TransitRepositoryForTest.OTHER_FEED_AGENCY; import java.time.ZonedDateTime; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.fare.FareOffer; import org.opentripplanner.model.fare.FareProduct; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/application/src/test-fixtures/java/org/opentripplanner/ext/fares/model/FareTestConstants.java b/application/src/test-fixtures/java/org/opentripplanner/ext/fares/model/FareTestConstants.java index a80539f7394..8c4b451cd94 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/ext/fares/model/FareTestConstants.java +++ b/application/src/test-fixtures/java/org/opentripplanner/ext/fares/model/FareTestConstants.java @@ -5,7 +5,7 @@ import static org.opentripplanner.transit.model._data.TransitRepositoryForTest.groupOfRoutes; import java.time.LocalTime; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.model.fare.FareProduct; import org.opentripplanner.model.fare.RiderCategory; diff --git a/application/src/test-fixtures/java/org/opentripplanner/graph_builder/module/islandpruning/TestNamer.java b/application/src/test-fixtures/java/org/opentripplanner/graph_builder/module/islandpruning/TestNamer.java index 035da42520c..438dd3c351a 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/graph_builder/module/islandpruning/TestNamer.java +++ b/application/src/test-fixtures/java/org/opentripplanner/graph_builder/module/islandpruning/TestNamer.java @@ -1,7 +1,7 @@ package org.opentripplanner.graph_builder.module.islandpruning; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.graph_builder.module.osm.EdgeNamer; import org.opentripplanner.graph_builder.module.osm.model.StreetEdgePair; import org.opentripplanner.graph_builder.module.osm.storage.OsmDatabase; diff --git a/application/src/test-fixtures/java/org/opentripplanner/gtfs/graphbuilder/GtfsModuleTestFactory.java b/application/src/test-fixtures/java/org/opentripplanner/gtfs/graphbuilder/GtfsModuleTestFactory.java index 2b9d6bfa123..d5138128bd6 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/gtfs/graphbuilder/GtfsModuleTestFactory.java +++ b/application/src/test-fixtures/java/org/opentripplanner/gtfs/graphbuilder/GtfsModuleTestFactory.java @@ -1,7 +1,7 @@ package org.opentripplanner.gtfs.graphbuilder; import java.util.List; -import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.time.LocalDateRange; import org.opentripplanner.ext.fares.service.gtfs.v1.GtfsFareServiceFactory; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.service.streetdetails.internal.DefaultStreetDetailsRepository; diff --git a/application/src/test-fixtures/java/org/opentripplanner/model/plan/TestItinerary.java b/application/src/test-fixtures/java/org/opentripplanner/model/plan/TestItinerary.java index 70ab3bc16a4..923e71c742e 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/model/plan/TestItinerary.java +++ b/application/src/test-fixtures/java/org/opentripplanner/model/plan/TestItinerary.java @@ -1,7 +1,7 @@ package org.opentripplanner.model.plan; import java.util.List; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; public class TestItinerary { diff --git a/application/src/test-fixtures/java/org/opentripplanner/model/plan/TestTransitLegBuilder.java b/application/src/test-fixtures/java/org/opentripplanner/model/plan/TestTransitLegBuilder.java index 330efe9d6d1..1b100e47996 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/model/plan/TestTransitLegBuilder.java +++ b/application/src/test-fixtures/java/org/opentripplanner/model/plan/TestTransitLegBuilder.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.stream.Collectors; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.network.GroupOfRoutes; diff --git a/application/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleTypeFactory.java b/application/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleTypeFactory.java index 24030111e68..56e6f6aa39c 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleTypeFactory.java +++ b/application/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleTypeFactory.java @@ -1,7 +1,7 @@ package org.opentripplanner.service.vehiclerental.model; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.model.RentalFormFactor; public class RentalVehicleTypeFactory { diff --git a/application/src/test-fixtures/java/org/opentripplanner/street/model/StreetModelForTest.java b/application/src/test-fixtures/java/org/opentripplanner/street/model/StreetModelForTest.java index ce2a67ca2bf..3949c079773 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/street/model/StreetModelForTest.java +++ b/application/src/test-fixtures/java/org/opentripplanner/street/model/StreetModelForTest.java @@ -6,8 +6,8 @@ import java.util.Set; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.geometry.SphericalDistanceLibrary; diff --git a/application/src/test-fixtures/java/org/opentripplanner/street/model/vertex/SimpleVertex.java b/application/src/test-fixtures/java/org/opentripplanner/street/model/vertex/SimpleVertex.java index d78c9e5fe1f..22a105167d9 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/street/model/vertex/SimpleVertex.java +++ b/application/src/test-fixtures/java/org/opentripplanner/street/model/vertex/SimpleVertex.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; public class SimpleVertex extends StreetVertex { diff --git a/application/src/test-fixtures/java/org/opentripplanner/street/search/state/TestStateBuilder.java b/application/src/test-fixtures/java/org/opentripplanner/street/search/state/TestStateBuilder.java index 6a9f229d278..5666bb5cd99 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/street/search/state/TestStateBuilder.java +++ b/application/src/test-fixtures/java/org/opentripplanner/street/search/state/TestStateBuilder.java @@ -6,8 +6,8 @@ import java.time.OffsetDateTime; import java.util.Arrays; import java.util.List; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressType; import org.opentripplanner.service.vehiclerental.model.TestFreeFloatingRentalVehicleBuilder; import org.opentripplanner.service.vehiclerental.model.TestVehicleRentalStationBuilder; diff --git a/application/src/test-fixtures/java/org/opentripplanner/transit/model/SiteRepositoryTestBuilder.java b/application/src/test-fixtures/java/org/opentripplanner/transit/model/SiteRepositoryTestBuilder.java index 7ea6f25de80..b7a7891aa19 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/transit/model/SiteRepositoryTestBuilder.java +++ b/application/src/test-fixtures/java/org/opentripplanner/transit/model/SiteRepositoryTestBuilder.java @@ -7,7 +7,7 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Polygon; import org.opentripplanner._support.geometry.Coordinates; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.site.AreaStop; diff --git a/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitRepositoryTestBuilder.java b/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitRepositoryTestBuilder.java index b0df445ca0a..8aa80d098d8 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitRepositoryTestBuilder.java +++ b/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitRepositoryTestBuilder.java @@ -11,7 +11,7 @@ import java.util.Optional; import java.util.function.Consumer; import java.util.stream.Collectors; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.UnscheduledTrip; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.calendar.CalendarServiceData; diff --git a/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitTestEnvironmentBuilder.java b/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitTestEnvironmentBuilder.java index abede8c0be0..b6fdadc984a 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitTestEnvironmentBuilder.java +++ b/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitTestEnvironmentBuilder.java @@ -4,7 +4,7 @@ import java.time.ZoneId; import java.util.Arrays; import java.util.function.Consumer; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transfer.regular.TransferServiceTestFactory; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.network.RouteBuilder; diff --git a/application/src/test-fixtures/java/org/opentripplanner/transit/model/TripInput.java b/application/src/test-fixtures/java/org/opentripplanner/transit/model/TripInput.java index 09c5b3bcb9a..3a8266288a9 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/transit/model/TripInput.java +++ b/application/src/test-fixtures/java/org/opentripplanner/transit/model/TripInput.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.stream.IntStream; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; import org.opentripplanner.transit.model.basic.TransitMode; diff --git a/application/src/test-fixtures/java/org/opentripplanner/transit/model/TripOnDateDataFetcher.java b/application/src/test-fixtures/java/org/opentripplanner/transit/model/TripOnDateDataFetcher.java index 26b9356c2d7..f630395cdde 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/transit/model/TripOnDateDataFetcher.java +++ b/application/src/test-fixtures/java/org/opentripplanner/transit/model/TripOnDateDataFetcher.java @@ -2,7 +2,7 @@ import java.time.LocalDate; import javax.annotation.Nullable; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripIdAndServiceDate; diff --git a/application/src/test-fixtures/java/org/opentripplanner/transit/model/site/TestStopLocation.java b/application/src/test-fixtures/java/org/opentripplanner/transit/model/site/TestStopLocation.java index 1830c6d3a40..8855df12d77 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/transit/model/site/TestStopLocation.java +++ b/application/src/test-fixtures/java/org/opentripplanner/transit/model/site/TestStopLocation.java @@ -4,8 +4,8 @@ import org.apache.commons.lang3.NotImplementedException; import org.jetbrains.annotations.Nullable; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; public class TestStopLocation implements StopLocation { diff --git a/application/src/test-fixtures/java/org/opentripplanner/transit/service/NoopSiteResolver.java b/application/src/test-fixtures/java/org/opentripplanner/transit/service/NoopSiteResolver.java index 06b795dba82..c395e772b55 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/transit/service/NoopSiteResolver.java +++ b/application/src/test-fixtures/java/org/opentripplanner/transit/service/NoopSiteResolver.java @@ -1,7 +1,7 @@ package org.opentripplanner.transit.service; import org.apache.commons.lang3.NotImplementedException; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.SiteResolver; import org.opentripplanner.transit.model.site.Entrance; import org.opentripplanner.transit.model.site.RegularStop; diff --git a/application/src/test-fixtures/java/org/opentripplanner/updater/trip/gtfs/GtfsRtTestHelper.java b/application/src/test-fixtures/java/org/opentripplanner/updater/trip/gtfs/GtfsRtTestHelper.java index d1f04597529..e8271113414 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/updater/trip/gtfs/GtfsRtTestHelper.java +++ b/application/src/test-fixtures/java/org/opentripplanner/updater/trip/gtfs/GtfsRtTestHelper.java @@ -6,7 +6,7 @@ import java.time.LocalDate; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; import org.opentripplanner.transit.model.TransitTestEnvironment; import org.opentripplanner.updater.spi.UpdateResult; import org.opentripplanner.updater.trip.UpdateIncrementality; diff --git a/application/src/test-fixtures/java/org/opentripplanner/updater/trip/siri/SiriTestHelper.java b/application/src/test-fixtures/java/org/opentripplanner/updater/trip/siri/SiriTestHelper.java index 911777a0df7..2591d192c14 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/updater/trip/siri/SiriTestHelper.java +++ b/application/src/test-fixtures/java/org/opentripplanner/updater/trip/siri/SiriTestHelper.java @@ -5,7 +5,7 @@ import java.time.LocalDate; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; import org.opentripplanner.transit.model.TransitTestEnvironment; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.updater.spi.UpdateResult; diff --git a/application/src/test/java/org/opentripplanner/ConstantsForTests.java b/application/src/test/java/org/opentripplanner/ConstantsForTests.java index 1492a2de01d..7e4f241ac6d 100644 --- a/application/src/test/java/org/opentripplanner/ConstantsForTests.java +++ b/application/src/test/java/org/opentripplanner/ConstantsForTests.java @@ -8,9 +8,9 @@ import java.util.List; import java.util.Map; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.LocalDateRange; import org.opentripplanner.datastore.api.CompositeDataSource; import org.opentripplanner.datastore.api.FileType; import org.opentripplanner.datastore.file.DirectoryDataSource; diff --git a/application/src/test/java/org/opentripplanner/GtfsTest.java b/application/src/test/java/org/opentripplanner/GtfsTest.java index b4858617ff1..34f1abc9c8f 100644 --- a/application/src/test/java/org/opentripplanner/GtfsTest.java +++ b/application/src/test/java/org/opentripplanner/GtfsTest.java @@ -18,8 +18,8 @@ import java.util.ArrayList; import java.util.List; import org.junit.jupiter.api.BeforeEach; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.LocalDateRange; import org.opentripplanner.gtfs.graphbuilder.GtfsBundle; import org.opentripplanner.gtfs.graphbuilder.GtfsBundleTestFactory; import org.opentripplanner.gtfs.graphbuilder.GtfsModule; diff --git a/application/src/test/java/org/opentripplanner/OtpArchitectureModules.java b/application/src/test/java/org/opentripplanner/OtpArchitectureModules.java index 79e94554753..a404590fa7e 100644 --- a/application/src/test/java/org/opentripplanner/OtpArchitectureModules.java +++ b/application/src/test/java/org/opentripplanner/OtpArchitectureModules.java @@ -16,6 +16,12 @@ public interface OtpArchitectureModules { Package OTP_ROOT = Package.of("org.opentripplanner"); + Package CORE = OTP_ROOT.subPackage("core"); + Package CORE_DOMAIN = CORE.subPackage("domain"); + Package CORE_DOMAIN_FRAMEWORK = CORE_DOMAIN.subPackage("framework"); + Package CORE_DOMAIN_FRAMEWORK_ALL = CORE_DOMAIN.subPackage("framework.."); + Package CORE_DOMAIN_MODEL = CORE_DOMAIN.subPackage("model"); + Package CORE_DOMAIN_MODEL_ALL = CORE_DOMAIN.subPackage("model.."); Package UTILS_PACKAGE = OTP_ROOT.subPackage("utils"); Package DATASTORE = OTP_ROOT.subPackage("datastore"); @@ -27,12 +33,7 @@ public interface OtpArchitectureModules { Package RAPTOR_ADAPTER_API = RAPTOR_ADAPTER.subPackage("api"); Package TRANSIT = OTP_ROOT.subPackage("transit"); Package TRANSIT_MODEL = TRANSIT.subPackage("model"); - Package DOMAIN_CORE = OTP_ROOT.subPackage("core"); Package GEOMETRY = OTP_ROOT.subPackage("street.geometry"); - Package DOMAIN_CORE_FRAMEWORK = DOMAIN_CORE.subPackage("framework"); - Package DOMAIN_CORE_FRAMEWORK_ALL = DOMAIN_CORE.subPackage("framework.."); - Package DOMAIN_CORE_MODEL = DOMAIN_CORE.subPackage("model"); - Package DOMAIN_CORE_MODEL_ALL = DOMAIN_CORE.subPackage("model.."); /* The Raptor module */ Package RAPTOR_ROOT = OTP_ROOT.subPackage("raptor"); @@ -53,8 +54,8 @@ public interface OtpArchitectureModules { Module FRAMEWORK_UTILS = Module.of( OTP_UTILS, - DOMAIN_CORE_MODEL_ALL, - DOMAIN_CORE_FRAMEWORK_ALL, + CORE_DOMAIN_MODEL_ALL, + CORE_DOMAIN_FRAMEWORK_ALL, FRAMEWORK.subPackage("application"), FRAMEWORK.subPackage("error"), FRAMEWORK.subPackage("i18n"), diff --git a/application/src/test/java/org/opentripplanner/_support/text/I18NStrings.java b/application/src/test/java/org/opentripplanner/_support/text/I18NStrings.java index e734580ba37..67989156e1a 100644 --- a/application/src/test/java/org/opentripplanner/_support/text/I18NStrings.java +++ b/application/src/test/java/org/opentripplanner/_support/text/I18NStrings.java @@ -1,7 +1,7 @@ package org.opentripplanner._support.text; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.TranslatedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.TranslatedString; public class I18NStrings { diff --git a/application/src/test/java/org/opentripplanner/api/common/LocationStringParserTest.java b/application/src/test/java/org/opentripplanner/api/common/LocationStringParserTest.java index abf4461538e..8446e6be39e 100644 --- a/application/src/test/java/org/opentripplanner/api/common/LocationStringParserTest.java +++ b/application/src/test/java/org/opentripplanner/api/common/LocationStringParserTest.java @@ -6,7 +6,7 @@ import java.util.Optional; import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.GenericLocation; public class LocationStringParserTest { diff --git a/application/src/test/java/org/opentripplanner/api/model/transit/DefaultFeedIdMapperTest.java b/application/src/test/java/org/opentripplanner/api/model/transit/DefaultFeedIdMapperTest.java index 3e5c4b8e5d1..9bce5244fdd 100644 --- a/application/src/test/java/org/opentripplanner/api/model/transit/DefaultFeedIdMapperTest.java +++ b/application/src/test/java/org/opentripplanner/api/model/transit/DefaultFeedIdMapperTest.java @@ -6,7 +6,7 @@ import java.util.Optional; import org.junit.jupiter.api.Test; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; class DefaultFeedIdMapperTest { diff --git a/application/src/test/java/org/opentripplanner/api/model/transit/FeedScopedIdMapperTest.java b/application/src/test/java/org/opentripplanner/api/model/transit/FeedScopedIdMapperTest.java index f9c19be83e9..2b28ddd0d37 100644 --- a/application/src/test/java/org/opentripplanner/api/model/transit/FeedScopedIdMapperTest.java +++ b/application/src/test/java/org/opentripplanner/api/model/transit/FeedScopedIdMapperTest.java @@ -10,7 +10,7 @@ import org.apache.commons.lang3.NotImplementedException; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; class FeedScopedIdMapperTest { diff --git a/application/src/test/java/org/opentripplanner/api/model/transit/HideFeedIdMapperTest.java b/application/src/test/java/org/opentripplanner/api/model/transit/HideFeedIdMapperTest.java index ae5b2fcb55c..f2611b39801 100644 --- a/application/src/test/java/org/opentripplanner/api/model/transit/HideFeedIdMapperTest.java +++ b/application/src/test/java/org/opentripplanner/api/model/transit/HideFeedIdMapperTest.java @@ -4,7 +4,7 @@ import java.util.Optional; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; class HideFeedIdMapperTest { diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/CostScalarTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/CostScalarTest.java index 9d70987192a..1e749715c13 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/CostScalarTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/CostScalarTest.java @@ -10,7 +10,7 @@ import graphql.schema.CoercingSerializeException; import java.math.BigInteger; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; class CostScalarTest { 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 80905d112f9..9518153fd5f 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java @@ -43,12 +43,12 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.params.ParameterizedTest; import org.opentripplanner._support.text.I18NStrings; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; -import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.model.FeedInfoTestFactory; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.calendar.CalendarServiceData; diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/AlertsConnectionFilterMapperTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/AlertsConnectionFilterMapperTest.java index cd1b626f8bf..b94961680ef 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/AlertsConnectionFilterMapperTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/AlertsConnectionFilterMapperTest.java @@ -11,7 +11,7 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.alertpatch.AlertCause; import org.opentripplanner.routing.alertpatch.AlertEffect; import org.opentripplanner.routing.alertpatch.AlertSeverity; diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/CanceledTripsFilterMapperTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/CanceledTripsFilterMapperTest.java index 61f90a021a8..f470d7015fa 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/CanceledTripsFilterMapperTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/CanceledTripsFilterMapperTest.java @@ -17,8 +17,8 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.apis.support.InvalidInputException; import org.opentripplanner.apis.support.graphql.DataFetchingSupport; -import org.opentripplanner.core.model.time.LocalDateRange; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.transit.model.basic.MainAndSubMode; import org.opentripplanner.transit.model.basic.TransitMode; diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/AlertsFilterTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/AlertsFilterTest.java index 8b94a4f69ba..aa4cc346bcc 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/AlertsFilterTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/AlertsFilterTest.java @@ -8,8 +8,8 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.alertpatch.AlertCause; import org.opentripplanner.routing.alertpatch.AlertEffect; import org.opentripplanner.routing.alertpatch.AlertSeverity; diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java index 36bfc7026d9..72f0121d355 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java @@ -31,7 +31,7 @@ import org.opentripplanner.apis.gtfs.TestRoutingService; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.apis.support.graphql.DataFetchingSupport; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.service.gtfs.v1.DefaultFareService; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.place.nearbystopfinder.StreetNearbyStopFinder; diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperBicycleTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperBicycleTest.java index ce70d1ddcf9..cb005f67d2b 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperBicycleTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperBicycleTest.java @@ -11,7 +11,7 @@ import java.util.Set; import org.junit.jupiter.api.Test; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.street.model.VehicleRoutingOptimizeType; class RouteRequestMapperBicycleTest { diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperCarTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperCarTest.java index 824bb27bf13..8baed8d8bf5 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperCarTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperCarTest.java @@ -11,7 +11,7 @@ import java.util.Set; import org.junit.jupiter.api.Test; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; class RouteRequestMapperCarTest { diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperScooterTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperScooterTest.java index 8dd6b5ea809..cc29148a1e4 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperScooterTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperScooterTest.java @@ -9,7 +9,7 @@ import java.util.Set; import org.junit.jupiter.api.Test; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.street.model.VehicleRoutingOptimizeType; class RouteRequestMapperScooterTest { diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java index 407ea13be95..c623edeef51 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java @@ -16,7 +16,7 @@ import java.util.Locale; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.plan.paging.cursor.PageCursor; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.preference.ItineraryFilterDebugProfile; diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTransitTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTransitTest.java index 39e9867bc11..898ccd706af 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTransitTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTransitTest.java @@ -8,7 +8,7 @@ import java.util.Locale; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.transit.model.basic.TransitMode; class RouteRequestMapperTransitTest { diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperWalkTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperWalkTest.java index 3ec71545064..f52f8509467 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperWalkTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperWalkTest.java @@ -6,7 +6,7 @@ import java.util.Locale; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; class RouteRequestMapperWalkTest { diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/model/OffsetDateTimeRangeTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/model/OffsetDateTimeRangeTest.java index 05e2a2443de..ee17b285b19 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/model/OffsetDateTimeRangeTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/model/OffsetDateTimeRangeTest.java @@ -7,7 +7,7 @@ import java.time.ZoneId; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.time.TimePeriod; class OffsetDateTimeRangeTest { diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/service/ApiTransitServiceTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/service/ApiTransitServiceTest.java index 42696503132..f63689a0c5d 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/service/ApiTransitServiceTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/service/ApiTransitServiceTest.java @@ -16,8 +16,8 @@ import java.time.ZonedDateTime; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.time.LocalDateRange; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.model.plan.leg.ScheduledTransitLegBuilder; diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/support/sort/AlertsConnectionOrderingTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/support/sort/AlertsConnectionOrderingTest.java index 53eb40b6f8f..3c6c16c5470 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/support/sort/AlertsConnectionOrderingTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/support/sort/AlertsConnectionOrderingTest.java @@ -6,8 +6,8 @@ import java.util.List; import javax.annotation.Nullable; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.routing.alertpatch.AlertCalendar; import org.opentripplanner.routing.alertpatch.AlertSeverity; import org.opentripplanner.routing.alertpatch.TransitAlert; diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/support/time/OffsetDateTimeRangeUtilTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/support/time/OffsetDateTimeRangeUtilTest.java index 73e486ca287..65a6adc03e1 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/support/time/OffsetDateTimeRangeUtilTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/support/time/OffsetDateTimeRangeUtilTest.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.time.TimePeriod; class OffsetDateTimeRangeUtilTest { diff --git a/application/src/test/java/org/opentripplanner/apis/transmodel/mapping/FixedFeedIdGeneratorTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/mapping/FixedFeedIdGeneratorTest.java index 277bf5818f8..bd1216999d3 100644 --- a/application/src/test/java/org/opentripplanner/apis/transmodel/mapping/FixedFeedIdGeneratorTest.java +++ b/application/src/test/java/org/opentripplanner/apis/transmodel/mapping/FixedFeedIdGeneratorTest.java @@ -5,7 +5,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.organization.Agency; diff --git a/application/src/test/java/org/opentripplanner/apis/transmodel/model/EnumTypesTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/model/EnumTypesTest.java index 5cf5a570a5b..8cbab163ec1 100644 --- a/application/src/test/java/org/opentripplanner/apis/transmodel/model/EnumTypesTest.java +++ b/application/src/test/java/org/opentripplanner/apis/transmodel/model/EnumTypesTest.java @@ -20,7 +20,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; import org.opentripplanner.apis.transmodel.mapping.RelativeDirectionMapper; -import org.opentripplanner.core.model.doc.DocumentedEnum; +import org.opentripplanner.core.domain.model.doc.DocumentedEnum; import org.opentripplanner.model.plan.walkstep.RelativeDirection; import org.opentripplanner.routing.api.response.RoutingErrorCode; import org.opentripplanner.transit.model.basic.TransitMode; diff --git a/application/src/test/java/org/opentripplanner/apis/transmodel/model/PlanResponseBuilderTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/model/PlanResponseBuilderTest.java index b3fb66cd0a5..a53f46f2839 100644 --- a/application/src/test/java/org/opentripplanner/apis/transmodel/model/PlanResponseBuilderTest.java +++ b/application/src/test/java/org/opentripplanner/apis/transmodel/model/PlanResponseBuilderTest.java @@ -9,7 +9,7 @@ import java.time.Instant; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.SortOrder; diff --git a/application/src/test/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostTypeTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostTypeTest.java index e8b6fd5ce52..afae8b2d892 100644 --- a/application/src/test/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostTypeTest.java +++ b/application/src/test/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostTypeTest.java @@ -10,7 +10,7 @@ import graphql.language.StringValue; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; class RelaxCostTypeTest { 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 80457aad874..86b5f8c6f5d 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 @@ -5,7 +5,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.model.plan.ItineraryBuilder; import org.opentripplanner.model.plan.Place; diff --git a/application/src/test/java/org/opentripplanner/framework/FrameworkArchitectureTest.java b/application/src/test/java/org/opentripplanner/framework/FrameworkArchitectureTest.java index 5c09ac927c5..b3c0cba9c16 100644 --- a/application/src/test/java/org/opentripplanner/framework/FrameworkArchitectureTest.java +++ b/application/src/test/java/org/opentripplanner/framework/FrameworkArchitectureTest.java @@ -1,7 +1,7 @@ package org.opentripplanner.framework; -import static org.opentripplanner.OtpArchitectureModules.DOMAIN_CORE_FRAMEWORK; -import static org.opentripplanner.OtpArchitectureModules.DOMAIN_CORE_MODEL; +import static org.opentripplanner.OtpArchitectureModules.CORE_DOMAIN_FRAMEWORK; +import static org.opentripplanner.OtpArchitectureModules.CORE_DOMAIN_MODEL; import static org.opentripplanner.OtpArchitectureModules.FRAMEWORK; import static org.opentripplanner.OtpArchitectureModules.GNU_TROVE; import static org.opentripplanner.OtpArchitectureModules.OTP_UTILS; @@ -22,10 +22,10 @@ public class FrameworkArchitectureTest { private static final Package APPLICATION = FRAMEWORK.subPackage("application"); private static final Package COLLECTION = FRAMEWORK.subPackage("collection"); private static final Package FUNCTIONAL = FRAMEWORK.subPackage("functional"); - private static final Package I18N = DOMAIN_CORE_MODEL.subPackage("i18n"); + private static final Package I18N = CORE_DOMAIN_MODEL.subPackage("i18n"); private static final Package IO = FRAMEWORK.subPackage("io"); private static final Package LOGGING = FRAMEWORK.subPackage("logging"); - private static final Package RESOURCES = DOMAIN_CORE_FRAMEWORK.subPackage("resources"); + private static final Package RESOURCES = CORE_DOMAIN_FRAMEWORK.subPackage("resources"); private static final Package TIME = FRAMEWORK.subPackage("time"); @Test diff --git a/application/src/test/java/org/opentripplanner/framework/doc/DocumentedEnumTestHelper.java b/application/src/test/java/org/opentripplanner/framework/doc/DocumentedEnumTestHelper.java index 3262b5fb6fe..479de149bf9 100644 --- a/application/src/test/java/org/opentripplanner/framework/doc/DocumentedEnumTestHelper.java +++ b/application/src/test/java/org/opentripplanner/framework/doc/DocumentedEnumTestHelper.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import org.opentripplanner.core.model.doc.DocumentedEnum; +import org.opentripplanner.core.domain.model.doc.DocumentedEnum; public class DocumentedEnumTestHelper { diff --git a/application/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java b/application/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java index 00553dd691b..e7d2fd45912 100644 --- a/application/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java +++ b/application/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java @@ -11,7 +11,7 @@ import java.util.Map; import org.junit.jupiter.api.Test; import org.opentripplanner.apis.support.graphql.DataFetchingSupport; -import org.opentripplanner.core.model.i18n.TranslatedString; +import org.opentripplanner.core.domain.model.i18n.TranslatedString; class GraphQLUtilsTest { diff --git a/application/src/test/java/org/opentripplanner/framework/graphql/scalar/CostScalarFactoryTest.java b/application/src/test/java/org/opentripplanner/framework/graphql/scalar/CostScalarFactoryTest.java index 775b157dff4..b925a53fa39 100644 --- a/application/src/test/java/org/opentripplanner/framework/graphql/scalar/CostScalarFactoryTest.java +++ b/application/src/test/java/org/opentripplanner/framework/graphql/scalar/CostScalarFactoryTest.java @@ -10,7 +10,7 @@ import java.math.BigInteger; import java.util.Locale; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; class CostScalarFactoryTest { diff --git a/application/src/test/java/org/opentripplanner/framework/model/CostTest.java b/application/src/test/java/org/opentripplanner/framework/model/CostTest.java index e6ef264582b..dd3e487592b 100644 --- a/application/src/test/java/org/opentripplanner/framework/model/CostTest.java +++ b/application/src/test/java/org/opentripplanner/framework/model/CostTest.java @@ -4,14 +4,14 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.opentripplanner.core.model.basic.Cost.ONE_HOUR_WITH_TRANSIT; +import static org.opentripplanner.core.domain.model.basic.Cost.ONE_HOUR_WITH_TRANSIT; import java.time.Duration; import java.util.List; import java.util.stream.Stream; import org.junit.jupiter.api.Test; import org.opentripplanner._support.asserts.AssertEqualsAndHashCode; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; class CostTest { 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 c620c0d6e76..472cb513dc4 100644 --- a/application/src/test/java/org/opentripplanner/framework/model/TimeAndCostTest.java +++ b/application/src/test/java/org/opentripplanner/framework/model/TimeAndCostTest.java @@ -7,7 +7,7 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.utils.time.DurationUtils; class TimeAndCostTest { diff --git a/application/src/test/java/org/opentripplanner/gbfs/v2/GbfsFreeVehicleStatusMapperTest.java b/application/src/test/java/org/opentripplanner/gbfs/v2/GbfsFreeVehicleStatusMapperTest.java index 515c76b8d44..ccfb6a90a7c 100644 --- a/application/src/test/java/org/opentripplanner/gbfs/v2/GbfsFreeVehicleStatusMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gbfs/v2/GbfsFreeVehicleStatusMapperTest.java @@ -5,8 +5,8 @@ import java.util.Map; import org.junit.jupiter.api.Test; import org.mobilitydata.gbfs.v2_3.free_bike_status.GBFSBike; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem; import org.opentripplanner.street.model.RentalFormFactor; diff --git a/application/src/test/java/org/opentripplanner/gbfs/v3/GbfsFeedMapperTest.java b/application/src/test/java/org/opentripplanner/gbfs/v3/GbfsFeedMapperTest.java index 2012beddba1..460db63c573 100644 --- a/application/src/test/java/org/opentripplanner/gbfs/v3/GbfsFeedMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gbfs/v3/GbfsFeedMapperTest.java @@ -13,7 +13,7 @@ import java.util.Set; import org.junit.jupiter.api.Test; import org.mobilitydata.gbfs.v3_0.vehicle_types.GBFSVehicleType; -import org.opentripplanner.core.model.i18n.TranslatedString; +import org.opentripplanner.core.domain.model.i18n.TranslatedString; import org.opentripplanner.framework.io.HttpHeaders; import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.gbfs.GbfsAutoConfiguration; diff --git a/application/src/test/java/org/opentripplanner/gbfs/v3/GbfsStationInformationMapperTest.java b/application/src/test/java/org/opentripplanner/gbfs/v3/GbfsStationInformationMapperTest.java index f001956b7c4..3075005217e 100644 --- a/application/src/test/java/org/opentripplanner/gbfs/v3/GbfsStationInformationMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gbfs/v3/GbfsStationInformationMapperTest.java @@ -16,8 +16,8 @@ import org.mobilitydata.gbfs.v3_0.station_information.GBFSName; import org.mobilitydata.gbfs.v3_0.station_information.GBFSStation; import org.mobilitydata.gbfs.v3_0.station_information.GBFSVehicleTypesCapacity; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem; import org.opentripplanner.street.model.RentalFormFactor; diff --git a/application/src/test/java/org/opentripplanner/gbfs/v3/GbfsVehicleStatusMapperTest.java b/application/src/test/java/org/opentripplanner/gbfs/v3/GbfsVehicleStatusMapperTest.java index bc0c8630cc9..d863de17bd3 100644 --- a/application/src/test/java/org/opentripplanner/gbfs/v3/GbfsVehicleStatusMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gbfs/v3/GbfsVehicleStatusMapperTest.java @@ -5,8 +5,8 @@ import java.util.Map; import org.junit.jupiter.api.Test; import org.mobilitydata.gbfs.v3_0.vehicle_status.GBFSVehicle; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem; import org.opentripplanner.street.model.RentalFormFactor; diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java index a01c0dfd506..6f9b4340740 100644 --- a/application/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java +++ b/application/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java @@ -16,8 +16,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.graph_builder.module.osm.OsmModuleTestFactory; import org.opentripplanner.osm.DefaultOsmProvider; import org.opentripplanner.routing.linking.VertexLinkerTestFactory; diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java index 26d4cf34439..20b7b92fe85 100644 --- a/application/src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java +++ b/application/src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; import org.opentripplanner.ext.flex.trip.UnscheduledTrip; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/geometry/CalculateWorldEnvelopeModuleTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/geometry/CalculateWorldEnvelopeModuleTest.java index ed484e79bf3..b68d2198680 100644 --- a/application/src/test/java/org/opentripplanner/graph_builder/module/geometry/CalculateWorldEnvelopeModuleTest.java +++ b/application/src/test/java/org/opentripplanner/graph_builder/module/geometry/CalculateWorldEnvelopeModuleTest.java @@ -4,7 +4,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.model.vertex.VertexLabel; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/geometry/GeometryProcessorTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/geometry/GeometryProcessorTest.java index e8aca728395..c7bbc580245 100644 --- a/application/src/test/java/org/opentripplanner/graph_builder/module/geometry/GeometryProcessorTest.java +++ b/application/src/test/java/org/opentripplanner/graph_builder/module/geometry/GeometryProcessorTest.java @@ -17,7 +17,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.locationtech.jts.geom.LineString; import org.opentest4j.AssertionFailedError; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.service.DefaultDataImportIssueStore; import org.opentripplanner.model.ShapePoint; import org.opentripplanner.model.impl.TransitDataImportBuilder; diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java index 5b1b34cea81..dbcef541f64 100644 --- a/application/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java +++ b/application/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test; import org.opentripplanner._support.geometry.Coordinates; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.vertex.TransitStopVertex; import org.opentripplanner.street.model.vertex.TransitStopVertexBuilder; diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/ned/MissingElevationHandlerTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/ned/MissingElevationHandlerTest.java index 4ab143e7926..210b526c474 100644 --- a/application/src/test/java/org/opentripplanner/graph_builder/module/ned/MissingElevationHandlerTest.java +++ b/application/src/test/java/org/opentripplanner/graph_builder/module/ned/MissingElevationHandlerTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.impl.PackedCoordinateSequence; -import org.opentripplanner.core.model.i18n.LocalizedStringFormat; +import org.opentripplanner.core.domain.model.i18n.LocalizedStringFormat; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issue.service.DefaultDataImportIssueStore; import org.opentripplanner.street.model.StreetModelForTest; diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/osm/ParkingProcessorTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/ParkingProcessorTest.java index 44c9c5aee4a..2489532cf36 100644 --- a/application/src/test/java/org/opentripplanner/graph_builder/module/osm/ParkingProcessorTest.java +++ b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/ParkingProcessorTest.java @@ -8,7 +8,7 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.opentripplanner._support.geometry.Coordinates; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.osm.WayTestData; import org.opentripplanner.street.graph.Graph; diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/osm/moduletests/elevator/MultipleLevelsTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/moduletests/elevator/MultipleLevelsTest.java index 567852b607c..68b29a25086 100644 --- a/application/src/test/java/org/opentripplanner/graph_builder/module/osm/moduletests/elevator/MultipleLevelsTest.java +++ b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/moduletests/elevator/MultipleLevelsTest.java @@ -10,7 +10,7 @@ import java.util.Set; import java.util.stream.StreamSupport; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; import org.opentripplanner.graph_builder.module.osm.OsmModuleTestFactory; import org.opentripplanner.osm.TestOsmProvider; import org.opentripplanner.osm.model.NodeBuilder; diff --git a/application/src/test/java/org/opentripplanner/gtfs/GenerateTripPatternsOperationTest.java b/application/src/test/java/org/opentripplanner/gtfs/GenerateTripPatternsOperationTest.java index 63631f79a7a..b7c4537cfbc 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/GenerateTripPatternsOperationTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/GenerateTripPatternsOperationTest.java @@ -12,7 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issue.service.DefaultDataImportIssueStore; diff --git a/application/src/test/java/org/opentripplanner/gtfs/graphbuilder/GtfsModuleTest.java b/application/src/test/java/org/opentripplanner/gtfs/graphbuilder/GtfsModuleTest.java index 95df63ac586..52406a9a46c 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/graphbuilder/GtfsModuleTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/graphbuilder/GtfsModuleTest.java @@ -12,7 +12,7 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.ConstantsForTests; -import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.time.LocalDateRange; import org.opentripplanner.street.graph.Graph; import org.opentripplanner.test.support.ResourceLoader; import org.opentripplanner.transit.service.SiteRepository; diff --git a/application/src/test/java/org/opentripplanner/gtfs/interlining/InterlineProcessorTest.java b/application/src/test/java/org/opentripplanner/gtfs/interlining/InterlineProcessorTest.java index a5926e992df..4964625a348 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/interlining/InterlineProcessorTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/interlining/InterlineProcessorTest.java @@ -11,7 +11,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.gtfs.mapping.StaySeatedNotAllowed; diff --git a/application/src/test/java/org/opentripplanner/gtfs/mapping/BoardingAreaMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/BoardingAreaMapperTest.java index 5164c8d6c69..1e767836988 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/mapping/BoardingAreaMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/mapping/BoardingAreaMapperTest.java @@ -12,7 +12,7 @@ import org.junit.jupiter.api.Test; import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.Stop; -import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.site.BoardingArea; import org.opentripplanner.transit.model.site.RegularStop; diff --git a/application/src/test/java/org/opentripplanner/gtfs/mapping/EntranceMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/EntranceMapperTest.java index 4e5193fa89f..becd2ba7779 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/mapping/EntranceMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/mapping/EntranceMapperTest.java @@ -12,7 +12,7 @@ import org.junit.jupiter.api.Test; import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.Stop; -import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; import org.opentripplanner.transit.model.site.Entrance; public class EntranceMapperTest { diff --git a/application/src/test/java/org/opentripplanner/gtfs/mapping/IdFactoryTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/IdFactoryTest.java index d5c20891592..e230bbe9b2a 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/mapping/IdFactoryTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/mapping/IdFactoryTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import org.onebusaway.gtfs.model.AgencyAndId; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; class IdFactoryTest { diff --git a/application/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java index 3137e5db3b2..8dcd7f0acad 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java @@ -9,7 +9,7 @@ import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.LocationGroup; import org.onebusaway.gtfs.model.Stop; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.service.SiteRepository; diff --git a/application/src/test/java/org/opentripplanner/gtfs/mapping/PathwayNodeMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/PathwayNodeMapperTest.java index f199959fade..985f5fae8a9 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/mapping/PathwayNodeMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/mapping/PathwayNodeMapperTest.java @@ -12,7 +12,7 @@ import org.junit.jupiter.api.Test; import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.Stop; -import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; import org.opentripplanner.transit.model.site.PathwayNode; public class PathwayNodeMapperTest { diff --git a/application/src/test/java/org/opentripplanner/gtfs/mapping/RouteMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/RouteMapperTest.java index ad81de9bf77..48aadd55a1c 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/mapping/RouteMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/mapping/RouteMapperTest.java @@ -14,7 +14,7 @@ import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.Route; import org.onebusaway.gtfs.model.RouteNetworkAssignment; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/test/java/org/opentripplanner/gtfs/mapping/ShapePointMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/ShapePointMapperTest.java index 767060b2499..afb8e228bbd 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/mapping/ShapePointMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/mapping/ShapePointMapperTest.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test; import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.ShapePoint; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; public class ShapePointMapperTest { diff --git a/application/src/test/java/org/opentripplanner/gtfs/mapping/StopMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/StopMapperTest.java index 6fe4010855a..13a15acc2d5 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/mapping/StopMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/mapping/StopMapperTest.java @@ -16,7 +16,7 @@ import org.junit.jupiter.api.Test; import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.Stop; -import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.basic.TransitMode; diff --git a/application/src/test/java/org/opentripplanner/gtfs/mapping/TranslationHelperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/TranslationHelperTest.java index ac046142d66..0bdae633cbf 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/mapping/TranslationHelperTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/mapping/TranslationHelperTest.java @@ -12,7 +12,7 @@ import org.onebusaway.gtfs.model.Stop; import org.onebusaway.gtfs.model.StopTime; import org.onebusaway.gtfs.model.Translation; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; public class TranslationHelperTest { diff --git a/application/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java index 9a4cfad6318..efaad9716c9 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java @@ -16,7 +16,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.Trip; -import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.transit.model.network.BikeAccess; import org.opentripplanner.transit.model.network.CarAccess; diff --git a/application/src/test/java/org/opentripplanner/inspector/vector/KeyValueTest.java b/application/src/test/java/org/opentripplanner/inspector/vector/KeyValueTest.java index 5cc7f12021d..83e122518c1 100644 --- a/application/src/test/java/org/opentripplanner/inspector/vector/KeyValueTest.java +++ b/application/src/test/java/org/opentripplanner/inspector/vector/KeyValueTest.java @@ -7,7 +7,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; class KeyValueTest { diff --git a/application/src/test/java/org/opentripplanner/inspector/vector/stop/AreaStopLayerBuilderTest.java b/application/src/test/java/org/opentripplanner/inspector/vector/stop/AreaStopLayerBuilderTest.java index 7ab253bcfca..b959ba6b1ab 100644 --- a/application/src/test/java/org/opentripplanner/inspector/vector/stop/AreaStopLayerBuilderTest.java +++ b/application/src/test/java/org/opentripplanner/inspector/vector/stop/AreaStopLayerBuilderTest.java @@ -5,8 +5,8 @@ import java.util.Locale; import org.junit.jupiter.api.Test; import org.opentripplanner._support.geometry.Polygons; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.transit.model.site.AreaStop; import org.opentripplanner.transit.service.SiteRepository; diff --git a/application/src/test/java/org/opentripplanner/model/GenericLocationTest.java b/application/src/test/java/org/opentripplanner/model/GenericLocationTest.java index 3f7dfee3e5e..f5e75dc736e 100644 --- a/application/src/test/java/org/opentripplanner/model/GenericLocationTest.java +++ b/application/src/test/java/org/opentripplanner/model/GenericLocationTest.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test; import org.opentripplanner._support.asserts.AssertEqualsAndHashCode; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; class GenericLocationTest { diff --git a/application/src/test/java/org/opentripplanner/model/TripPatternTest.java b/application/src/test/java/org/opentripplanner/model/TripPatternTest.java index 4ff9972d448..b707e60c269 100644 --- a/application/src/test/java/org/opentripplanner/model/TripPatternTest.java +++ b/application/src/test/java/org/opentripplanner/model/TripPatternTest.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.network.StopPattern; 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 e618d706a89..c6178426b1b 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,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.opentripplanner.ConstantsForTests; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.gtfs.GtfsContext; import org.opentripplanner.gtfs.GtfsContextBuilder; diff --git a/application/src/test/java/org/opentripplanner/model/impl/DefaultTransitDataImportTest.java b/application/src/test/java/org/opentripplanner/model/impl/DefaultTransitDataImportTest.java index da06ac0747f..35dc2706896 100644 --- a/application/src/test/java/org/opentripplanner/model/impl/DefaultTransitDataImportTest.java +++ b/application/src/test/java/org/opentripplanner/model/impl/DefaultTransitDataImportTest.java @@ -15,7 +15,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.opentripplanner.ConstantsForTests; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.gtfs.GtfsContextBuilder; import org.opentripplanner.model.FeedInfo; import org.opentripplanner.model.FeedInfoTestFactory; diff --git a/application/src/test/java/org/opentripplanner/model/impl/TransitDataImportBuilderLimitPeriodTest.java b/application/src/test/java/org/opentripplanner/model/impl/TransitDataImportBuilderLimitPeriodTest.java index 8ce809ddc84..9207aa74cba 100644 --- a/application/src/test/java/org/opentripplanner/model/impl/TransitDataImportBuilderLimitPeriodTest.java +++ b/application/src/test/java/org/opentripplanner/model/impl/TransitDataImportBuilderLimitPeriodTest.java @@ -10,9 +10,9 @@ import java.util.stream.Collectors; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.LocalDateRange; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; -import org.opentripplanner.core.model.time.LocalDateRange; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; diff --git a/application/src/test/java/org/opentripplanner/model/impl/TransitDataImportBuilderTest.java b/application/src/test/java/org/opentripplanner/model/impl/TransitDataImportBuilderTest.java index 2db75cd08ff..b8b8a9c12b4 100644 --- a/application/src/test/java/org/opentripplanner/model/impl/TransitDataImportBuilderTest.java +++ b/application/src/test/java/org/opentripplanner/model/impl/TransitDataImportBuilderTest.java @@ -13,7 +13,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.opentripplanner.ConstantsForTests; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.model.FeedInfoTestFactory; import org.opentripplanner.model.Frequency; diff --git a/application/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java b/application/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java index 93b92ec1097..b77c2030fcc 100644 --- a/application/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java +++ b/application/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java @@ -14,7 +14,7 @@ import java.util.List; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.model.SystemNotice; diff --git a/application/src/test/java/org/opentripplanner/model/plan/PlaceTest.java b/application/src/test/java/org/opentripplanner/model/plan/PlaceTest.java index 529b1f30279..48d60c4b29c 100644 --- a/application/src/test/java/org/opentripplanner/model/plan/PlaceTest.java +++ b/application/src/test/java/org/opentripplanner/model/plan/PlaceTest.java @@ -13,9 +13,9 @@ import org.junit.jupiter.params.provider.MethodSource; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.model.plan.leg.ViaLocationType; import org.opentripplanner.street.geometry.GeometryUtils; 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 34db7626b13..ada64f0d611 100644 --- a/application/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java +++ b/application/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java @@ -14,9 +14,9 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.model.basic.Cost; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.ext.flex.FlexibleTransitLeg; import org.opentripplanner.ext.flex.edgetype.FlexTripEdge; diff --git a/application/src/test/java/org/opentripplanner/model/plan/leg/ScheduledTransitLegTest.java b/application/src/test/java/org/opentripplanner/model/plan/leg/ScheduledTransitLegTest.java index 6140c082c22..e20d7697a72 100644 --- a/application/src/test/java/org/opentripplanner/model/plan/leg/ScheduledTransitLegTest.java +++ b/application/src/test/java/org/opentripplanner/model/plan/leg/ScheduledTransitLegTest.java @@ -15,8 +15,8 @@ import java.util.Set; import org.junit.jupiter.api.Test; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.model.basic.Cost; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.model.fare.FareProduct; import org.opentripplanner.model.plan.Emission; import org.opentripplanner.routing.alertpatch.TransitAlert; diff --git a/application/src/test/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializerTest.java b/application/src/test/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializerTest.java index a3c781403cc..3f00d338e57 100644 --- a/application/src/test/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializerTest.java +++ b/application/src/test/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializerTest.java @@ -6,7 +6,7 @@ import java.time.LocalDate; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; class LegReferenceSerializerTest { diff --git a/application/src/test/java/org/opentripplanner/model/plan/legreference/ScheduledTransitLegReferenceTest.java b/application/src/test/java/org/opentripplanner/model/plan/legreference/ScheduledTransitLegReferenceTest.java index 2b9b0028cc8..06aac7861f0 100644 --- a/application/src/test/java/org/opentripplanner/model/plan/legreference/ScheduledTransitLegReferenceTest.java +++ b/application/src/test/java/org/opentripplanner/model/plan/legreference/ScheduledTransitLegReferenceTest.java @@ -11,7 +11,7 @@ import java.util.Map; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.model.calendar.CalendarServiceData; import org.opentripplanner.model.plan.leg.ScheduledTransitLeg; diff --git a/application/src/test/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCutTest.java b/application/src/test/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCutTest.java index 5a170e29ebc..1c4b97a8c58 100644 --- a/application/src/test/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCutTest.java +++ b/application/src/test/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCutTest.java @@ -4,8 +4,8 @@ import java.time.Instant; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; -import org.opentripplanner.core.model.basic.NormalizedCost; +import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.NormalizedCost; class DeduplicationPageCutTest { 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 a678f97f854..793bbfcaa97 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,7 +10,7 @@ import java.time.Duration; import java.time.Instant; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.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 0505e4477f6..fbe434feb0e 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 @@ -10,7 +10,7 @@ import java.time.Duration; import java.time.Instant; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.utils.time.DurationUtils; 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 813bff0cdf4..0d1ae45f022 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 @@ -24,7 +24,7 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.PlanTestConstants; diff --git a/application/src/test/java/org/opentripplanner/model/plan/walkstep/WalkStepTest.java b/application/src/test/java/org/opentripplanner/model/plan/walkstep/WalkStepTest.java index 538f17d8b53..52a0b5b86c4 100644 --- a/application/src/test/java/org/opentripplanner/model/plan/walkstep/WalkStepTest.java +++ b/application/src/test/java/org/opentripplanner/model/plan/walkstep/WalkStepTest.java @@ -8,7 +8,7 @@ import java.util.Optional; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.street.geometry.WgsCoordinate; public class WalkStepTest { diff --git a/application/src/test/java/org/opentripplanner/netex/NetexEpipBundleSmokeTest.java b/application/src/test/java/org/opentripplanner/netex/NetexEpipBundleSmokeTest.java index 25cdeb841ca..85308c92c1e 100644 --- a/application/src/test/java/org/opentripplanner/netex/NetexEpipBundleSmokeTest.java +++ b/application/src/test/java/org/opentripplanner/netex/NetexEpipBundleSmokeTest.java @@ -14,8 +14,8 @@ import java.util.stream.Collectors; import org.junit.jupiter.api.Test; import org.opentripplanner.ConstantsForTests; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.TransitDataImport; import org.opentripplanner.model.calendar.CalendarServiceData; diff --git a/application/src/test/java/org/opentripplanner/netex/NetexNordicBundleSmokeTest.java b/application/src/test/java/org/opentripplanner/netex/NetexNordicBundleSmokeTest.java index cdd23b36dde..a8bdcf56250 100644 --- a/application/src/test/java/org/opentripplanner/netex/NetexNordicBundleSmokeTest.java +++ b/application/src/test/java/org/opentripplanner/netex/NetexNordicBundleSmokeTest.java @@ -18,8 +18,8 @@ import java.util.stream.Collectors; import org.junit.jupiter.api.Test; import org.opentripplanner.ConstantsForTests; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.TransitDataImport; import org.opentripplanner.model.calendar.CalendarServiceData; diff --git a/application/src/test/java/org/opentripplanner/netex/mapping/FeedScopedIdFactoryTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/FeedScopedIdFactoryTest.java index 76228916960..816424fe7ab 100644 --- a/application/src/test/java/org/opentripplanner/netex/mapping/FeedScopedIdFactoryTest.java +++ b/application/src/test/java/org/opentripplanner/netex/mapping/FeedScopedIdFactoryTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; public class FeedScopedIdFactoryTest { diff --git a/application/src/test/java/org/opentripplanner/netex/mapping/NetexMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/NetexMapperTest.java index f97fb054a36..352d3b0c0e3 100644 --- a/application/src/test/java/org/opentripplanner/netex/mapping/NetexMapperTest.java +++ b/application/src/test/java/org/opentripplanner/netex/mapping/NetexMapperTest.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssue; import org.opentripplanner.graph_builder.issue.service.DefaultDataImportIssueStore; import org.opentripplanner.model.impl.TransitDataImportBuilder; diff --git a/application/src/test/java/org/opentripplanner/netex/mapping/ServiceLinkMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/ServiceLinkMapperTest.java index 1e065227c15..34334bc5233 100644 --- a/application/src/test/java/org/opentripplanner/netex/mapping/ServiceLinkMapperTest.java +++ b/application/src/test/java/org/opentripplanner/netex/mapping/ServiceLinkMapperTest.java @@ -14,8 +14,8 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issue.service.DefaultDataImportIssueStore; import org.opentripplanner.netex.index.hierarchy.HierarchicalMap; diff --git a/application/src/test/java/org/opentripplanner/netex/mapping/StopAndStationMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/StopAndStationMapperTest.java index c2a3d2805a9..7a9d1b4134a 100644 --- a/application/src/test/java/org/opentripplanner/netex/mapping/StopAndStationMapperTest.java +++ b/application/src/test/java/org/opentripplanner/netex/mapping/StopAndStationMapperTest.java @@ -18,7 +18,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.netex.index.hierarchy.HierarchicalVersionMapById; import org.opentripplanner.transit.model.site.RegularStop; diff --git a/application/src/test/java/org/opentripplanner/netex/mapping/TripCalendarBuilderTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/TripCalendarBuilderTest.java index 2e33e46294a..91fecacbf7b 100644 --- a/application/src/test/java/org/opentripplanner/netex/mapping/TripCalendarBuilderTest.java +++ b/application/src/test/java/org/opentripplanner/netex/mapping/TripCalendarBuilderTest.java @@ -18,7 +18,7 @@ import java.util.Set; import java.util.stream.Collectors; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.calendar.ServiceCalendarDate; import org.opentripplanner.netex.index.hierarchy.HierarchicalMapById; diff --git a/application/src/test/java/org/opentripplanner/netex/mapping/TripMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/TripMapperTest.java index 38fefb9d652..3e045ae3ff8 100644 --- a/application/src/test/java/org/opentripplanner/netex/mapping/TripMapperTest.java +++ b/application/src/test/java/org/opentripplanner/netex/mapping/TripMapperTest.java @@ -10,8 +10,8 @@ import java.util.List; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.graph_builder.issue.api.DataImportIssue; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; diff --git a/application/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java index 2c84b88e7f2..105bbe47096 100644 --- a/application/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java +++ b/application/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java @@ -10,7 +10,7 @@ import java.util.Map; import java.util.Optional; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.netex.index.hierarchy.HierarchicalMap; diff --git a/application/src/test/java/org/opentripplanner/netex/mapping/calendar/CalendarServiceBuilderTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/calendar/CalendarServiceBuilderTest.java index 7dc3c4a220d..48a4e9537c1 100644 --- a/application/src/test/java/org/opentripplanner/netex/mapping/calendar/CalendarServiceBuilderTest.java +++ b/application/src/test/java/org/opentripplanner/netex/mapping/calendar/CalendarServiceBuilderTest.java @@ -8,7 +8,7 @@ import java.util.Collection; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.model.calendar.ServiceCalendarDate; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; diff --git a/application/src/test/java/org/opentripplanner/osm/model/OsmEntityTest.java b/application/src/test/java/org/opentripplanner/osm/model/OsmEntityTest.java index 7a583b61652..5d9aee453c0 100644 --- a/application/src/test/java/org/opentripplanner/osm/model/OsmEntityTest.java +++ b/application/src/test/java/org/opentripplanner/osm/model/OsmEntityTest.java @@ -21,7 +21,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; import org.opentripplanner.osm.WayTestData; public class OsmEntityTest { diff --git a/application/src/test/java/org/opentripplanner/place/nearbystopfinder/NearbyStopFinderVisitorTest.java b/application/src/test/java/org/opentripplanner/place/nearbystopfinder/NearbyStopFinderVisitorTest.java index fdeb4a7dd43..40ac894bec8 100644 --- a/application/src/test/java/org/opentripplanner/place/nearbystopfinder/NearbyStopFinderVisitorTest.java +++ b/application/src/test/java/org/opentripplanner/place/nearbystopfinder/NearbyStopFinderVisitorTest.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.place.api.NearbyStop; import org.opentripplanner.street.model.StreetModelForTest; diff --git a/application/src/test/java/org/opentripplanner/place/placefinder/PlaceFinderTraverseVisitorTest.java b/application/src/test/java/org/opentripplanner/place/placefinder/PlaceFinderTraverseVisitorTest.java index 43e8a5c440d..f5e433b5c91 100644 --- a/application/src/test/java/org/opentripplanner/place/placefinder/PlaceFinderTraverseVisitorTest.java +++ b/application/src/test/java/org/opentripplanner/place/placefinder/PlaceFinderTraverseVisitorTest.java @@ -10,7 +10,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.model.StopTime; import org.opentripplanner.place.api.PlaceAtDistance; import org.opentripplanner.place.api.PlaceType; diff --git a/application/src/test/java/org/opentripplanner/raptorlegacy/_data/transit/TestAccessEgress.java b/application/src/test/java/org/opentripplanner/raptorlegacy/_data/transit/TestAccessEgress.java index 0ab2428d030..230dc2132b1 100644 --- a/application/src/test/java/org/opentripplanner/raptorlegacy/_data/transit/TestAccessEgress.java +++ b/application/src/test/java/org/opentripplanner/raptorlegacy/_data/transit/TestAccessEgress.java @@ -3,7 +3,7 @@ import static org.opentripplanner.raptor.spi.RaptorCostConverter.toRaptorCost; import org.opentripplanner._support.geometry.Coordinates; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; diff --git a/application/src/test/java/org/opentripplanner/raptorlegacy/_data/transit/TestTripSchedule.java b/application/src/test/java/org/opentripplanner/raptorlegacy/_data/transit/TestTripSchedule.java index 00295029c25..f40def79910 100644 --- a/application/src/test/java/org/opentripplanner/raptorlegacy/_data/transit/TestTripSchedule.java +++ b/application/src/test/java/org/opentripplanner/raptorlegacy/_data/transit/TestTripSchedule.java @@ -1,11 +1,11 @@ package org.opentripplanner.raptorlegacy._data.transit; -import static org.opentripplanner.core.model.accessibility.Accessibility.NO_INFORMATION; +import static org.opentripplanner.core.domain.model.accessibility.Accessibility.NO_INFORMATION; import static org.opentripplanner.raptorlegacy._data.RaptorTestConstants.createDeprecatedUnsupportedFeatureException; import java.time.LocalDate; import java.util.Arrays; -import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; import org.opentripplanner.raptor.spi.RaptorTripSchedule; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripSchedule; import org.opentripplanner.transit.model.network.TripPattern; diff --git a/application/src/test/java/org/opentripplanner/routing/alertpatch/AlertCalendarTest.java b/application/src/test/java/org/opentripplanner/routing/alertpatch/AlertCalendarTest.java index adc0f878d7d..163e1960685 100644 --- a/application/src/test/java/org/opentripplanner/routing/alertpatch/AlertCalendarTest.java +++ b/application/src/test/java/org/opentripplanner/routing/alertpatch/AlertCalendarTest.java @@ -8,7 +8,7 @@ import java.time.Instant; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.time.TimePeriod; class AlertCalendarTest { diff --git a/application/src/test/java/org/opentripplanner/routing/alertpatch/EntitySelectorTest.java b/application/src/test/java/org/opentripplanner/routing/alertpatch/EntitySelectorTest.java index 1dacf7f1f11..0b85d5ef087 100644 --- a/application/src/test/java/org/opentripplanner/routing/alertpatch/EntitySelectorTest.java +++ b/application/src/test/java/org/opentripplanner/routing/alertpatch/EntitySelectorTest.java @@ -6,7 +6,7 @@ import java.time.LocalDate; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; public class EntitySelectorTest { diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/FilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/FilterTest.java index aa711f3a5c1..88dd61818d3 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/FilterTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/FilterTest.java @@ -8,7 +8,7 @@ import java.util.List; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.request.filter.SelectRequest; import org.opentripplanner.routing.api.request.request.filter.TransitFilterRequest; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/GraphRoutingTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/GraphRoutingTest.java index ac78902c3f4..b0e79fccf45 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/GraphRoutingTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/GraphRoutingTest.java @@ -11,10 +11,10 @@ import javax.annotation.Nullable; import org.locationtech.jts.geom.Coordinate; import org.opentripplanner.TestOtpModel; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; import org.opentripplanner.service.vehicleparking.model.VehicleParking; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/TestBanning.java b/application/src/test/java/org/opentripplanner/routing/algorithm/TestBanning.java index 8dfbf23f8d0..7a92bb51ebb 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/TestBanning.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/TestBanning.java @@ -7,7 +7,7 @@ import java.util.Collection; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.request.filter.SelectRequest; import org.opentripplanner.routing.api.request.request.filter.TransitFilterRequest; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilterTest.java index 1fb7c0d435c..5c2bfebf167 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilterTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilterTest.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Place; import org.opentripplanner.routing.algorithm.filterchain.filters.system.SingleCriteriaComparator; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/DecorateTransitAlertTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/DecorateTransitAlertTest.java index 209587e3b69..eb1358d35a2 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/DecorateTransitAlertTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/DecorateTransitAlertTest.java @@ -7,7 +7,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.routing.alertpatch.AlertCalendar; import org.opentripplanner.routing.alertpatch.EntitySelector; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java index 515730ebb42..1a06dfb8042 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java @@ -8,7 +8,7 @@ import java.util.List; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilterTest.java index 34bcf6cdf60..a5de7519bff 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilterTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilterTest.java @@ -7,7 +7,7 @@ import java.time.Duration; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; 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 49ed9146ad2..c01fb871850 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 @@ -19,7 +19,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.FlexAccessEgress; import org.opentripplanner.ext.flex.FlexPathDurations; import org.opentripplanner.framework.application.OTPFeature; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapperTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapperTest.java index 0053ada394a..7f2e62cd850 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapperTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapperTest.java @@ -14,8 +14,8 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.astar.model.GraphPath; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.plan.walkstep.RelativeDirection; import org.opentripplanner.model.plan.walkstep.WalkStep; import org.opentripplanner.model.plan.walkstep.WalkStepBuilder; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/TransitSnapshotTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/TransitSnapshotTest.java index c390a03eee5..43caf1a88cb 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/TransitSnapshotTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/TransitSnapshotTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.street.model.StreetMode; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/_support/mapping/FeedScopedIdMapper.java b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/_support/mapping/FeedScopedIdMapper.java index 84ab1a99473..812d1edb21a 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/_support/mapping/FeedScopedIdMapper.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/_support/mapping/FeedScopedIdMapper.java @@ -1,6 +1,6 @@ package org.opentripplanner.routing.algorithm.mapping._support.mapping; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; @Deprecated class FeedScopedIdMapper { diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/_support/mapping/LegMapper.java b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/_support/mapping/LegMapper.java index db8279a2d2c..710fd7c63cf 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/_support/mapping/LegMapper.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/_support/mapping/LegMapper.java @@ -9,7 +9,7 @@ import java.util.Locale; import org.opentripplanner.api.model.geometry.EncodedPolyline; import org.opentripplanner.apis.gtfs.mapping.LocalDateMapper; -import org.opentripplanner.core.model.i18n.I18NStringMapper; +import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.model.plan.TransitLeg; import org.opentripplanner.model.plan.leg.StreetLeg; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/_support/mapping/PlaceMapper.java b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/_support/mapping/PlaceMapper.java index c3496427f75..1e59605c2eb 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/_support/mapping/PlaceMapper.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/_support/mapping/PlaceMapper.java @@ -8,7 +8,7 @@ import java.util.Locale; import java.util.Optional; import java.util.stream.Collectors; -import org.opentripplanner.core.model.i18n.I18NStringMapper; +import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.VehicleParkingWithEntrance; import org.opentripplanner.model.plan.leg.StopArrival; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouterTest.java index a4e5176b0de..8539ca9f367 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouterTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouterTest.java @@ -9,7 +9,7 @@ import java.util.Set; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.place.api.NearbyStop; import org.opentripplanner.routing.algorithm.GraphRoutingTest; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressesTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressesTest.java index 29ae80e6953..70870a2fd9c 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressesTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressesTest.java @@ -5,7 +5,7 @@ import java.time.Duration; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java index c3afb21b1c4..4262ec24efd 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java @@ -7,7 +7,7 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.raptor.spi.RaptorConstants; import org.opentripplanner.raptor.spi.RaptorCostConverter; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/PatternCostCalculatorTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/PatternCostCalculatorTest.java index 326386297cf..880f7b4d98d 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/PatternCostCalculatorTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/PatternCostCalculatorTest.java @@ -15,8 +15,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.model.basic.Cost; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.raptor.spi.RaptorCostCalculator; import org.opentripplanner.raptor.spi.RaptorTransferConstraint; import org.opentripplanner.raptorlegacy._data.transit.TestTransitData; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostLinearFunctionTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostLinearFunctionTest.java index eace77ffe9d..721cc048b72 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostLinearFunctionTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostLinearFunctionTest.java @@ -10,7 +10,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.test.support.TestTableParser; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculatorTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculatorTest.java index 5c765db5381..2d952eb580d 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculatorTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculatorTest.java @@ -6,7 +6,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; import org.opentripplanner.raptor.spi.RaptorCostCalculator; import org.opentripplanner.raptor.spi.RaptorCostConverter; import org.opentripplanner.raptor.spi.RaptorTransferConstraint; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/GeneralizedCostParametersMapperTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/GeneralizedCostParametersMapperTest.java index f3c60584144..231dd222de0 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/GeneralizedCostParametersMapperTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/GeneralizedCostParametersMapperTest.java @@ -10,7 +10,7 @@ import java.util.BitSet; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.raptorlegacy._data.transit.TestRoute; import org.opentripplanner.raptorlegacy._data.transit.TestTransitData; import org.opentripplanner.raptorlegacy._data.transit.TestTripPattern; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/LookupStopIndexCallbackTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/LookupStopIndexCallbackTest.java index a21f011a0bc..73f8f3d5c37 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/LookupStopIndexCallbackTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/LookupStopIndexCallbackTest.java @@ -8,7 +8,7 @@ import java.util.Map; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.EntityNotFoundException; class LookupStopIndexCallbackTest { diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapperTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapperTest.java index 3dee83eeb50..c5b4c6cc34c 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapperTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapperTest.java @@ -14,7 +14,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.api.request.RaptorRequest; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TestLookupStopIndexCallback.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TestLookupStopIndexCallback.java index dc9daf2294f..7c8d8f89272 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TestLookupStopIndexCallback.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TestLookupStopIndexCallback.java @@ -2,7 +2,7 @@ import java.util.Map; import java.util.stream.IntStream; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.EntityNotFoundException; import org.opentripplanner.transit.model.site.StopLocation; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilterTest.java index ed91a537ff7..390b94fe38a 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilterTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilterTest.java @@ -18,8 +18,8 @@ import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.ValueSource; import org.opentripplanner.apis.transmodel.model.TransmodelTransportSubmode; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.model.PickDrop; 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 0d383e65733..6617c0c3569 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 @@ -14,7 +14,7 @@ import java.util.Map; import org.junit.jupiter.api.Test; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.StopTime; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitData; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripPatternForDate; 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 6ae35a125fc..8cc8f497cfb 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 @@ -11,7 +11,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.model.StopTime; import org.opentripplanner.raptor.spi.RaptorTimeTable; diff --git a/application/src/test/java/org/opentripplanner/routing/api/DefaultRoutingServiceTest.java b/application/src/test/java/org/opentripplanner/routing/api/DefaultRoutingServiceTest.java index f1726032ca3..b249d7186d3 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/DefaultRoutingServiceTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/DefaultRoutingServiceTest.java @@ -10,7 +10,7 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Envelope; import org.opentripplanner.GtfsTest; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.SphericalDistanceLibrary; import org.opentripplanner.street.model.vertex.TransitStopVertex; import org.opentripplanner.street.model.vertex.Vertex; diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/TripLocationTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/TripLocationTest.java index c40815ba070..bfe13dbb65e 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/TripLocationTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/TripLocationTest.java @@ -7,7 +7,7 @@ import java.time.Instant; import java.time.LocalDate; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; class TripLocationTest { diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/TripOnDateReferenceTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/TripOnDateReferenceTest.java index 683c3a8ab49..3c3df140318 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/TripOnDateReferenceTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/TripOnDateReferenceTest.java @@ -5,7 +5,7 @@ import java.time.LocalDate; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; class TripOnDateReferenceTest { 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 5d6329a9aec..a6993b4cb11 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 @@ -12,7 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.test.support.TestTableParser; import org.opentripplanner.utils.time.DurationUtils; 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 0536d1ba654..06e80441b7f 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 @@ -6,7 +6,7 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.utils.time.DurationUtils; diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java index 97a4e944c85..5eaafd874bb 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java @@ -6,7 +6,7 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; class CarPreferencesTest { diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/preference/DirectTransitPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/DirectTransitPreferencesTest.java index 1dd928bdbdc..af08bfa4416 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/preference/DirectTransitPreferencesTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/preference/DirectTransitPreferencesTest.java @@ -9,7 +9,7 @@ import java.util.Optional; import org.junit.jupiter.api.Test; import org.opentripplanner._support.asserts.AssertEqualsAndHashCode; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; class DirectTransitPreferencesTest { diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/preference/TransitPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/TransitPreferencesTest.java index 3f23940624a..84092672fbd 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/preference/TransitPreferencesTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/preference/TransitPreferencesTest.java @@ -9,7 +9,7 @@ import java.time.Duration; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.raptor.spi.SearchDirection; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.transit.model.basic.TransitMode; diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferencesTest.java index b4fc468ea15..a8aa3c733e3 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferencesTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferencesTest.java @@ -6,7 +6,7 @@ import java.time.Duration; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; class VehicleParkingPreferencesTest { diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferencesTest.java index 4b7282492fd..a4efaa2f7de 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferencesTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferencesTest.java @@ -7,7 +7,7 @@ import java.time.Duration; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; class VehicleRentalPreferencesTest { diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferencesTest.java index ebc84a54af7..095cdb3411f 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferencesTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferencesTest.java @@ -5,7 +5,7 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; class VehicleWalkingPreferencesTest { diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/request/JourneyRequestTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/request/JourneyRequestTest.java index 32dd5acd6e0..8fd7b1f68b1 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/request/JourneyRequestTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/request/JourneyRequestTest.java @@ -6,7 +6,7 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.opentripplanner._support.asserts.AssertEqualsAndHashCode; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.RequestModes; import org.opentripplanner.routing.api.request.request.filter.SelectRequest; import org.opentripplanner.street.model.StreetMode; diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/request/TransitRequestTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/request/TransitRequestTest.java index 11a06ce906a..46c07e99024 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/request/TransitRequestTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/request/TransitRequestTest.java @@ -8,7 +8,7 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.opentripplanner._support.asserts.AssertEqualsAndHashCode; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.DebugRaptor; import org.opentripplanner.routing.api.request.request.filter.SelectRequest; import org.opentripplanner.routing.api.request.request.filter.TransitFilter; diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/request/filter/TransitGroupSelectTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/request/filter/TransitGroupSelectTest.java index 69111abdb37..26ae3dcaf4b 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/request/filter/TransitGroupSelectTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/request/filter/TransitGroupSelectTest.java @@ -4,7 +4,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.TransitMode; class TransitGroupSelectTest { diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/via/PassThroughViaLocationTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/via/PassThroughViaLocationTest.java index 93b8d1f160c..0d22b964900 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/via/PassThroughViaLocationTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/via/PassThroughViaLocationTest.java @@ -7,7 +7,7 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.opentripplanner._support.asserts.AssertEqualsAndHashCode; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; class PassThroughViaLocationTest { diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/via/VisitViaLocationTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/via/VisitViaLocationTest.java index 2cf4d0405b6..e21ff1ed957 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/via/VisitViaLocationTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/via/VisitViaLocationTest.java @@ -7,7 +7,7 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.opentripplanner._support.asserts.AssertEqualsAndHashCode; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; class VisitViaLocationTest { diff --git a/application/src/test/java/org/opentripplanner/routing/core/DistanceTest.java b/application/src/test/java/org/opentripplanner/routing/core/DistanceTest.java index e5caca62c2f..42738577d7d 100644 --- a/application/src/test/java/org/opentripplanner/routing/core/DistanceTest.java +++ b/application/src/test/java/org/opentripplanner/routing/core/DistanceTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Distance; +import org.opentripplanner.core.domain.model.basic.Distance; public class DistanceTest { diff --git a/application/src/test/java/org/opentripplanner/routing/core/RatioTest.java b/application/src/test/java/org/opentripplanner/routing/core/RatioTest.java index b34c6aebd1c..65518a0dcd4 100644 --- a/application/src/test/java/org/opentripplanner/routing/core/RatioTest.java +++ b/application/src/test/java/org/opentripplanner/routing/core/RatioTest.java @@ -6,7 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Ratio; +import org.opentripplanner.core.domain.model.basic.Ratio; public class RatioTest { diff --git a/application/src/test/java/org/opentripplanner/routing/core/RouteRequestTest.java b/application/src/test/java/org/opentripplanner/routing/core/RouteRequestTest.java index c9817e74bc9..fea42db8c46 100644 --- a/application/src/test/java/org/opentripplanner/routing/core/RouteRequestTest.java +++ b/application/src/test/java/org/opentripplanner/routing/core/RouteRequestTest.java @@ -16,7 +16,7 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.opentripplanner._support.asserts.AssertEqualsAndHashCode; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.model.plan.SortOrder; import org.opentripplanner.model.plan.paging.cursor.PageCursor; diff --git a/application/src/test/java/org/opentripplanner/routing/graph/GraphSerializationTest.java b/application/src/test/java/org/opentripplanner/routing/graph/GraphSerializationTest.java index 409bc9eeab2..048ac065d9f 100644 --- a/application/src/test/java/org/opentripplanner/routing/graph/GraphSerializationTest.java +++ b/application/src/test/java/org/opentripplanner/routing/graph/GraphSerializationTest.java @@ -22,7 +22,7 @@ import org.locationtech.jts.geom.Polygon; import org.opentripplanner.ConstantsForTests; import org.opentripplanner.TestOtpModel; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.datastore.api.FileType; import org.opentripplanner.datastore.file.FileDataSource; import org.opentripplanner.ext.emission.EmissionRepository; diff --git a/application/src/test/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImplTest.java b/application/src/test/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImplTest.java index 0e98b754b8a..0e26eb0f010 100644 --- a/application/src/test/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImplTest.java +++ b/application/src/test/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImplTest.java @@ -4,7 +4,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.alertpatch.EntitySelector; import org.opentripplanner.routing.alertpatch.TransitAlert; diff --git a/application/src/test/java/org/opentripplanner/routing/impl/TransitAlertServiceImplTest.java b/application/src/test/java/org/opentripplanner/routing/impl/TransitAlertServiceImplTest.java index 49f817136bb..426db838009 100644 --- a/application/src/test/java/org/opentripplanner/routing/impl/TransitAlertServiceImplTest.java +++ b/application/src/test/java/org/opentripplanner/routing/impl/TransitAlertServiceImplTest.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.alertpatch.AlertCause; import org.opentripplanner.routing.alertpatch.EntitySelector; import org.opentripplanner.routing.alertpatch.TransitAlert; diff --git a/application/src/test/java/org/opentripplanner/routing/linking/LinkingContextFactoryTest.java b/application/src/test/java/org/opentripplanner/routing/linking/LinkingContextFactoryTest.java index 51d34090d48..e1201a87621 100644 --- a/application/src/test/java/org/opentripplanner/routing/linking/LinkingContextFactoryTest.java +++ b/application/src/test/java/org/opentripplanner/routing/linking/LinkingContextFactoryTest.java @@ -17,7 +17,7 @@ import java.util.Set; import java.util.stream.Collectors; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.routing.api.response.InputField; import org.opentripplanner.routing.api.response.RoutingErrorCode; diff --git a/application/src/test/java/org/opentripplanner/routing/stoptimes/AlternativeLegsTest.java b/application/src/test/java/org/opentripplanner/routing/stoptimes/AlternativeLegsTest.java index 94283a495db..051282373fc 100644 --- a/application/src/test/java/org/opentripplanner/routing/stoptimes/AlternativeLegsTest.java +++ b/application/src/test/java/org/opentripplanner/routing/stoptimes/AlternativeLegsTest.java @@ -6,8 +6,8 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.opentripplanner.GtfsTest; -import org.opentripplanner.core.model.basic.Cost; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.model.plan.leg.ScheduledTransitLeg; diff --git a/application/src/test/java/org/opentripplanner/routing/trippattern/FrequencyEntryTest.java b/application/src/test/java/org/opentripplanner/routing/trippattern/FrequencyEntryTest.java index 4ed6c3aa6ed..e50ebed71cc 100644 --- a/application/src/test/java/org/opentripplanner/routing/trippattern/FrequencyEntryTest.java +++ b/application/src/test/java/org/opentripplanner/routing/trippattern/FrequencyEntryTest.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.model.Frequency; import org.opentripplanner.model.StopTime; diff --git a/application/src/test/java/org/opentripplanner/service/realtimevehicles/internal/DefaultRealtimeVehicleRepositoryTest.java b/application/src/test/java/org/opentripplanner/service/realtimevehicles/internal/DefaultRealtimeVehicleRepositoryTest.java index d0de3aead02..9887a1c3709 100644 --- a/application/src/test/java/org/opentripplanner/service/realtimevehicles/internal/DefaultRealtimeVehicleRepositoryTest.java +++ b/application/src/test/java/org/opentripplanner/service/realtimevehicles/internal/DefaultRealtimeVehicleRepositoryTest.java @@ -8,7 +8,7 @@ import java.time.Instant; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.realtimevehicles.model.RealtimeVehicle; import org.opentripplanner.transit.model.TransitTestEnvironment; import org.opentripplanner.transit.model.TripInput; diff --git a/application/src/test/java/org/opentripplanner/service/vehicleparking/VehicleParkingTestUtil.java b/application/src/test/java/org/opentripplanner/service/vehicleparking/VehicleParkingTestUtil.java index 7c53c92c6fd..37c514a089e 100644 --- a/application/src/test/java/org/opentripplanner/service/vehicleparking/VehicleParkingTestUtil.java +++ b/application/src/test/java/org/opentripplanner/service/vehicleparking/VehicleParkingTestUtil.java @@ -1,7 +1,7 @@ package org.opentripplanner.service.vehicleparking; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehicleparking.model.VehicleParkingSpaces; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/application/src/test/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java b/application/src/test/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java index fa9596eda0c..5f62d100ad2 100644 --- a/application/src/test/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java +++ b/application/src/test/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java @@ -7,11 +7,11 @@ import java.time.OffsetDateTime; import java.time.ZoneOffset; import javax.annotation.Nullable; -import org.opentripplanner.core.model.basic.Distance; -import org.opentripplanner.core.model.basic.Ratio; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.basic.Distance; +import org.opentripplanner.core.domain.model.basic.Ratio; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.model.RentalFormFactor; public class TestFreeFloatingRentalVehicleBuilder { diff --git a/application/src/test/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java b/application/src/test/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java index 4ce982c1e22..b52e427cae5 100644 --- a/application/src/test/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java +++ b/application/src/test/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java @@ -2,9 +2,9 @@ import java.util.HashMap; import java.util.Map; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.model.RentalFormFactor; public class TestVehicleRentalStationBuilder { diff --git a/application/src/test/java/org/opentripplanner/standalone/config/framework/json/EnumMapperTest.java b/application/src/test/java/org/opentripplanner/standalone/config/framework/json/EnumMapperTest.java index b2bfb5ee735..db113788704 100644 --- a/application/src/test/java/org/opentripplanner/standalone/config/framework/json/EnumMapperTest.java +++ b/application/src/test/java/org/opentripplanner/standalone/config/framework/json/EnumMapperTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.doc.DocumentedEnum; +import org.opentripplanner.core.domain.model.doc.DocumentedEnum; class EnumMapperTest { diff --git a/application/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java b/application/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java index 41e1874343a..3e94f0b6e9b 100644 --- a/application/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java +++ b/application/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java @@ -25,7 +25,7 @@ import java.util.Set; import org.junit.jupiter.api.Test; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.framework.application.OtpAppException; import org.opentripplanner.framework.model.Gram; diff --git a/application/src/test/java/org/opentripplanner/standalone/server/AlertMetricsTest.java b/application/src/test/java/org/opentripplanner/standalone/server/AlertMetricsTest.java index b387e50b1a0..a1ed7323645 100644 --- a/application/src/test/java/org/opentripplanner/standalone/server/AlertMetricsTest.java +++ b/application/src/test/java/org/opentripplanner/standalone/server/AlertMetricsTest.java @@ -8,7 +8,7 @@ import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.routing.alertpatch.EntitySelector; import org.opentripplanner.routing.alertpatch.TransitAlert; import org.opentripplanner.routing.alertpatch.TransitAlertBuilder; diff --git a/application/src/test/java/org/opentripplanner/street/integration/EdgeSplittingTest.java b/application/src/test/java/org/opentripplanner/street/integration/EdgeSplittingTest.java index 63ec174dcf3..1a3c7796369 100644 --- a/application/src/test/java/org/opentripplanner/street/integration/EdgeSplittingTest.java +++ b/application/src/test/java/org/opentripplanner/street/integration/EdgeSplittingTest.java @@ -14,7 +14,7 @@ import org.locationtech.jts.linearref.LinearLocation; import org.opentripplanner.astar.model.GraphPath; import org.opentripplanner.astar.model.ShortestPathTree; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.linking.LinkingContextFactory; diff --git a/application/src/test/java/org/opentripplanner/streetadapter/StreetSearchRequestMapperTest.java b/application/src/test/java/org/opentripplanner/streetadapter/StreetSearchRequestMapperTest.java index 9b5ca0d743a..4f977556dcc 100644 --- a/application/src/test/java/org/opentripplanner/streetadapter/StreetSearchRequestMapperTest.java +++ b/application/src/test/java/org/opentripplanner/streetadapter/StreetSearchRequestMapperTest.java @@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.opentripplanner.core.model.basic.Cost.costOfSeconds; +import static org.opentripplanner.core.domain.model.basic.Cost.costOfSeconds; import static org.opentripplanner.core.model.id.FeedScopedIdForTestFactory.id; import java.time.Duration; @@ -14,8 +14,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import org.opentripplanner.core.model.basic.Cost; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.routing.api.request.RequestModes; diff --git a/application/src/test/java/org/opentripplanner/transfer/constrained/raptoradaptor/ConstrainedBoardingSearchTest.java b/application/src/test/java/org/opentripplanner/transfer/constrained/raptoradaptor/ConstrainedBoardingSearchTest.java index bbe54de6c81..b252ba51847 100644 --- a/application/src/test/java/org/opentripplanner/transfer/constrained/raptoradaptor/ConstrainedBoardingSearchTest.java +++ b/application/src/test/java/org/opentripplanner/transfer/constrained/raptoradaptor/ConstrainedBoardingSearchTest.java @@ -15,7 +15,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.raptor.spi.RaptorBoardOrAlightEvent; diff --git a/application/src/test/java/org/opentripplanner/transfer/constrained/raptoradaptor/TransferIndexGeneratorTest.java b/application/src/test/java/org/opentripplanner/transfer/constrained/raptoradaptor/TransferIndexGeneratorTest.java index 384f09497db..f30b499cd36 100644 --- a/application/src/test/java/org/opentripplanner/transfer/constrained/raptoradaptor/TransferIndexGeneratorTest.java +++ b/application/src/test/java/org/opentripplanner/transfer/constrained/raptoradaptor/TransferIndexGeneratorTest.java @@ -11,7 +11,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.algorithm.raptoradapter.transit.request.TestRouteData; import org.opentripplanner.transfer.constrained.model.ConstrainedTransfer; import org.opentripplanner.transfer.constrained.model.StopTransferPoint; diff --git a/application/src/test/java/org/opentripplanner/transfer/regular/index/RaptorTransferIndexTest.java b/application/src/test/java/org/opentripplanner/transfer/regular/index/RaptorTransferIndexTest.java index dd3da020ba5..8530fa35c92 100644 --- a/application/src/test/java/org/opentripplanner/transfer/regular/index/RaptorTransferIndexTest.java +++ b/application/src/test/java/org/opentripplanner/transfer/regular/index/RaptorTransferIndexTest.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.function.Consumer; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.model.StreetMode; import org.opentripplanner.street.search.request.StreetSearchRequest; import org.opentripplanner.transfer.regular.model.DefaultRaptorTransfer; diff --git a/application/src/test/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequestBuilderTest.java b/application/src/test/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequestBuilderTest.java index 992fb2ee9d2..fd9028b3107 100644 --- a/application/src/test/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequestBuilderTest.java +++ b/application/src/test/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequestBuilderTest.java @@ -12,8 +12,8 @@ import java.time.LocalDate; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.LocalDateRange; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.filter.selector.FilterRequest; diff --git a/application/src/test/java/org/opentripplanner/transit/model/_data/PatternTestModel.java b/application/src/test/java/org/opentripplanner/transit/model/_data/PatternTestModel.java index 1b07570b302..d0a571413b7 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/_data/PatternTestModel.java +++ b/application/src/test/java/org/opentripplanner/transit/model/_data/PatternTestModel.java @@ -2,7 +2,7 @@ import static org.opentripplanner.core.model.id.FeedScopedIdForTestFactory.id; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.network.StopPattern; import org.opentripplanner.transit.model.network.TripPattern; diff --git a/application/src/test/java/org/opentripplanner/transit/model/_data/TransitRepositoryForTest.java b/application/src/test/java/org/opentripplanner/transit/model/_data/TransitRepositoryForTest.java index 8a4a6586b7c..b4238cfa516 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/_data/TransitRepositoryForTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/_data/TransitRepositoryForTest.java @@ -12,9 +12,9 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Polygon; import org.opentripplanner._support.geometry.Coordinates; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.ScheduledDeviatedTrip; import org.opentripplanner.ext.flex.trip.UnscheduledTrip; import org.opentripplanner.model.PickDrop; diff --git a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/RegularStopMatcherFactoryTest.java b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/RegularStopMatcherFactoryTest.java index 71728cc1687..cbc11ec1bc2 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/RegularStopMatcherFactoryTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/RegularStopMatcherFactoryTest.java @@ -6,7 +6,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.site.RegularStop; class RegularStopMatcherFactoryTest { diff --git a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/RouteMatcherFactoryTest.java b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/RouteMatcherFactoryTest.java index aae8c242e51..9645b9001ac 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/RouteMatcherFactoryTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/RouteMatcherFactoryTest.java @@ -7,8 +7,8 @@ import java.util.Set; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.api.model.FilterValues; import org.opentripplanner.transit.api.request.FindRoutesRequest; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/StopLocationMatcherFactoryTest.java b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/StopLocationMatcherFactoryTest.java index a1506714570..6fe91888d34 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/StopLocationMatcherFactoryTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/StopLocationMatcherFactoryTest.java @@ -6,8 +6,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.api.request.FindStopLocationsRequest; import org.opentripplanner.transit.model.filter.expr.Matcher; import org.opentripplanner.transit.model.site.RegularStop; diff --git a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TransitAlertMatcherFactoryTest.java b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TransitAlertMatcherFactoryTest.java index ad9373056fd..dfbb27eb7b0 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TransitAlertMatcherFactoryTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TransitAlertMatcherFactoryTest.java @@ -9,8 +9,8 @@ import java.util.function.UnaryOperator; import javax.annotation.Nullable; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.routing.alertpatch.AlertCalendar; import org.opentripplanner.routing.alertpatch.AlertCause; import org.opentripplanner.routing.alertpatch.AlertEffect; diff --git a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripMatcherFactoryTest.java b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripMatcherFactoryTest.java index dfbd06d9675..2750362e31e 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripMatcherFactoryTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripMatcherFactoryTest.java @@ -9,7 +9,7 @@ import java.util.Set; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.api.request.TripRequest; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.filter.expr.Matcher; diff --git a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactoryTest.java b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactoryTest.java index 44f9abc4e4b..9e25348da9a 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactoryTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactoryTest.java @@ -12,8 +12,8 @@ import java.util.function.Function; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.time.LocalDateRange; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.transit.api.model.FilterValues; import org.opentripplanner.transit.api.request.TripOnServiceDateRequest; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripTimeOnDateMatcherFactoryTest.java b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripTimeOnDateMatcherFactoryTest.java index 729d16ac123..a5928e29da1 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripTimeOnDateMatcherFactoryTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripTimeOnDateMatcherFactoryTest.java @@ -11,7 +11,7 @@ import java.util.List; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.transit.api.request.CancellationPolicy; import org.opentripplanner.transit.api.request.TripTimeOnDateRequest; diff --git a/application/src/test/java/org/opentripplanner/transit/model/framework/EntityByIdTest.java b/application/src/test/java/org/opentripplanner/transit/model/framework/EntityByIdTest.java index be23c13f591..a0e100f34b3 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/framework/EntityByIdTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/framework/EntityByIdTest.java @@ -6,7 +6,7 @@ import java.util.Collections; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; public class EntityByIdTest { diff --git a/application/src/test/java/org/opentripplanner/transit/model/framework/EntityNotFoundExceptionTest.java b/application/src/test/java/org/opentripplanner/transit/model/framework/EntityNotFoundExceptionTest.java index 3ca020a3151..f16ab1580d1 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/framework/EntityNotFoundExceptionTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/framework/EntityNotFoundExceptionTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; class EntityNotFoundExceptionTest { diff --git a/application/src/test/java/org/opentripplanner/transit/model/network/RouteTest.java b/application/src/test/java/org/opentripplanner/transit/model/network/RouteTest.java index c683084280b..1186590f89c 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/network/RouteTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/network/RouteTest.java @@ -7,8 +7,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.basic.SubMode; diff --git a/application/src/test/java/org/opentripplanner/transit/model/network/grouppriority/MatchersTest.java b/application/src/test/java/org/opentripplanner/transit/model/network/grouppriority/MatchersTest.java index 5e031e3f55c..838860b0f77 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/network/grouppriority/MatchersTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/network/grouppriority/MatchersTest.java @@ -6,7 +6,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.algorithm.raptoradapter.transit.request.TestRouteData; import org.opentripplanner.routing.api.request.request.filter.TransitGroupSelect; import org.opentripplanner.transit.model.basic.TransitMode; diff --git a/application/src/test/java/org/opentripplanner/transit/model/site/AreaStopTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/AreaStopTest.java index b13b0a191c7..b4d8244200b 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/site/AreaStopTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/site/AreaStopTest.java @@ -9,8 +9,8 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Geometry; import org.opentripplanner._support.geometry.Polygons; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/application/src/test/java/org/opentripplanner/transit/model/site/BoardingAreaTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/BoardingAreaTest.java index 8aa5022ff26..3938da68bc0 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/site/BoardingAreaTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/site/BoardingAreaTest.java @@ -7,8 +7,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/test/java/org/opentripplanner/transit/model/site/EntranceTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/EntranceTest.java index 1d0bb8f1054..3cb086961f6 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/site/EntranceTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/site/EntranceTest.java @@ -7,9 +7,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/test/java/org/opentripplanner/transit/model/site/GroupOfStationsTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/GroupOfStationsTest.java index 36b421c3b22..6a0b5254896 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/site/GroupOfStationsTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/site/GroupOfStationsTest.java @@ -7,8 +7,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/test/java/org/opentripplanner/transit/model/site/GroupStopTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/GroupStopTest.java index 81f4b2d1f17..9c9b2e5b355 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/site/GroupStopTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/site/GroupStopTest.java @@ -12,8 +12,8 @@ import org.locationtech.jts.geom.Geometry; import org.opentripplanner._support.geometry.Coordinates; import org.opentripplanner._support.geometry.Polygons; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.service.SiteRepository; diff --git a/application/src/test/java/org/opentripplanner/transit/model/site/MultiModalStationTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/MultiModalStationTest.java index e6b620eef97..7e6e2749df9 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/site/MultiModalStationTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/site/MultiModalStationTest.java @@ -8,8 +8,8 @@ import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/test/java/org/opentripplanner/transit/model/site/PathwayNodeTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/PathwayNodeTest.java index 379be6a7c87..dc68a790c3b 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/site/PathwayNodeTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/site/PathwayNodeTest.java @@ -7,9 +7,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/test/java/org/opentripplanner/transit/model/site/RegularStopTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/RegularStopTest.java index dd777a5c9de..b4f9cbd0e7b 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/site/RegularStopTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/site/RegularStopTest.java @@ -9,10 +9,10 @@ import java.time.ZoneId; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/test/java/org/opentripplanner/transit/model/site/StationTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/StationTest.java index 033f2da2bc9..0d5af537cec 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/site/StationTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/site/StationTest.java @@ -8,8 +8,8 @@ import java.time.ZoneId; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/test/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimesTest.java b/application/src/test/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimesTest.java index 4d0ba9aa080..bd789529841 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimesTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimesTest.java @@ -13,9 +13,9 @@ import java.util.List; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.StopTime; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.framework.DataValidationException; 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 fe9a12d2523..7aaf9d00dd3 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,8 +10,8 @@ import java.util.BitSet; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.framework.DataValidationException; import org.opentripplanner.utils.time.TimeUtils; diff --git a/application/src/test/java/org/opentripplanner/transit/model/timetable/TripTest.java b/application/src/test/java/org/opentripplanner/transit/model/timetable/TripTest.java index 093dee04550..2bc41452c69 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/timetable/TripTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/timetable/TripTest.java @@ -5,9 +5,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.basic.SubMode; diff --git a/application/src/test/java/org/opentripplanner/transit/repository/DefaultTimetableRepositoryTest.java b/application/src/test/java/org/opentripplanner/transit/repository/DefaultTimetableRepositoryTest.java index 27c6f330e73..350a179873c 100644 --- a/application/src/test/java/org/opentripplanner/transit/repository/DefaultTimetableRepositoryTest.java +++ b/application/src/test/java/org/opentripplanner/transit/repository/DefaultTimetableRepositoryTest.java @@ -23,7 +23,7 @@ import org.opentripplanner.ConstantsForTests; import org.opentripplanner.TestOtpModel; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.StopTime; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitDataTestFactory; import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.TimetableUpdateMapper; diff --git a/application/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java b/application/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java index 551238dd389..f7bb4fec1c8 100644 --- a/application/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java +++ b/application/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java @@ -22,9 +22,9 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Envelope; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.model.calendar.CalendarServiceData; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitDataTestFactory; diff --git a/application/src/test/java/org/opentripplanner/transit/service/PatternByServiceDatesFilterTest.java b/application/src/test/java/org/opentripplanner/transit/service/PatternByServiceDatesFilterTest.java index 079c972288a..fad0d9bc341 100644 --- a/application/src/test/java/org/opentripplanner/transit/service/PatternByServiceDatesFilterTest.java +++ b/application/src/test/java/org/opentripplanner/transit/service/PatternByServiceDatesFilterTest.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.core.model.time.LocalDateRange; +import org.opentripplanner.core.domain.model.time.LocalDateRange; import org.opentripplanner.transit.model._data.PatternTestModel; import org.opentripplanner.transit.model.network.TripPattern; diff --git a/application/src/test/java/org/opentripplanner/transit/service/SiteRepositoryTest.java b/application/src/test/java/org/opentripplanner/transit/service/SiteRepositoryTest.java index 19997c3be38..4638c98ec60 100644 --- a/application/src/test/java/org/opentripplanner/transit/service/SiteRepositoryTest.java +++ b/application/src/test/java/org/opentripplanner/transit/service/SiteRepositoryTest.java @@ -8,8 +8,8 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/application/src/test/java/org/opentripplanner/transit/service/StopTimesHelperTest.java b/application/src/test/java/org/opentripplanner/transit/service/StopTimesHelperTest.java index adb32100742..105e8dd622e 100644 --- a/application/src/test/java/org/opentripplanner/transit/service/StopTimesHelperTest.java +++ b/application/src/test/java/org/opentripplanner/transit/service/StopTimesHelperTest.java @@ -13,7 +13,7 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.ConstantsForTests; import org.opentripplanner.TestOtpModel; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.StopTimesInPattern; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.transit.api.request.CancellationPolicy; diff --git a/application/src/test/java/org/opentripplanner/transit/service/TransitRepositoryTest.java b/application/src/test/java/org/opentripplanner/transit/service/TransitRepositoryTest.java index a9d42283cd1..7a1b870c8ac 100644 --- a/application/src/test/java/org/opentripplanner/transit/service/TransitRepositoryTest.java +++ b/application/src/test/java/org/opentripplanner/transit/service/TransitRepositoryTest.java @@ -13,7 +13,7 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.ConstantsForTests; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.ext.fares.service.gtfs.v1.GtfsFareServiceFactory; import org.opentripplanner.graph_builder.module.TimeZoneAdjusterModule; import org.opentripplanner.street.graph.Graph; diff --git a/application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java b/application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java index 014704e7cc5..5b0f1f844fe 100644 --- a/application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java +++ b/application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Map; import java.util.function.Predicate; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; import org.opentripplanner.framework.application.OtpAppException; import org.opentripplanner.framework.transaction.TimetableSnapshotParameters; import org.opentripplanner.framework.transaction.api.RepositoryHandle; diff --git a/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/io/TestCaseDefinitionCsvFile.java b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/io/TestCaseDefinitionCsvFile.java index 19935ee5645..5a9e46d3635 100644 --- a/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/io/TestCaseDefinitionCsvFile.java +++ b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/io/TestCaseDefinitionCsvFile.java @@ -5,7 +5,7 @@ import java.util.List; import javax.annotation.Nullable; import org.opentripplanner.api.parameter.QualifiedModeSet; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.routing.api.request.via.VisitViaLocation; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/application/src/test/java/org/opentripplanner/updater/alert/gtfs/AlertsUpdateHandlerTest.java b/application/src/test/java/org/opentripplanner/updater/alert/gtfs/AlertsUpdateHandlerTest.java index e424ea57ff1..ae58cda7381 100644 --- a/application/src/test/java/org/opentripplanner/updater/alert/gtfs/AlertsUpdateHandlerTest.java +++ b/application/src/test/java/org/opentripplanner/updater/alert/gtfs/AlertsUpdateHandlerTest.java @@ -19,7 +19,7 @@ import java.util.Optional; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.TranslatedString; +import org.opentripplanner.core.domain.model.i18n.TranslatedString; import org.opentripplanner.routing.alertpatch.AlertCause; import org.opentripplanner.routing.alertpatch.AlertEffect; import org.opentripplanner.routing.alertpatch.AlertSeverity; diff --git a/application/src/test/java/org/opentripplanner/updater/alert/siri/SiriAlertsUpdateHandlerTest.java b/application/src/test/java/org/opentripplanner/updater/alert/siri/SiriAlertsUpdateHandlerTest.java index e0389a2b472..2c410862d40 100644 --- a/application/src/test/java/org/opentripplanner/updater/alert/siri/SiriAlertsUpdateHandlerTest.java +++ b/application/src/test/java/org/opentripplanner/updater/alert/siri/SiriAlertsUpdateHandlerTest.java @@ -22,8 +22,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.opentripplanner.GtfsTest; -import org.opentripplanner.core.model.id.FeedScopedId; -import org.opentripplanner.core.model.time.TimePeriod; +import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.time.TimePeriod; import org.opentripplanner.routing.alertpatch.AlertSeverity; import org.opentripplanner.routing.alertpatch.AlertUrl; import org.opentripplanner.routing.alertpatch.EntityKey; diff --git a/application/src/test/java/org/opentripplanner/updater/spi/UpdateErrorTest.java b/application/src/test/java/org/opentripplanner/updater/spi/UpdateErrorTest.java index 40dc8719e90..1fcd663fdf8 100644 --- a/application/src/test/java/org/opentripplanner/updater/spi/UpdateErrorTest.java +++ b/application/src/test/java/org/opentripplanner/updater/spi/UpdateErrorTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; class UpdateErrorTest { diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/LegacyTimetableRepositoryIntegrationTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/LegacyTimetableRepositoryIntegrationTest.java index cff2fe3ea67..f451ace019b 100644 --- a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/LegacyTimetableRepositoryIntegrationTest.java +++ b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/LegacyTimetableRepositoryIntegrationTest.java @@ -22,7 +22,7 @@ import org.opentripplanner.ConstantsForTests; import org.opentripplanner.TestOtpModel; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitDataTestFactory; import org.opentripplanner.transit.model.calendar.TripCalendars; import org.opentripplanner.transit.model.framework.Deduplicator; diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/TripTimesUpdaterTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/TripTimesUpdaterTest.java index 6194ab5e140..43adb620571 100644 --- a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/TripTimesUpdaterTest.java +++ b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/TripTimesUpdaterTest.java @@ -31,8 +31,8 @@ import org.opentripplanner.ConstantsForTests; import org.opentripplanner.TestOtpModel; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.PickDrop; import org.opentripplanner.transit.model.framework.Deduplicator; import org.opentripplanner.transit.model.network.TripPattern; diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/interpolation/NoDataBackwardsEarlinessInterpolatorTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/interpolation/NoDataBackwardsEarlinessInterpolatorTest.java index 32ff330ab8e..2b3744fe902 100644 --- a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/interpolation/NoDataBackwardsEarlinessInterpolatorTest.java +++ b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/interpolation/NoDataBackwardsEarlinessInterpolatorTest.java @@ -10,7 +10,7 @@ import java.util.List; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.timetable.ScheduledTripTimes; import org.opentripplanner.transit.model.timetable.Trip; diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/AddedTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/AddedTest.java index 138c5e4f84b..4998c192606 100644 --- a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/AddedTest.java +++ b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/AddedTest.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Objects; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.model.PickDrop; import org.opentripplanner.transit.model.TransitTestEnvironment; import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder; diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/ReplacementTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/ReplacementTest.java index 1e2ba836ab5..eb24a8e9598 100644 --- a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/ReplacementTest.java +++ b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/ReplacementTest.java @@ -12,7 +12,7 @@ import static org.opentripplanner.updater.spi.UpdateResultAssertions.assertFailure; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.transit.model.TransitTestEnvironment; import org.opentripplanner.transit.model.TripInput; import org.opentripplanner.updater.trip.RealtimeTestConstants; diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/AddedTripBuilderTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/AddedTripBuilderTest.java index 30fec6aa885..a9bc120d525 100644 --- a/application/src/test/java/org/opentripplanner/updater/trip/siri/AddedTripBuilderTest.java +++ b/application/src/test/java/org/opentripplanner/updater/trip/siri/AddedTripBuilderTest.java @@ -19,7 +19,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.calendar.CalendarServiceData; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitDataTestFactory; diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/EntityResolverTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/EntityResolverTest.java index 968547ec042..8524221b52c 100644 --- a/application/src/test/java/org/opentripplanner/updater/trip/siri/EntityResolverTest.java +++ b/application/src/test/java/org/opentripplanner/updater/trip/siri/EntityResolverTest.java @@ -9,7 +9,7 @@ import java.util.function.UnaryOperator; import org.junit.jupiter.api.Test; import org.opentripplanner.LocalTimeParser; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.service.DefaultTransitService; diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/ModifiedTripBuilderTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/ModifiedTripBuilderTest.java index 6de86c8f7e3..87c8a33f62e 100644 --- a/application/src/test/java/org/opentripplanner/updater/trip/siri/ModifiedTripBuilderTest.java +++ b/application/src/test/java/org/opentripplanner/updater/trip/siri/ModifiedTripBuilderTest.java @@ -14,7 +14,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.calendar.CalendarServiceData; diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/TimetableHelperTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/TimetableHelperTest.java index ac5cce2cb76..242912e6bec 100644 --- a/application/src/test/java/org/opentripplanner/updater/trip/siri/TimetableHelperTest.java +++ b/application/src/test/java/org/opentripplanner/updater/trip/siri/TimetableHelperTest.java @@ -11,8 +11,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.StopTime; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.Deduplicator; diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/extrajourney/ExtraJourneyTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/extrajourney/ExtraJourneyTest.java index 4b593794c81..044ac325da6 100644 --- a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/extrajourney/ExtraJourneyTest.java +++ b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/extrajourney/ExtraJourneyTest.java @@ -11,7 +11,7 @@ import static org.opentripplanner.updater.spi.UpdateResultAssertions.assertSuccess; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.model.PickDrop; import org.opentripplanner.transit.model.TransitTestEnvironment; import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder; diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/replacement/PartialReplacementTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/replacement/PartialReplacementTest.java index 95e5897df7b..1cbffd4e6c5 100644 --- a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/replacement/PartialReplacementTest.java +++ b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/replacement/PartialReplacementTest.java @@ -6,7 +6,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.TransitTestEnvironment; import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder; import org.opentripplanner.transit.model.TripInput; diff --git a/application/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingAvailabilityUpdaterTest.java b/application/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingAvailabilityUpdaterTest.java index c69c014e694..1631ecc905c 100644 --- a/application/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingAvailabilityUpdaterTest.java +++ b/application/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingAvailabilityUpdaterTest.java @@ -8,8 +8,8 @@ import java.util.List; import java.util.concurrent.CompletableFuture; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehicleparking.VehicleParkingRepository; import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingRepository; import org.opentripplanner.service.vehicleparking.model.VehicleParking; diff --git a/application/src/test/java/org/opentripplanner/updater/vehicle_position/RealtimeVehicleMatcherTest.java b/application/src/test/java/org/opentripplanner/updater/vehicle_position/RealtimeVehicleMatcherTest.java index 574ec41cfa4..934f37b2d0b 100644 --- a/application/src/test/java/org/opentripplanner/updater/vehicle_position/RealtimeVehicleMatcherTest.java +++ b/application/src/test/java/org/opentripplanner/updater/vehicle_position/RealtimeVehicleMatcherTest.java @@ -29,7 +29,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.ValueSource; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.model.StopTime; import org.opentripplanner.service.realtimevehicles.RealtimeVehicleRepository; diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorNoop.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorNoop.java index ca44a25884e..c716c159429 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorNoop.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorNoop.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.framework.deduplicator; +package org.opentripplanner.core.domain.framework.deduplicator; import java.util.BitSet; import java.util.List; diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorService.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorService.java index 4593fb459ad..b7bde4d191f 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorService.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorService.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.framework.deduplicator; +package org.opentripplanner.core.domain.framework.deduplicator; import java.util.BitSet; import java.util.List; diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/di/TransitServicePeriod.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/di/TransitServicePeriod.java index 33d60781297..a5123866934 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/di/TransitServicePeriod.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/di/TransitServicePeriod.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.framework.di; +package org.opentripplanner.core.domain.framework.di; import java.lang.annotation.ElementType; import java.lang.annotation.Target; diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleAdaptor.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleAdaptor.java index ff73f546dde..f6afb77d5ef 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleAdaptor.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleAdaptor.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.framework.resources; +package org.opentripplanner.core.domain.framework.resources; import java.util.Locale; import java.util.MissingResourceException; diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleSingleton.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleSingleton.java index c541665bcf8..829e221003d 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleSingleton.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleSingleton.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.framework.resources; +package org.opentripplanner.core.domain.framework.resources; import java.util.Locale; import java.util.MissingResourceException; diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/accessibility/Accessibility.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/accessibility/Accessibility.java index a9cc673f55d..2bdf0ad5c6b 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/model/accessibility/Accessibility.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/model/accessibility/Accessibility.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.model.accessibility; +package org.opentripplanner.core.domain.model.accessibility; /** * Use this class to describe if a feature is accessible {@code POSSIBLE}, not accessible diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/Cost.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/Cost.java index 2908c696bbf..762df2259a3 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/Cost.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/Cost.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.model.basic; +package org.opentripplanner.core.domain.model.basic; import java.io.Serializable; import java.time.Duration; diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/Distance.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/Distance.java index 71a19e0c3e6..c2fcc8f889c 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/Distance.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/Distance.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.model.basic; +package org.opentripplanner.core.domain.model.basic; import java.util.Optional; import java.util.function.Consumer; diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/NormalizedCost.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/NormalizedCost.java index 05246d2e1ee..5d686b8a8ca 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/NormalizedCost.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/NormalizedCost.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.model.basic; +package org.opentripplanner.core.domain.model.basic; /// A type safe normalized representation of a cost, like generalized-cost. A cost unit is /// equivalent of riding transit for 1 seconds. Note! The resolution of the normalized cost is diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/Ratio.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/Ratio.java index b273d23069b..52354ecc0b5 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/Ratio.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/Ratio.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.model.basic; +package org.opentripplanner.core.domain.model.basic; import java.util.Optional; import java.util.function.Consumer; diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/doc/DocumentedEnum.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/doc/DocumentedEnum.java index 59ea5ff22b7..7a4fa807efd 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/model/doc/DocumentedEnum.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/model/doc/DocumentedEnum.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.model.doc; +package org.opentripplanner.core.domain.model.doc; /** * This interface is used to allow the enum documentation to be written in one place, and reused in diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NString.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NString.java index 380805b6e3a..dbea079850e 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NString.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NString.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.model.i18n; +package org.opentripplanner.core.domain.model.i18n; import java.util.Locale; import javax.annotation.Nullable; diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NStringMapper.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NStringMapper.java index f4fb3f5819a..a558b085376 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NStringMapper.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NStringMapper.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.model.i18n; +package org.opentripplanner.core.domain.model.i18n; import java.util.Locale; import javax.annotation.Nullable; diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedString.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedString.java index 16b8f3dc9ae..852687fd45e 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedString.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedString.java @@ -1,11 +1,11 @@ -package org.opentripplanner.core.model.i18n; +package org.opentripplanner.core.domain.model.i18n; import java.io.Serializable; import java.util.Arrays; import java.util.Locale; import java.util.Objects; import java.util.regex.Pattern; -import org.opentripplanner.core.framework.resources.ResourceBundleSingleton; +import org.opentripplanner.core.domain.framework.resources.ResourceBundleSingleton; /** * This is used to localize strings for which localization are known beforehand. Those are local diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringFormat.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringFormat.java index 00a934d77bd..eb0cc7061eb 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringFormat.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringFormat.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.model.i18n; +package org.opentripplanner.core.domain.model.i18n; import java.io.Serializable; import java.util.Arrays; diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/NonLocalizedString.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/NonLocalizedString.java index 9a0d9b22c38..bb7b4d8db11 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/NonLocalizedString.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/NonLocalizedString.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.model.i18n; +package org.opentripplanner.core.domain.model.i18n; import java.io.Serializable; import java.util.Locale; diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/TranslatedString.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/TranslatedString.java index 7c044f27729..538b495dddd 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/TranslatedString.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/TranslatedString.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.model.i18n; +package org.opentripplanner.core.domain.model.i18n; import java.io.Serializable; import java.util.ArrayList; diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/id/FeedScopedId.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/id/FeedScopedId.java index a05e845a2c4..f67c6051fa2 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/model/id/FeedScopedId.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/model/id/FeedScopedId.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.model.id; +package org.opentripplanner.core.domain.model.id; import static org.opentripplanner.utils.lang.StringUtils.assertHasValue; diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/time/LocalDateRange.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/time/LocalDateRange.java index bd97234d632..4a1e4b52a7c 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/model/time/LocalDateRange.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/model/time/LocalDateRange.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.model.time; +package org.opentripplanner.core.domain.model.time; import static java.time.LocalDate.MAX; import static java.time.LocalDate.MIN; diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/time/TimePeriod.java b/core/domain/src/main/java/org/opentripplanner/core/domain/model/time/TimePeriod.java index be644bf7d2a..6add1614867 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/model/time/TimePeriod.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/model/time/TimePeriod.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.model.time; +package org.opentripplanner.core.domain.model.time; import java.time.Instant; import java.util.Objects; diff --git a/core/domain/src/test/java/org/opentripplanner/core/domain/model/i18n/I18NStringTest.java b/core/domain/src/test/java/org/opentripplanner/core/domain/model/i18n/I18NStringTest.java index 8556ba24685..23322d27949 100644 --- a/core/domain/src/test/java/org/opentripplanner/core/domain/model/i18n/I18NStringTest.java +++ b/core/domain/src/test/java/org/opentripplanner/core/domain/model/i18n/I18NStringTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.model.i18n; +package org.opentripplanner.core.domain.model.i18n; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/core/domain/src/test/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringTest.java b/core/domain/src/test/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringTest.java index 36d4edb0c81..362f68e5d2f 100644 --- a/core/domain/src/test/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringTest.java +++ b/core/domain/src/test/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.model.i18n; +package org.opentripplanner.core.domain.model.i18n; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/core/domain/src/test/java/org/opentripplanner/core/domain/model/i18n/TranslatedStringTest.java b/core/domain/src/test/java/org/opentripplanner/core/domain/model/i18n/TranslatedStringTest.java index 70a094ced10..18eabbdcf7f 100644 --- a/core/domain/src/test/java/org/opentripplanner/core/domain/model/i18n/TranslatedStringTest.java +++ b/core/domain/src/test/java/org/opentripplanner/core/domain/model/i18n/TranslatedStringTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.model.i18n; +package org.opentripplanner.core.domain.model.i18n; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; diff --git a/core/domain/src/test/java/org/opentripplanner/core/domain/model/id/FeedScopedIdTest.java b/core/domain/src/test/java/org/opentripplanner/core/domain/model/id/FeedScopedIdTest.java index cb9ea68fd09..a78f749c2cc 100644 --- a/core/domain/src/test/java/org/opentripplanner/core/domain/model/id/FeedScopedIdTest.java +++ b/core/domain/src/test/java/org/opentripplanner/core/domain/model/id/FeedScopedIdTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.model.id; +package org.opentripplanner.core.domain.model.id; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/core/domain/src/test/java/org/opentripplanner/core/domain/model/time/LocalDateRangeTest.java b/core/domain/src/test/java/org/opentripplanner/core/domain/model/time/LocalDateRangeTest.java index 570f04152e1..7dfd051bd6e 100644 --- a/core/domain/src/test/java/org/opentripplanner/core/domain/model/time/LocalDateRangeTest.java +++ b/core/domain/src/test/java/org/opentripplanner/core/domain/model/time/LocalDateRangeTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.model.time; +package org.opentripplanner.core.domain.model.time; import static com.google.common.truth.Truth.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/core/domain/src/test/java/org/opentripplanner/core/domain/model/time/TimePeriodTest.java b/core/domain/src/test/java/org/opentripplanner/core/domain/model/time/TimePeriodTest.java index 5e923906e8a..03575146e61 100644 --- a/core/domain/src/test/java/org/opentripplanner/core/domain/model/time/TimePeriodTest.java +++ b/core/domain/src/test/java/org/opentripplanner/core/domain/model/time/TimePeriodTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.model.time; +package org.opentripplanner.core.domain.model.time; import static com.google.common.truth.Truth.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParking.java b/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParking.java index d4dd988d2c0..bc1456efb90 100644 --- a/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParking.java +++ b/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParking.java @@ -7,8 +7,8 @@ import java.util.Objects; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.street.model.openinghours.OHCalendar; import org.opentripplanner.street.search.TraverseMode; diff --git a/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParkingEntrance.java b/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParkingEntrance.java index 363ba7cc014..0cf1f89b409 100644 --- a/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParkingEntrance.java +++ b/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParkingEntrance.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.street.model.vertex.StreetVertex; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParkingGroup.java b/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParkingGroup.java index c92d9c2adaa..34626e0dff7 100644 --- a/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParkingGroup.java +++ b/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParkingGroup.java @@ -2,8 +2,8 @@ import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParkingGroupBuilder.java b/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParkingGroupBuilder.java index 5f209dc6859..8c675a156c2 100644 --- a/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParkingGroupBuilder.java +++ b/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParkingGroupBuilder.java @@ -1,7 +1,7 @@ package org.opentripplanner.service.vehicleparking.model; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; public class VehicleParkingGroupBuilder { diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/VehicleRentalRepository.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/VehicleRentalRepository.java index ddb732f9a10..cd8ee704aeb 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/VehicleRentalRepository.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/VehicleRentalRepository.java @@ -1,7 +1,7 @@ package org.opentripplanner.service.vehiclerental; import java.util.Collection; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/VehicleRentalService.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/VehicleRentalService.java index e7d31058b41..d05887f4c3e 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/VehicleRentalService.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/VehicleRentalService.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.List; import org.locationtech.jts.geom.Envelope; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation; import org.opentripplanner.service.vehiclerental.model.VehicleRentalVehicle; diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/internal/DefaultVehicleRentalRepository.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/internal/DefaultVehicleRentalRepository.java index da233503c74..d8281bc22c5 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/internal/DefaultVehicleRentalRepository.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/internal/DefaultVehicleRentalRepository.java @@ -9,7 +9,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.GeofencingZoneService; import org.opentripplanner.service.vehiclerental.VehicleRentalRepository; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/internal/DefaultVehicleRentalService.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/internal/DefaultVehicleRentalService.java index 0522a69d013..3ebf6597d21 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/internal/DefaultVehicleRentalService.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/internal/DefaultVehicleRentalService.java @@ -9,7 +9,7 @@ import java.util.stream.Stream; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Envelope; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.VehicleRentalRepository; import org.opentripplanner.service.vehiclerental.VehicleRentalService; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/GeofencingZone.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/GeofencingZone.java index bdf3edf9db0..8c030996674 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/GeofencingZone.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/GeofencingZone.java @@ -7,8 +7,8 @@ import java.util.function.Function; import javax.annotation.Nullable; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * A geofencing zone describing restrictions for traversing with a rental vehicle or dropping it off diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleFuel.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleFuel.java index 013abb935d2..2e9522b9931 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleFuel.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleFuel.java @@ -2,8 +2,8 @@ import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.model.basic.Distance; -import org.opentripplanner.core.model.basic.Ratio; +import org.opentripplanner.core.domain.model.basic.Distance; +import org.opentripplanner.core.domain.model.basic.Ratio; import org.opentripplanner.utils.tostring.ToStringBuilder; /** diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleType.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleType.java index 5bad8aed132..9337408f42b 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleType.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleType.java @@ -5,8 +5,8 @@ import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.model.RentalFormFactor; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalPlace.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalPlace.java index af192729860..cb41207cfb8 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalPlace.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalPlace.java @@ -1,8 +1,8 @@ package org.opentripplanner.service.vehiclerental.model; import java.util.Set; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.model.RentalFormFactor; import org.opentripplanner.street.search.request.RentalRequest; diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStation.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStation.java index 060ff12bff4..95c31ac0dd6 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStation.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStation.java @@ -11,8 +11,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.model.RentalFormFactor; import org.opentripplanner.utils.collection.SetUtils; diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStationBuilder.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStationBuilder.java index 67647f26c33..23cf02a5490 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStationBuilder.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStationBuilder.java @@ -2,8 +2,8 @@ import java.util.Map; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; public class VehicleRentalStationBuilder { diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalSystem.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalSystem.java index 52c721227e8..93a95f62fcc 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalSystem.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalSystem.java @@ -2,7 +2,7 @@ import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.utils.tostring.ToStringBuilder; /** diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalVehicle.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalVehicle.java index 7598c1001e2..0ed26199ef6 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalVehicle.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalVehicle.java @@ -6,8 +6,8 @@ import java.util.Set; import java.util.function.Consumer; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.model.RentalFormFactor; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/street/StreetVehicleRentalLink.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/street/StreetVehicleRentalLink.java index 53453afd275..0abbc9540f9 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/street/StreetVehicleRentalLink.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/street/StreetVehicleRentalLink.java @@ -1,7 +1,7 @@ package org.opentripplanner.service.vehiclerental.street; import java.util.List; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.vertex.StreetVertex; import org.opentripplanner.street.model.vertex.Vertex; diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalEdge.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalEdge.java index b9c6fa3c89f..13c812b978e 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalEdge.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalEdge.java @@ -4,7 +4,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType.PropulsionType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalPlaceVertex.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalPlaceVertex.java index fd9d273edb7..7812da60e8c 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalPlaceVertex.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalPlaceVertex.java @@ -2,7 +2,7 @@ import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; import org.opentripplanner.street.model.vertex.Vertex; diff --git a/street/src/main/java/org/opentripplanner/street/graph/Graph.java b/street/src/main/java/org/opentripplanner/street/graph/Graph.java index 4a65faa9ce3..8507f9c051d 100644 --- a/street/src/main/java/org/opentripplanner/street/graph/Graph.java +++ b/street/src/main/java/org/opentripplanner/street/graph/Graph.java @@ -15,7 +15,7 @@ import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; import org.opentripplanner.street.Scope; import org.opentripplanner.street.geometry.CompactElevationProfile; diff --git a/street/src/main/java/org/opentripplanner/street/graph/StreetIndex.java b/street/src/main/java/org/opentripplanner/street/graph/StreetIndex.java index e231425d74b..15065ce3dfe 100644 --- a/street/src/main/java/org/opentripplanner/street/graph/StreetIndex.java +++ b/street/src/main/java/org/opentripplanner/street/graph/StreetIndex.java @@ -10,7 +10,7 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.Scope; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.geometry.HashGridSpatialIndex; diff --git a/street/src/main/java/org/opentripplanner/street/graph/summary/StreetSummarizer.java b/street/src/main/java/org/opentripplanner/street/graph/summary/StreetSummarizer.java index 7315f4fe61a..815d5b0af03 100644 --- a/street/src/main/java/org/opentripplanner/street/graph/summary/StreetSummarizer.java +++ b/street/src/main/java/org/opentripplanner/street/graph/summary/StreetSummarizer.java @@ -6,7 +6,7 @@ import java.util.Locale; import java.util.stream.Collectors; import org.apache.commons.lang3.NotImplementedException; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.edge.ElevatorAlightEdge; import org.opentripplanner.street.model.edge.ElevatorBoardEdge; diff --git a/street/src/main/java/org/opentripplanner/street/linking/AreaEdgeProperties.java b/street/src/main/java/org/opentripplanner/street/linking/AreaEdgeProperties.java index d3cd29321fb..5e319b4ad48 100644 --- a/street/src/main/java/org/opentripplanner/street/linking/AreaEdgeProperties.java +++ b/street/src/main/java/org/opentripplanner/street/linking/AreaEdgeProperties.java @@ -1,7 +1,7 @@ package org.opentripplanner.street.linking; import java.util.List; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.edge.Area; diff --git a/street/src/main/java/org/opentripplanner/street/model/StreetMode.java b/street/src/main/java/org/opentripplanner/street/model/StreetMode.java index e8343f9f84a..e30d498781f 100644 --- a/street/src/main/java/org/opentripplanner/street/model/StreetMode.java +++ b/street/src/main/java/org/opentripplanner/street/model/StreetMode.java @@ -2,7 +2,7 @@ import java.util.EnumSet; import java.util.Set; -import org.opentripplanner.core.model.doc.DocumentedEnum; +import org.opentripplanner.core.domain.model.doc.DocumentedEnum; public enum StreetMode implements DocumentedEnum { /** diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/Area.java b/street/src/main/java/org/opentripplanner/street/model/edge/Area.java index 9346ce5f0f0..06bd0db109a 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/Area.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/Area.java @@ -2,7 +2,7 @@ import java.io.Serializable; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.street.model.StreetTraversalPermission; /** diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/Edge.java b/street/src/main/java/org/opentripplanner/street/model/edge/Edge.java index b8def7cd5cc..dce3ccc1c27 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/Edge.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/Edge.java @@ -8,7 +8,7 @@ import javax.annotation.Nullable; import org.locationtech.jts.geom.LineString; import org.opentripplanner.astar.spi.AStarEdge; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.state.State; import org.slf4j.Logger; diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/ElevatorAlightEdge.java b/street/src/main/java/org/opentripplanner/street/model/edge/ElevatorAlightEdge.java index 3d88869cb9d..b8a96286d2f 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/ElevatorAlightEdge.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/ElevatorAlightEdge.java @@ -2,8 +2,8 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.LocalizedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.LocalizedString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.vertex.ElevatorHopVertex; import org.opentripplanner.street.model.vertex.Vertex; diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/ElevatorBoardEdge.java b/street/src/main/java/org/opentripplanner/street/model/edge/ElevatorBoardEdge.java index 122d7354d6b..8b8258c4913 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/ElevatorBoardEdge.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/ElevatorBoardEdge.java @@ -1,8 +1,8 @@ package org.opentripplanner.street.model.edge; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.vertex.ElevatorHopVertex; import org.opentripplanner.street.model.vertex.Vertex; diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/ElevatorHopEdge.java b/street/src/main/java/org/opentripplanner/street/model/edge/ElevatorHopEdge.java index 8c8855b3ae0..491040584db 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/ElevatorHopEdge.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/ElevatorHopEdge.java @@ -2,8 +2,8 @@ import java.time.Duration; import java.util.Optional; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.TraverseMode; diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/EscalatorEdge.java b/street/src/main/java/org/opentripplanner/street/model/edge/EscalatorEdge.java index 5e36f3226e0..72c2a212a05 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/EscalatorEdge.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/EscalatorEdge.java @@ -4,8 +4,8 @@ import java.util.Optional; import javax.annotation.Nullable; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.LocalizedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.LocalizedString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.TraverseMode; diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/FreeEdge.java b/street/src/main/java/org/opentripplanner/street/model/edge/FreeEdge.java index 2ed4f6502ee..915137b371e 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/FreeEdge.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/FreeEdge.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.model.edge; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.state.State; import org.opentripplanner.street.search.state.StateEditor; diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/PathwayEdge.java b/street/src/main/java/org/opentripplanner/street/model/edge/PathwayEdge.java index 314708d4de9..eae04c9a55b 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/PathwayEdge.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/PathwayEdge.java @@ -5,8 +5,8 @@ import javax.annotation.Nullable; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.TraverseMode; diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java b/street/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java index 601983c51bb..56fa72dd9d7 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java @@ -7,7 +7,7 @@ import java.util.Optional; import org.locationtech.jts.geom.LineString; import org.locationtech.jts.geom.impl.PackedCoordinateSequence; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType.PropulsionType; import org.opentripplanner.service.vehiclerental.street.geofencing.GeofencingInterceptor; import org.opentripplanner.street.geometry.DirectionUtils; diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeBuilder.java b/street/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeBuilder.java index 805ce6926be..3461300410b 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeBuilder.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeBuilder.java @@ -13,8 +13,8 @@ import static org.opentripplanner.street.model.edge.StreetEdge.WHEELCHAIR_ACCESSIBLE_FLAG_INDEX; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.vertex.StreetVertex; import org.opentripplanner.street.search.TraverseMode; diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java b/street/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java index 5f681898902..17bad321b25 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java @@ -2,8 +2,8 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.vertex.StreetVertex; import org.opentripplanner.street.model.vertex.Vertex; diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntranceLink.java b/street/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntranceLink.java index c5a3243292d..6948f4d58db 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntranceLink.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntranceLink.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.model.edge; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.model.vertex.StreetVertex; import org.opentripplanner.street.model.vertex.TransitEntranceVertex; diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLink.java b/street/src/main/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLink.java index 06a2cfc8441..ef3537c6508 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLink.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLink.java @@ -1,7 +1,7 @@ package org.opentripplanner.street.model.edge; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.vertex.StreetVertex; diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/VehicleParkingEdge.java b/street/src/main/java/org/opentripplanner/street/model/edge/VehicleParkingEdge.java index 3505f9a2ac9..07d1cad5bb3 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/VehicleParkingEdge.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/VehicleParkingEdge.java @@ -1,8 +1,8 @@ package org.opentripplanner.street.model.edge; import java.time.Duration; -import org.opentripplanner.core.model.basic.Cost; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.street.model.StreetMode; import org.opentripplanner.street.model.vertex.VehicleParkingEntranceVertex; diff --git a/street/src/main/java/org/opentripplanner/street/model/openinghours/OHCalendarBuilder.java b/street/src/main/java/org/opentripplanner/street/model/openinghours/OHCalendarBuilder.java index 3ac794c66dc..7cc0dbf12b7 100644 --- a/street/src/main/java/org/opentripplanner/street/model/openinghours/OHCalendarBuilder.java +++ b/street/src/main/java/org/opentripplanner/street/model/openinghours/OHCalendarBuilder.java @@ -13,7 +13,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; public class OHCalendarBuilder { diff --git a/street/src/main/java/org/opentripplanner/street/model/openinghours/OpeningHoursCalendarService.java b/street/src/main/java/org/opentripplanner/street/model/openinghours/OpeningHoursCalendarService.java index f6028c786d7..0abb6fb916f 100644 --- a/street/src/main/java/org/opentripplanner/street/model/openinghours/OpeningHoursCalendarService.java +++ b/street/src/main/java/org/opentripplanner/street/model/openinghours/OpeningHoursCalendarService.java @@ -5,9 +5,9 @@ import java.time.LocalDate; import java.time.ZoneId; import java.util.Objects; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.framework.di.TransitServicePeriod; -import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.di.TransitServicePeriod; +import org.opentripplanner.core.domain.model.time.LocalDateRange; public class OpeningHoursCalendarService implements Serializable { diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/BarrierVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/BarrierVertex.java index c94790d45fb..88590dec01e 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/BarrierVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/BarrierVertex.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.edge.StreetEdge; diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/ElevatorHopVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/ElevatorHopVertex.java index fa39205b485..c4db06c3ea9 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/ElevatorHopVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/ElevatorHopVertex.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; public class ElevatorHopVertex extends StreetVertex { diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/LabelledIntersectionVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/LabelledIntersectionVertex.java index 2b76a3c0534..050cf993d7d 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/LabelledIntersectionVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/LabelledIntersectionVertex.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; /** * An intersection vertex that has a label that is generated outside of it rather than diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/OsmBoardingLocationVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/OsmBoardingLocationVertex.java index c9e2406dba7..e56166e80fb 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/OsmBoardingLocationVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/OsmBoardingLocationVertex.java @@ -4,7 +4,7 @@ import java.util.Objects; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.utils.tostring.ToStringBuilder; /** diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/OsmVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/OsmVertex.java index dfe5a891608..7de3a951196 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/OsmVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/OsmVertex.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; /** * A vertex coming from OpenStreetMap. diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/SplitterVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/SplitterVertex.java index bbecce06365..f50e00c8bda 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/SplitterVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/SplitterVertex.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; /** * A vertex representing a place along a street between two intersections that is not derived from diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/StationCentroidVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/StationCentroidVertex.java index 85dcdd408ec..b413a6cc2d6 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/StationCentroidVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/StationCentroidVertex.java @@ -1,7 +1,7 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; /** diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/StationElementVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/StationElementVertex.java index 8db06e6dd69..a3ca995f6c5 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/StationElementVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/StationElementVertex.java @@ -1,8 +1,8 @@ package org.opentripplanner.street.model.vertex; import java.util.Objects; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; public abstract class StationElementVertex extends Vertex { diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/StationEntranceVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/StationEntranceVertex.java index 5d115906ed0..5bede0983c7 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/StationEntranceVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/StationEntranceVertex.java @@ -1,8 +1,8 @@ package org.opentripplanner.street.model.vertex; import javax.annotation.Nullable; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.utils.tostring.ToStringBuilder; /** diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/StreetLocation.java b/street/src/main/java/org/opentripplanner/street/model/vertex/StreetLocation.java index e3e0a4d5858..2a6d5319b1b 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/StreetLocation.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/StreetLocation.java @@ -1,7 +1,7 @@ package org.opentripplanner.street.model.vertex; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.utils.lang.DoubleUtils; /** diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/StreetVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/StreetVertex.java index b565c04a92a..d3fec265e47 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/StreetVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/StreetVertex.java @@ -8,9 +8,9 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.LocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.LocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.edge.StreetEdge; import org.opentripplanner.street.search.TraverseMode; diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/SubsidiaryVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/SubsidiaryVertex.java index 74c0848a6a4..8da2c4b0b29 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/SubsidiaryVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/SubsidiaryVertex.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; /** * When applying turn restrictions to a graph makes copies of an IntersectionVertex, diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/TemporaryStreetLocation.java b/street/src/main/java/org/opentripplanner/street/model/vertex/TemporaryStreetLocation.java index 691e7250353..e970a96d9bb 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/TemporaryStreetLocation.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/TemporaryStreetLocation.java @@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicLong; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.edge.TemporaryEdge; diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/TransitBoardingAreaVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/TransitBoardingAreaVertex.java index 52441f0c838..4f9aa46cea6 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/TransitBoardingAreaVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/TransitBoardingAreaVertex.java @@ -1,7 +1,7 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; public class TransitBoardingAreaVertex extends StationElementVertex { diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/TransitEntranceVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/TransitEntranceVertex.java index 15218f12195..38aad6452bd 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/TransitEntranceVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/TransitEntranceVertex.java @@ -1,8 +1,8 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; public class TransitEntranceVertex extends StationElementVertex { diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/TransitPathwayNodeVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/TransitPathwayNodeVertex.java index 1a168a3d9d5..6e012d03665 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/TransitPathwayNodeVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/TransitPathwayNodeVertex.java @@ -1,7 +1,7 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; public class TransitPathwayNodeVertex extends StationElementVertex { diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertex.java index 9f5a2335504..957c9f00380 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertex.java @@ -4,9 +4,9 @@ import static org.opentripplanner.street.search.TraverseMode.WALK; import java.util.Objects; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.edge.PathwayEdge; diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertexBuilder.java b/street/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertexBuilder.java index 8d01d4dd542..ab4cf322767 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertexBuilder.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertexBuilder.java @@ -1,8 +1,8 @@ package org.opentripplanner.street.model.vertex; import org.locationtech.jts.geom.Point; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; public class TransitStopVertexBuilder { diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java index 291e71b8a66..099f928bf0b 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java @@ -2,7 +2,7 @@ import java.util.Collection; import java.util.Objects; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehicleparking.model.VehicleParkingEntrance; import org.opentripplanner.street.model.edge.Edge; diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/Vertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/Vertex.java index 6b97eaa6dc4..ff72e195970 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/Vertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/Vertex.java @@ -12,8 +12,8 @@ import java.util.function.Predicate; import org.locationtech.jts.geom.Coordinate; import org.opentripplanner.astar.spi.AStarVertex; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; import org.opentripplanner.service.vehiclerental.street.geofencing.GeofencingBoundaryExtension; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/VertexLabel.java b/street/src/main/java/org/opentripplanner/street/model/vertex/VertexLabel.java index b5a09ea7d62..c6fc903c52b 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/VertexLabel.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/VertexLabel.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * A label for a vertex so it can be identified when finding vertices in the graph. diff --git a/street/src/main/java/org/opentripplanner/street/search/request/AccessibilityRequest.java b/street/src/main/java/org/opentripplanner/street/search/request/AccessibilityRequest.java index ad76cb7acfa..91d9da1b9cd 100644 --- a/street/src/main/java/org/opentripplanner/street/search/request/AccessibilityRequest.java +++ b/street/src/main/java/org/opentripplanner/street/search/request/AccessibilityRequest.java @@ -2,7 +2,7 @@ import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.utils.tostring.ToStringBuilder; /** diff --git a/street/src/main/java/org/opentripplanner/street/search/request/CarRequest.java b/street/src/main/java/org/opentripplanner/street/search/request/CarRequest.java index 6234c6a4475..6c287954bb9 100644 --- a/street/src/main/java/org/opentripplanner/street/search/request/CarRequest.java +++ b/street/src/main/java/org/opentripplanner/street/search/request/CarRequest.java @@ -5,7 +5,7 @@ import java.time.Duration; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.utils.lang.DoubleUtils; import org.opentripplanner.utils.lang.Units; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/street/src/main/java/org/opentripplanner/street/search/request/ElevatorRequest.java b/street/src/main/java/org/opentripplanner/street/search/request/ElevatorRequest.java index 89dcd9f6c20..7bd8e7a8030 100644 --- a/street/src/main/java/org/opentripplanner/street/search/request/ElevatorRequest.java +++ b/street/src/main/java/org/opentripplanner/street/search/request/ElevatorRequest.java @@ -4,7 +4,7 @@ import java.time.Duration; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.utils.lang.Units; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/street/src/main/java/org/opentripplanner/street/search/request/ParkingRequest.java b/street/src/main/java/org/opentripplanner/street/search/request/ParkingRequest.java index 8d7ea8a354e..4a0bee0ee95 100644 --- a/street/src/main/java/org/opentripplanner/street/search/request/ParkingRequest.java +++ b/street/src/main/java/org/opentripplanner/street/search/request/ParkingRequest.java @@ -5,7 +5,7 @@ import java.time.Duration; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.street.search.request.filter.ParkingFilter; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/street/src/main/java/org/opentripplanner/street/search/request/RentalRequest.java b/street/src/main/java/org/opentripplanner/street/search/request/RentalRequest.java index 2a94807a883..b0e9e6cf1cd 100644 --- a/street/src/main/java/org/opentripplanner/street/search/request/RentalRequest.java +++ b/street/src/main/java/org/opentripplanner/street/search/request/RentalRequest.java @@ -6,7 +6,7 @@ import java.util.Objects; import java.util.Set; import java.util.function.Consumer; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.utils.tostring.ToStringBuilder; /** diff --git a/street/src/main/java/org/opentripplanner/street/search/request/VehicleWalkingRequest.java b/street/src/main/java/org/opentripplanner/street/search/request/VehicleWalkingRequest.java index e09221898a0..306ce3a6a2b 100644 --- a/street/src/main/java/org/opentripplanner/street/search/request/VehicleWalkingRequest.java +++ b/street/src/main/java/org/opentripplanner/street/search/request/VehicleWalkingRequest.java @@ -3,7 +3,7 @@ import java.time.Duration; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.utils.lang.Units; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/street/src/test-fixtures/java/org/opentripplanner/core/model/id/FeedScopedIdFactory.java b/street/src/test-fixtures/java/org/opentripplanner/core/model/id/FeedScopedIdFactory.java index dac6711a5c9..e99ea50c017 100644 --- a/street/src/test-fixtures/java/org/opentripplanner/core/model/id/FeedScopedIdFactory.java +++ b/street/src/test-fixtures/java/org/opentripplanner/core/model/id/FeedScopedIdFactory.java @@ -1,5 +1,7 @@ package org.opentripplanner.core.model.id; +import org.opentripplanner.core.domain.model.id.FeedScopedId; + public class FeedScopedIdFactory { public static FeedScopedId id(String id) { diff --git a/street/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java b/street/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java index fa9596eda0c..5f62d100ad2 100644 --- a/street/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java +++ b/street/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java @@ -7,11 +7,11 @@ import java.time.OffsetDateTime; import java.time.ZoneOffset; import javax.annotation.Nullable; -import org.opentripplanner.core.model.basic.Distance; -import org.opentripplanner.core.model.basic.Ratio; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.basic.Distance; +import org.opentripplanner.core.domain.model.basic.Ratio; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.model.RentalFormFactor; public class TestFreeFloatingRentalVehicleBuilder { diff --git a/street/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/TestGeofencingZoneBuilder.java b/street/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/TestGeofencingZoneBuilder.java index 53b93cbdff0..a8c844bd7f4 100644 --- a/street/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/TestGeofencingZoneBuilder.java +++ b/street/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/TestGeofencingZoneBuilder.java @@ -3,8 +3,8 @@ import java.util.List; import javax.annotation.Nullable; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; /** * Test builder for {@link GeofencingZone}. Provides readable test zone construction without diff --git a/street/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java b/street/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java index 4ce982c1e22..b52e427cae5 100644 --- a/street/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java +++ b/street/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java @@ -2,9 +2,9 @@ import java.util.HashMap; import java.util.Map; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.model.RentalFormFactor; public class TestVehicleRentalStationBuilder { diff --git a/street/src/test-fixtures/java/org/opentripplanner/street/linking/LinkingEnvironment.java b/street/src/test-fixtures/java/org/opentripplanner/street/linking/LinkingEnvironment.java index 48f742cc593..ad7e863a276 100644 --- a/street/src/test-fixtures/java/org/opentripplanner/street/linking/LinkingEnvironment.java +++ b/street/src/test-fixtures/java/org/opentripplanner/street/linking/LinkingEnvironment.java @@ -7,7 +7,7 @@ import java.util.Objects; import javax.annotation.Nullable; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.service.vehiclerental.GeofencingZoneService; import org.opentripplanner.street.graph.Graph; import org.opentripplanner.street.graph.summary.DisposableEdgeDataFetcher; diff --git a/street/src/test-fixtures/java/org/opentripplanner/street/model/StreetModelFactory.java b/street/src/test-fixtures/java/org/opentripplanner/street/model/StreetModelFactory.java index 9f735da0943..afee0029ef9 100644 --- a/street/src/test-fixtures/java/org/opentripplanner/street/model/StreetModelFactory.java +++ b/street/src/test-fixtures/java/org/opentripplanner/street/model/StreetModelFactory.java @@ -5,8 +5,8 @@ import java.time.Instant; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehiclerental.model.TestFreeFloatingRentalVehicleBuilder; import org.opentripplanner.service.vehiclerental.street.VehicleRentalPlaceVertex; diff --git a/street/src/test-fixtures/java/org/opentripplanner/street/model/edge/SimpleConcreteEdge.java b/street/src/test-fixtures/java/org/opentripplanner/street/model/edge/SimpleConcreteEdge.java index de8a86400c5..6d410138407 100644 --- a/street/src/test-fixtures/java/org/opentripplanner/street/model/edge/SimpleConcreteEdge.java +++ b/street/src/test-fixtures/java/org/opentripplanner/street/model/edge/SimpleConcreteEdge.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.model.edge; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.state.State; diff --git a/street/src/test-fixtures/java/org/opentripplanner/street/model/edge/TestAreaGroupBuilder.java b/street/src/test-fixtures/java/org/opentripplanner/street/model/edge/TestAreaGroupBuilder.java index 8e8ba5729a0..8be2c278ab6 100644 --- a/street/src/test-fixtures/java/org/opentripplanner/street/model/edge/TestAreaGroupBuilder.java +++ b/street/src/test-fixtures/java/org/opentripplanner/street/model/edge/TestAreaGroupBuilder.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Set; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.vertex.IntersectionVertex; diff --git a/street/src/test-fixtures/java/org/opentripplanner/street/model/edge/TestEdge.java b/street/src/test-fixtures/java/org/opentripplanner/street/model/edge/TestEdge.java index c8b31e004e8..3a816e418bb 100644 --- a/street/src/test-fixtures/java/org/opentripplanner/street/model/edge/TestEdge.java +++ b/street/src/test-fixtures/java/org/opentripplanner/street/model/edge/TestEdge.java @@ -2,7 +2,7 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.state.State; diff --git a/street/src/test-fixtures/java/org/opentripplanner/street/model/vertex/SimpleVertex.java b/street/src/test-fixtures/java/org/opentripplanner/street/model/vertex/SimpleVertex.java index d78c9e5fe1f..22a105167d9 100644 --- a/street/src/test-fixtures/java/org/opentripplanner/street/model/vertex/SimpleVertex.java +++ b/street/src/test-fixtures/java/org/opentripplanner/street/model/vertex/SimpleVertex.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; public class SimpleVertex extends StreetVertex { diff --git a/street/src/test-fixtures/java/org/opentripplanner/street/search/state/TestStateBuilder.java b/street/src/test-fixtures/java/org/opentripplanner/street/search/state/TestStateBuilder.java index ab3235af408..6b83228b110 100644 --- a/street/src/test-fixtures/java/org/opentripplanner/street/search/state/TestStateBuilder.java +++ b/street/src/test-fixtures/java/org/opentripplanner/street/search/state/TestStateBuilder.java @@ -7,8 +7,8 @@ import java.util.Arrays; import java.util.List; import java.util.function.Consumer; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.service.vehiclerental.model.TestFreeFloatingRentalVehicleBuilder; import org.opentripplanner.service.vehiclerental.model.TestVehicleRentalStationBuilder; import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; diff --git a/street/src/test/java/org/opentripplanner/service/vehiclerental/street/geofencing/PreResolveVertexZonesTest.java b/street/src/test/java/org/opentripplanner/service/vehiclerental/street/geofencing/PreResolveVertexZonesTest.java index 875c9377ef9..3bf3bb3e581 100644 --- a/street/src/test/java/org/opentripplanner/service/vehiclerental/street/geofencing/PreResolveVertexZonesTest.java +++ b/street/src/test/java/org/opentripplanner/service/vehiclerental/street/geofencing/PreResolveVertexZonesTest.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.internal.DefaultVehicleRentalRepository; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; diff --git a/street/src/test/java/org/opentripplanner/street/graph/StreetIndexTest.java b/street/src/test/java/org/opentripplanner/street/graph/StreetIndexTest.java index ddbc39ad9b8..17fa31ff540 100644 --- a/street/src/test/java/org/opentripplanner/street/graph/StreetIndexTest.java +++ b/street/src/test/java/org/opentripplanner/street/graph/StreetIndexTest.java @@ -5,8 +5,8 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.street.model.vertex.StationCentroidVertex; diff --git a/street/src/test/java/org/opentripplanner/street/integration/BikeRentalTest.java b/street/src/test/java/org/opentripplanner/street/integration/BikeRentalTest.java index a979e5e5571..4229afbfb66 100644 --- a/street/src/test/java/org/opentripplanner/street/integration/BikeRentalTest.java +++ b/street/src/test/java/org/opentripplanner/street/integration/BikeRentalTest.java @@ -1,7 +1,7 @@ package org.opentripplanner.street.integration; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.core.model.basic.Cost.costOfSeconds; +import static org.opentripplanner.core.domain.model.basic.Cost.costOfSeconds; import java.time.Duration; import java.util.List; diff --git a/street/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java b/street/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java index 5991b3d62e4..fa303c1ecb5 100644 --- a/street/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java +++ b/street/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java @@ -1,7 +1,7 @@ package org.opentripplanner.street.integration; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.core.model.basic.Cost.costOfSeconds; +import static org.opentripplanner.core.domain.model.basic.Cost.costOfSeconds; import java.time.Duration; import java.util.List; diff --git a/street/src/test/java/org/opentripplanner/street/integration/GraphRoutingTest.java b/street/src/test/java/org/opentripplanner/street/integration/GraphRoutingTest.java index 03b01f685a1..e9ecebd0477 100644 --- a/street/src/test/java/org/opentripplanner/street/integration/GraphRoutingTest.java +++ b/street/src/test/java/org/opentripplanner/street/integration/GraphRoutingTest.java @@ -6,10 +6,10 @@ import java.util.List; import java.util.Map; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.model.accessibility.Accessibility; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehicleparking.model.VehicleParking.VehicleParkingEntranceCreator; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; diff --git a/street/src/test/java/org/opentripplanner/street/integration/ParkAndRideTest.java b/street/src/test/java/org/opentripplanner/street/integration/ParkAndRideTest.java index d6e44254e71..dbaa9f41f95 100644 --- a/street/src/test/java/org/opentripplanner/street/integration/ParkAndRideTest.java +++ b/street/src/test/java/org/opentripplanner/street/integration/ParkAndRideTest.java @@ -8,7 +8,7 @@ import java.util.Locale; import java.util.Set; import java.util.stream.Collectors; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.street.graph.Graph; import org.opentripplanner.street.model.StreetMode; import org.opentripplanner.street.model.vertex.StreetVertex; diff --git a/street/src/test/java/org/opentripplanner/street/integration/ScooterRentalGeofencingTest.java b/street/src/test/java/org/opentripplanner/street/integration/ScooterRentalGeofencingTest.java index fd771635fee..be96c099c11 100644 --- a/street/src/test/java/org/opentripplanner/street/integration/ScooterRentalGeofencingTest.java +++ b/street/src/test/java/org/opentripplanner/street/integration/ScooterRentalGeofencingTest.java @@ -11,9 +11,9 @@ import java.util.stream.Collectors; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.TestGeofencingZoneBuilder; diff --git a/street/src/test/java/org/opentripplanner/street/linking/AreaEdgePropertiesTest.java b/street/src/test/java/org/opentripplanner/street/linking/AreaEdgePropertiesTest.java index 28ba17d6dbc..3a770e850ff 100644 --- a/street/src/test/java/org/opentripplanner/street/linking/AreaEdgePropertiesTest.java +++ b/street/src/test/java/org/opentripplanner/street/linking/AreaEdgePropertiesTest.java @@ -6,7 +6,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.edge.Area; diff --git a/street/src/test/java/org/opentripplanner/street/linking/FlexLinkingTest.java b/street/src/test/java/org/opentripplanner/street/linking/FlexLinkingTest.java index 00c7ef74502..a36ee468bb7 100644 --- a/street/src/test/java/org/opentripplanner/street/linking/FlexLinkingTest.java +++ b/street/src/test/java/org/opentripplanner/street/linking/FlexLinkingTest.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdFactory; import org.opentripplanner.street.model.StreetModelFactory; import org.opentripplanner.street.model.vertex.StreetVertex; diff --git a/street/src/test/java/org/opentripplanner/street/linking/PlatformLinkingTest.java b/street/src/test/java/org/opentripplanner/street/linking/PlatformLinkingTest.java index 21b79acc961..a98f19b9278 100644 --- a/street/src/test/java/org/opentripplanner/street/linking/PlatformLinkingTest.java +++ b/street/src/test/java/org/opentripplanner/street/linking/PlatformLinkingTest.java @@ -16,8 +16,8 @@ import org.locationtech.jts.geom.GeometryFactory; import org.locationtech.jts.geom.LineString; import org.locationtech.jts.geom.Polygon; -import org.opentripplanner.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.LocalizedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.LocalizedString; import org.opentripplanner.service.vehiclerental.GeofencingZoneService; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.graph.Graph; diff --git a/street/src/test/java/org/opentripplanner/street/linking/PreparedAreaGroupTest.java b/street/src/test/java/org/opentripplanner/street/linking/PreparedAreaGroupTest.java index f0e3d1c19a6..f95062e6538 100644 --- a/street/src/test/java/org/opentripplanner/street/linking/PreparedAreaGroupTest.java +++ b/street/src/test/java/org/opentripplanner/street/linking/PreparedAreaGroupTest.java @@ -11,7 +11,7 @@ import org.locationtech.jts.geom.GeometryFactory; import org.locationtech.jts.geom.LinearRing; import org.locationtech.jts.geom.Polygon; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.edge.Area; diff --git a/street/src/test/java/org/opentripplanner/street/linking/TemporaryVerticesContainerTest.java b/street/src/test/java/org/opentripplanner/street/linking/TemporaryVerticesContainerTest.java index 7371f678bd2..98ac8fa379f 100644 --- a/street/src/test/java/org/opentripplanner/street/linking/TemporaryVerticesContainerTest.java +++ b/street/src/test/java/org/opentripplanner/street/linking/TemporaryVerticesContainerTest.java @@ -6,7 +6,7 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.service.vehiclerental.GeofencingZoneService; import org.opentripplanner.street.graph.Graph; import org.opentripplanner.street.model.StreetModelFactory; diff --git a/street/src/test/java/org/opentripplanner/street/linking/VehicleParkingHelperTest.java b/street/src/test/java/org/opentripplanner/street/linking/VehicleParkingHelperTest.java index ce545d486c7..774ceca3fb9 100644 --- a/street/src/test/java/org/opentripplanner/street/linking/VehicleParkingHelperTest.java +++ b/street/src/test/java/org/opentripplanner/street/linking/VehicleParkingHelperTest.java @@ -7,8 +7,8 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.NonLocalizedString; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehicleparking.model.VehicleParking.VehicleParkingEntranceCreator; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/street/src/test/java/org/opentripplanner/street/linking/VertexLinkerGeofencingTest.java b/street/src/test/java/org/opentripplanner/street/linking/VertexLinkerGeofencingTest.java index eccf345f826..e826f40b247 100644 --- a/street/src/test/java/org/opentripplanner/street/linking/VertexLinkerGeofencingTest.java +++ b/street/src/test/java/org/opentripplanner/street/linking/VertexLinkerGeofencingTest.java @@ -13,7 +13,7 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Polygon; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.service.vehiclerental.GeofencingZoneService; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; import org.opentripplanner.service.vehiclerental.model.TestGeofencingZoneBuilder; diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/AreaEdgeBuilderTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/AreaEdgeBuilderTest.java index de0470e084c..e1e335b92ed 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/AreaEdgeBuilderTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/AreaEdgeBuilderTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.StreetModelFactory; import org.opentripplanner.street.model.StreetTraversalPermission; diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/ElevatorHopEdgeTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/ElevatorHopEdgeTest.java index 15a00c04e24..4e8ccf945a6 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/ElevatorHopEdgeTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/ElevatorHopEdgeTest.java @@ -11,7 +11,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; import org.opentripplanner.street.model.StreetMode; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.vertex.Vertex; diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java index c4c79471b34..2138f7e0c48 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.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.core.model.i18n.I18NString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.street.model.StreetMode; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.request.StreetSearchRequest; diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeBuilderTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeBuilderTest.java index 2ea2cb4e095..38e75566e96 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeBuilderTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeBuilderTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.StreetModelFactory; import org.opentripplanner.street.model.StreetTraversalPermission; diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeSplittingTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeSplittingTest.java index 878d7459199..6bf3da88536 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeSplittingTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeSplittingTest.java @@ -9,7 +9,7 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.GeometryFactory; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.geometry.SphericalDistanceLibrary; import org.opentripplanner.street.model.StreetTraversalPermission; diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java index 15addcad09f..12750e7c5bc 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java @@ -19,8 +19,8 @@ import org.locationtech.jts.geom.GeometryFactory; import org.locationtech.jts.geom.LineString; import org.locationtech.jts.geom.impl.PackedCoordinateSequence; -import org.opentripplanner.core.model.basic.Cost; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.StreetMode; import org.opentripplanner.street.model.StreetModelFactory; diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/StreetTransitEntityLinkTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/StreetTransitEntityLinkTest.java index f89cfd4a11c..2eb991081d0 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/StreetTransitEntityLinkTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/StreetTransitEntityLinkTest.java @@ -3,9 +3,9 @@ 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.core.model.accessibility.Accessibility.NOT_POSSIBLE; -import static org.opentripplanner.core.model.accessibility.Accessibility.NO_INFORMATION; -import static org.opentripplanner.core.model.accessibility.Accessibility.POSSIBLE; +import static org.opentripplanner.core.domain.model.accessibility.Accessibility.NOT_POSSIBLE; +import static org.opentripplanner.core.domain.model.accessibility.Accessibility.NO_INFORMATION; +import static org.opentripplanner.core.domain.model.accessibility.Accessibility.POSSIBLE; import static org.opentripplanner.core.model.id.FeedScopedIdFactory.id; import java.util.List; @@ -16,7 +16,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Point; -import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.StreetMode; import org.opentripplanner.street.model.StreetModelFactory; diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java index bba2e535865..2c94914e18f 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java @@ -14,8 +14,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.model.basic.Cost; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehicleparking.model.VehicleParkingEntrance; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeBuilderTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeBuilderTest.java index d44843abd76..5e4a01f9f4e 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeBuilderTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeBuilderTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.StreetModelFactory; import org.opentripplanner.street.model.StreetTraversalPermission; diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeTest.java index 80cf41bf7f5..a645e8475b1 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeTest.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.StreetMode; import org.opentripplanner.street.model.StreetModelFactory; diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingEdgeTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingEdgeTest.java index 684d30d28c6..105c758af46 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingEdgeTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingEdgeTest.java @@ -6,7 +6,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehicleparking.model.VehicleParkingSpaces; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingPreferredTagsTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingPreferredTagsTest.java index c738de4783a..17675edcdd0 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingPreferredTagsTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingPreferredTagsTest.java @@ -9,8 +9,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.model.basic.Cost; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.service.vehicleparking.model.VehicleParkingEntrance; import org.opentripplanner.service.vehicleparking.model.VehicleParkingSpaces; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/street/src/test/java/org/opentripplanner/street/model/openinghours/OHCalendarTest.java b/street/src/test/java/org/opentripplanner/street/model/openinghours/OHCalendarTest.java index 24cc2ca7324..0a0108d83ff 100644 --- a/street/src/test/java/org/opentripplanner/street/model/openinghours/OHCalendarTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/openinghours/OHCalendarTest.java @@ -12,7 +12,7 @@ import java.time.Month; import java.time.ZoneId; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; class OHCalendarTest { diff --git a/street/src/test/java/org/opentripplanner/street/model/vertex/BarrierVertexTest.java b/street/src/test/java/org/opentripplanner/street/model/vertex/BarrierVertexTest.java index 0c3b18d4f8f..cdee7495678 100644 --- a/street/src/test/java/org/opentripplanner/street/model/vertex/BarrierVertexTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/vertex/BarrierVertexTest.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.domain.model.accessibility.Accessibility; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.StreetModelFactory; import org.opentripplanner.street.model.StreetTraversalPermission; diff --git a/street/src/test/java/org/opentripplanner/street/model/vertex/OsmVertexTest.java b/street/src/test/java/org/opentripplanner/street/model/vertex/OsmVertexTest.java index 4ef0f6f4f23..60263ba1ab3 100644 --- a/street/src/test/java/org/opentripplanner/street/model/vertex/OsmVertexTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/vertex/OsmVertexTest.java @@ -7,7 +7,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.domain.model.id.FeedScopedId; class OsmVertexTest { diff --git a/street/src/test/java/org/opentripplanner/street/model/vertex/TemporaryVertexDisposeTest.java b/street/src/test/java/org/opentripplanner/street/model/vertex/TemporaryVertexDisposeTest.java index c4f3c936f41..769a5ce2e3b 100644 --- a/street/src/test/java/org/opentripplanner/street/model/vertex/TemporaryVertexDisposeTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/vertex/TemporaryVertexDisposeTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.domain.model.i18n.I18NString; import org.opentripplanner.street.model.edge.FreeEdge; public class TemporaryVertexDisposeTest { diff --git a/street/src/test/java/org/opentripplanner/street/search/intersection_model/SimpleIntersectionTraversalCalculatorTest.java b/street/src/test/java/org/opentripplanner/street/search/intersection_model/SimpleIntersectionTraversalCalculatorTest.java index b415db9926a..803469df648 100644 --- a/street/src/test/java/org/opentripplanner/street/search/intersection_model/SimpleIntersectionTraversalCalculatorTest.java +++ b/street/src/test/java/org/opentripplanner/street/search/intersection_model/SimpleIntersectionTraversalCalculatorTest.java @@ -13,7 +13,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.edge.StreetEdge; diff --git a/street/src/test/java/org/opentripplanner/street/search/request/BikeRequestTest.java b/street/src/test/java/org/opentripplanner/street/search/request/BikeRequestTest.java index b60a03f4f65..83d993dc193 100644 --- a/street/src/test/java/org/opentripplanner/street/search/request/BikeRequestTest.java +++ b/street/src/test/java/org/opentripplanner/street/search/request/BikeRequestTest.java @@ -6,7 +6,7 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.street.model.VehicleRoutingOptimizeType; class BikeRequestTest { diff --git a/street/src/test/java/org/opentripplanner/street/search/request/CarRequestTest.java b/street/src/test/java/org/opentripplanner/street/search/request/CarRequestTest.java index 07848406f87..9c505085753 100644 --- a/street/src/test/java/org/opentripplanner/street/search/request/CarRequestTest.java +++ b/street/src/test/java/org/opentripplanner/street/search/request/CarRequestTest.java @@ -6,7 +6,7 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; class CarRequestTest { diff --git a/street/src/test/java/org/opentripplanner/street/search/request/ParkingRequestTest.java b/street/src/test/java/org/opentripplanner/street/search/request/ParkingRequestTest.java index 6d577a49ee0..0c990f393dc 100644 --- a/street/src/test/java/org/opentripplanner/street/search/request/ParkingRequestTest.java +++ b/street/src/test/java/org/opentripplanner/street/search/request/ParkingRequestTest.java @@ -1,13 +1,13 @@ package org.opentripplanner.street.search.request; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.core.model.basic.Cost.costOfSeconds; +import static org.opentripplanner.core.domain.model.basic.Cost.costOfSeconds; import static org.opentripplanner.street.search.request.ImmutableRequestAsserts.assertEqualsAndHashCode; import java.time.Duration; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; import org.opentripplanner.street.search.request.filter.ParkingFilter; import org.opentripplanner.street.search.request.filter.ParkingSelect.TagsSelect; diff --git a/street/src/test/java/org/opentripplanner/street/search/request/RentalRequestTest.java b/street/src/test/java/org/opentripplanner/street/search/request/RentalRequestTest.java index 65f3c0a4c6f..6de9cad754a 100644 --- a/street/src/test/java/org/opentripplanner/street/search/request/RentalRequestTest.java +++ b/street/src/test/java/org/opentripplanner/street/search/request/RentalRequestTest.java @@ -2,13 +2,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; -import static org.opentripplanner.core.model.basic.Cost.costOfSeconds; +import static org.opentripplanner.core.domain.model.basic.Cost.costOfSeconds; import static org.opentripplanner.street.search.request.ImmutableRequestAsserts.assertEqualsAndHashCode; import java.time.Duration; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; class RentalRequestTest { diff --git a/street/src/test/java/org/opentripplanner/street/search/request/VehicleWalkingRequestTest.java b/street/src/test/java/org/opentripplanner/street/search/request/VehicleWalkingRequestTest.java index 5557d62b5ba..7b12b4b01ff 100644 --- a/street/src/test/java/org/opentripplanner/street/search/request/VehicleWalkingRequestTest.java +++ b/street/src/test/java/org/opentripplanner/street/search/request/VehicleWalkingRequestTest.java @@ -5,7 +5,7 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.domain.model.basic.Cost; class VehicleWalkingRequestTest { From b4a1bced7c43b80f7c086a3d5099da72fe1b143d Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 17 Sep 2026 19:56:46 +0200 Subject: [PATCH 34/68] refactor: move transaction and event framework classes to core-domain module(git-mv) --- .../opentripplanner/core/domain}/framework/event/DomainEvent.java | 0 .../core/domain}/framework/event/EventHandler.java | 0 .../core/domain}/framework/transaction/RepositoryRegistry.java | 0 .../core/domain}/framework/transaction/UpdateManager.java | 0 .../core/domain}/framework/transaction/api/RepositoryHandle.java | 0 .../domain}/framework/transaction/api/RepositoryLifecycle.java | 0 .../core/domain}/framework/transaction/api/TransactionScope.java | 0 .../core/domain}/framework/transaction/api/WriteContext.java | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename {application/src/main/java/org/opentripplanner => core/domain/src/main/java/org/opentripplanner/core/domain}/framework/event/DomainEvent.java (100%) rename {application/src/main/java/org/opentripplanner => core/domain/src/main/java/org/opentripplanner/core/domain}/framework/event/EventHandler.java (100%) rename {application/src/main/java/org/opentripplanner => core/domain/src/main/java/org/opentripplanner/core/domain}/framework/transaction/RepositoryRegistry.java (100%) rename {application/src/main/java/org/opentripplanner => core/domain/src/main/java/org/opentripplanner/core/domain}/framework/transaction/UpdateManager.java (100%) rename {application/src/main/java/org/opentripplanner => core/domain/src/main/java/org/opentripplanner/core/domain}/framework/transaction/api/RepositoryHandle.java (100%) rename {application/src/main/java/org/opentripplanner => core/domain/src/main/java/org/opentripplanner/core/domain}/framework/transaction/api/RepositoryLifecycle.java (100%) rename {application/src/main/java/org/opentripplanner => core/domain/src/main/java/org/opentripplanner/core/domain}/framework/transaction/api/TransactionScope.java (100%) rename {application/src/main/java/org/opentripplanner => core/domain/src/main/java/org/opentripplanner/core/domain}/framework/transaction/api/WriteContext.java (100%) diff --git a/application/src/main/java/org/opentripplanner/framework/event/DomainEvent.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/event/DomainEvent.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/event/DomainEvent.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/framework/event/DomainEvent.java diff --git a/application/src/main/java/org/opentripplanner/framework/event/EventHandler.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/event/EventHandler.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/event/EventHandler.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/framework/event/EventHandler.java diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/RepositoryRegistry.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/RepositoryRegistry.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/transaction/RepositoryRegistry.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/RepositoryRegistry.java diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/UpdateManager.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/UpdateManager.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/transaction/UpdateManager.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/UpdateManager.java diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/api/RepositoryHandle.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryHandle.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/transaction/api/RepositoryHandle.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryHandle.java diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/api/RepositoryLifecycle.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryLifecycle.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/transaction/api/RepositoryLifecycle.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryLifecycle.java diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/api/TransactionScope.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/TransactionScope.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/transaction/api/TransactionScope.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/TransactionScope.java diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/api/WriteContext.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/WriteContext.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/transaction/api/WriteContext.java rename to core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/WriteContext.java From 0d56c04664dc3c85bfec94086520a7144477bec2 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 17 Sep 2026 19:56:34 +0200 Subject: [PATCH 35/68] refactor: move transaction and event framework classes to core-domain module(code) --- .../transaction/configure/StreetDomain.java | 6 ++++-- .../transaction/configure/TransactionModule.java | 4 ++-- .../transaction/configure/TransitDomain.java | 6 ++++-- .../internal/DefaultRepositoryHandle.java | 4 ++-- .../internal/DefaultRepositoryRegistry.java | 10 +++++----- .../internal/DefaultTransactionScope.java | 4 ++-- .../transaction/internal/DefaultUpdateManager.java | 10 +++++----- .../transaction/internal/DefaultWriteContext.java | 6 +++--- .../framework/transaction/internal/HandlerEntry.java | 6 +++--- .../framework/transaction/internal/Transaction.java | 4 ++-- .../transaction/internal/TransactionFactory.java | 4 ++-- .../internal/TransactionalRepository.java | 2 +- .../realtimevehicles/RealtimeVehicleRepository.java | 3 ++- .../configure/RealtimeVehicleRepositoryModule.java | 4 ++-- .../internal/RealtimeVehicleRepositoryLifecycle.java | 2 +- .../standalone/api/HttpRequestScoped.java | 3 ++- .../standalone/configure/ConstructApplication.java | 2 +- .../configure/ConstructApplicationFactory.java | 4 ++-- .../standalone/configure/RequestScopedFactory.java | 2 +- .../standalone/configure/RequestScopedModule.java | 6 +++--- .../standalone/server/MetricsLogging.java | 2 +- .../transit/configure/TransitModule.java | 4 ++-- .../transit/repository/TimetableRepository.java | 3 ++- .../repository/TimetableRepositoryLifecycle.java | 2 +- .../opentripplanner/updater/GraphUpdaterManager.java | 3 ++- .../opentripplanner/updater/GraphWriterService.java | 6 +++--- .../updater/configure/UpdaterConfigurator.java | 4 ++-- .../standalone/api/TestServerContext.java | 4 ++-- .../transit/model/TransitTestEnvironment.java | 6 +++--- .../moduletest/TransactionFrameworkTest.java | 10 +++++----- .../internal/CustomerRepositoryLifecycle.java | 2 +- .../candyshop/event/CustomerEventHandler.java | 2 +- .../candyshop/event/CustomerOrderDomainEvent.java | 2 +- .../candyshop/event/OrderEventHandler.java | 2 +- .../order/internal/OrderRepositoryLifecycle.java | 2 +- .../transit/speed_test/SpeedTest.java | 2 +- .../core/domain/framework/event/DomainEvent.java | 2 +- .../core/domain/framework/event/EventHandler.java | 4 ++-- .../framework/transaction/RepositoryRegistry.java | 8 ++++---- .../domain/framework/transaction/UpdateManager.java | 12 ++++++------ .../framework/transaction/api/RepositoryHandle.java | 5 ++--- .../transaction/api/RepositoryLifecycle.java | 2 +- .../framework/transaction/api/TransactionScope.java | 4 ++-- .../framework/transaction/api/WriteContext.java | 8 ++++---- 44 files changed, 100 insertions(+), 93 deletions(-) diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/configure/StreetDomain.java b/application/src/main/java/org/opentripplanner/framework/transaction/configure/StreetDomain.java index 216b618bb9e..e2ec350d7e5 100644 --- a/application/src/main/java/org/opentripplanner/framework/transaction/configure/StreetDomain.java +++ b/application/src/main/java/org/opentripplanner/framework/transaction/configure/StreetDomain.java @@ -5,10 +5,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; +import org.opentripplanner.core.domain.framework.transaction.UpdateManager; /** - * Qualifies the {@link org.opentripplanner.framework.transaction.RepositoryRegistry} and - * {@link org.opentripplanner.framework.transaction.UpdateManager} belonging to the street write + * Qualifies the {@link RepositoryRegistry} and + * {@link UpdateManager} belonging to the street write * domain: the street graph and the vehicle-rental and vehicle-parking repositories, updated by * the GBFS and parking updaters. *

    diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/configure/TransactionModule.java b/application/src/main/java/org/opentripplanner/framework/transaction/configure/TransactionModule.java index 8d5e098e439..c9cf6fb1c46 100644 --- a/application/src/main/java/org/opentripplanner/framework/transaction/configure/TransactionModule.java +++ b/application/src/main/java/org/opentripplanner/framework/transaction/configure/TransactionModule.java @@ -3,9 +3,9 @@ import dagger.Module; import dagger.Provides; import jakarta.inject.Singleton; -import org.opentripplanner.framework.transaction.RepositoryRegistry; +import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; +import org.opentripplanner.core.domain.framework.transaction.UpdateManager; import org.opentripplanner.framework.transaction.TimetableSnapshotParameters; -import org.opentripplanner.framework.transaction.UpdateManager; import org.opentripplanner.framework.transaction.internal.TransactionFactory; /** diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/configure/TransitDomain.java b/application/src/main/java/org/opentripplanner/framework/transaction/configure/TransitDomain.java index be34126eceb..a0c141d316f 100644 --- a/application/src/main/java/org/opentripplanner/framework/transaction/configure/TransitDomain.java +++ b/application/src/main/java/org/opentripplanner/framework/transaction/configure/TransitDomain.java @@ -5,10 +5,12 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; +import org.opentripplanner.core.domain.framework.transaction.UpdateManager; /** - * Qualifies the {@link org.opentripplanner.framework.transaction.RepositoryRegistry} and - * {@link org.opentripplanner.framework.transaction.UpdateManager} belonging to the transit write + * Qualifies the {@link RepositoryRegistry} and + * {@link UpdateManager} belonging to the transit write * domain: timetable data, alerts and realtime vehicles, updated by the SIRI and GTFS-RT updaters. *

    * Each write domain has its own registry, transaction sequence and single writer thread, so diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultRepositoryHandle.java b/application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultRepositoryHandle.java index 01ec4dae2ee..1697a96fbef 100644 --- a/application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultRepositoryHandle.java +++ b/application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultRepositoryHandle.java @@ -1,7 +1,7 @@ package org.opentripplanner.framework.transaction.internal; -import org.opentripplanner.framework.transaction.api.RepositoryHandle; -import org.opentripplanner.framework.transaction.api.TransactionScope; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; +import org.opentripplanner.core.domain.framework.transaction.api.TransactionScope; /** * Package-private implementation of {@link RepositoryHandle} that additionally exposes diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultRepositoryRegistry.java b/application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultRepositoryRegistry.java index 20a6f398dad..cdc86d95caf 100644 --- a/application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultRepositoryRegistry.java +++ b/application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultRepositoryRegistry.java @@ -1,10 +1,10 @@ package org.opentripplanner.framework.transaction.internal; -import org.opentripplanner.framework.transaction.RepositoryRegistry; -import org.opentripplanner.framework.transaction.UpdateManager; -import org.opentripplanner.framework.transaction.api.RepositoryHandle; -import org.opentripplanner.framework.transaction.api.RepositoryLifecycle; -import org.opentripplanner.framework.transaction.api.TransactionScope; +import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; +import org.opentripplanner.core.domain.framework.transaction.UpdateManager; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryLifecycle; +import org.opentripplanner.core.domain.framework.transaction.api.TransactionScope; /** * Default implementation of {@link RepositoryRegistry}. diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultTransactionScope.java b/application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultTransactionScope.java index 97840e01fac..028f0f4dd81 100644 --- a/application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultTransactionScope.java +++ b/application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultTransactionScope.java @@ -1,8 +1,8 @@ package org.opentripplanner.framework.transaction.internal; import java.util.Objects; -import org.opentripplanner.framework.transaction.api.RepositoryHandle; -import org.opentripplanner.framework.transaction.api.TransactionScope; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; +import org.opentripplanner.core.domain.framework.transaction.api.TransactionScope; /** * Default request-scoped implementation of {@link TransactionScope}. diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultUpdateManager.java b/application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultUpdateManager.java index c4e2777e451..be3e6fcfb78 100644 --- a/application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultUpdateManager.java +++ b/application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultUpdateManager.java @@ -13,11 +13,11 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import javax.annotation.Nullable; -import org.opentripplanner.framework.event.DomainEvent; -import org.opentripplanner.framework.event.EventHandler; -import org.opentripplanner.framework.transaction.UpdateManager; -import org.opentripplanner.framework.transaction.api.RepositoryHandle; -import org.opentripplanner.framework.transaction.api.WriteContext; +import org.opentripplanner.core.domain.framework.event.DomainEvent; +import org.opentripplanner.core.domain.framework.event.EventHandler; +import org.opentripplanner.core.domain.framework.transaction.UpdateManager; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; +import org.opentripplanner.core.domain.framework.transaction.api.WriteContext; /** * Default implementation of {@link UpdateManager}. diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultWriteContext.java b/application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultWriteContext.java index da1f5d00b24..6d4a0589f1c 100644 --- a/application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultWriteContext.java +++ b/application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultWriteContext.java @@ -3,9 +3,9 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import org.opentripplanner.framework.event.DomainEvent; -import org.opentripplanner.framework.transaction.api.RepositoryHandle; -import org.opentripplanner.framework.transaction.api.WriteContext; +import org.opentripplanner.core.domain.framework.event.DomainEvent; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; +import org.opentripplanner.core.domain.framework.transaction.api.WriteContext; /** * Task-scoped implementation of {@link WriteContext}. diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/internal/HandlerEntry.java b/application/src/main/java/org/opentripplanner/framework/transaction/internal/HandlerEntry.java index 36484c31a5c..1b55a430495 100644 --- a/application/src/main/java/org/opentripplanner/framework/transaction/internal/HandlerEntry.java +++ b/application/src/main/java/org/opentripplanner/framework/transaction/internal/HandlerEntry.java @@ -1,8 +1,8 @@ package org.opentripplanner.framework.transaction.internal; -import org.opentripplanner.framework.event.DomainEvent; -import org.opentripplanner.framework.event.EventHandler; -import org.opentripplanner.framework.transaction.api.RepositoryHandle; +import org.opentripplanner.core.domain.framework.event.DomainEvent; +import org.opentripplanner.core.domain.framework.event.EventHandler; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; /** * Pairs a {@link EventHandler} with the {@link RepositoryHandle} whose mutable snapshot it writes diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/internal/Transaction.java b/application/src/main/java/org/opentripplanner/framework/transaction/internal/Transaction.java index 0bcb4fc28f8..b258739f24b 100644 --- a/application/src/main/java/org/opentripplanner/framework/transaction/internal/Transaction.java +++ b/application/src/main/java/org/opentripplanner/framework/transaction/internal/Transaction.java @@ -2,8 +2,8 @@ import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.framework.transaction.UpdateManager; -import org.opentripplanner.framework.transaction.api.TransactionScope; +import org.opentripplanner.core.domain.framework.transaction.UpdateManager; +import org.opentripplanner.core.domain.framework.transaction.api.TransactionScope; /** * An opaque identity token representing a single committed state of the repository set. diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/internal/TransactionFactory.java b/application/src/main/java/org/opentripplanner/framework/transaction/internal/TransactionFactory.java index 1d3a937d2d3..fc709d6b826 100644 --- a/application/src/main/java/org/opentripplanner/framework/transaction/internal/TransactionFactory.java +++ b/application/src/main/java/org/opentripplanner/framework/transaction/internal/TransactionFactory.java @@ -2,8 +2,8 @@ import java.time.Duration; import java.util.concurrent.ThreadFactory; -import org.opentripplanner.framework.transaction.RepositoryRegistry; -import org.opentripplanner.framework.transaction.UpdateManager; +import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; +import org.opentripplanner.core.domain.framework.transaction.UpdateManager; /** * Factory for creating instances of the transaction framework. diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/internal/TransactionalRepository.java b/application/src/main/java/org/opentripplanner/framework/transaction/internal/TransactionalRepository.java index 533cb8a40f2..230bc22a4ed 100644 --- a/application/src/main/java/org/opentripplanner/framework/transaction/internal/TransactionalRepository.java +++ b/application/src/main/java/org/opentripplanner/framework/transaction/internal/TransactionalRepository.java @@ -2,7 +2,7 @@ import java.util.Objects; import java.util.function.Supplier; -import org.opentripplanner.framework.transaction.api.RepositoryLifecycle; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryLifecycle; class TransactionalRepository { diff --git a/application/src/main/java/org/opentripplanner/service/realtimevehicles/RealtimeVehicleRepository.java b/application/src/main/java/org/opentripplanner/service/realtimevehicles/RealtimeVehicleRepository.java index c0f989ac7d0..4ed0f609b70 100644 --- a/application/src/main/java/org/opentripplanner/service/realtimevehicles/RealtimeVehicleRepository.java +++ b/application/src/main/java/org/opentripplanner/service/realtimevehicles/RealtimeVehicleRepository.java @@ -1,6 +1,7 @@ package org.opentripplanner.service.realtimevehicles; import com.google.common.collect.Multimap; +import org.opentripplanner.core.domain.framework.transaction.api.WriteContext; import org.opentripplanner.service.realtimevehicles.model.RealtimeVehicle; import org.opentripplanner.transit.model.network.TripPattern; @@ -8,7 +9,7 @@ * The mutable repository for the realtime vehicles. It is managed by the transaction framework: * a new repository initialized from the last committed {@link RealtimeVehicleRepositorySnapshot} * is created for each transaction that writes vehicles. The vehicle-position updater obtains it - * through a {@link org.opentripplanner.framework.transaction.api.WriteContext} on the single + * through a {@link WriteContext} on the single * writer thread, and the repository lifecycle publishes a new immutable * {@link RealtimeVehicleRepositorySnapshot} for the request threads at commit time. */ diff --git a/application/src/main/java/org/opentripplanner/service/realtimevehicles/configure/RealtimeVehicleRepositoryModule.java b/application/src/main/java/org/opentripplanner/service/realtimevehicles/configure/RealtimeVehicleRepositoryModule.java index d561d4f3c24..c9bda360784 100644 --- a/application/src/main/java/org/opentripplanner/service/realtimevehicles/configure/RealtimeVehicleRepositoryModule.java +++ b/application/src/main/java/org/opentripplanner/service/realtimevehicles/configure/RealtimeVehicleRepositoryModule.java @@ -3,8 +3,8 @@ import dagger.Module; import dagger.Provides; import jakarta.inject.Singleton; -import org.opentripplanner.framework.transaction.RepositoryRegistry; -import org.opentripplanner.framework.transaction.api.RepositoryHandle; +import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; import org.opentripplanner.framework.transaction.configure.TransitDomain; import org.opentripplanner.service.realtimevehicles.RealtimeVehicleRepository; import org.opentripplanner.service.realtimevehicles.RealtimeVehicleRepositorySnapshot; diff --git a/application/src/main/java/org/opentripplanner/service/realtimevehicles/internal/RealtimeVehicleRepositoryLifecycle.java b/application/src/main/java/org/opentripplanner/service/realtimevehicles/internal/RealtimeVehicleRepositoryLifecycle.java index 8f35f548ee5..8c2ccc2a471 100644 --- a/application/src/main/java/org/opentripplanner/service/realtimevehicles/internal/RealtimeVehicleRepositoryLifecycle.java +++ b/application/src/main/java/org/opentripplanner/service/realtimevehicles/internal/RealtimeVehicleRepositoryLifecycle.java @@ -1,6 +1,6 @@ package org.opentripplanner.service.realtimevehicles.internal; -import org.opentripplanner.framework.transaction.api.RepositoryLifecycle; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryLifecycle; import org.opentripplanner.service.realtimevehicles.RealtimeVehicleRepository; import org.opentripplanner.service.realtimevehicles.RealtimeVehicleRepositorySnapshot; diff --git a/application/src/main/java/org/opentripplanner/standalone/api/HttpRequestScoped.java b/application/src/main/java/org/opentripplanner/standalone/api/HttpRequestScoped.java index dcf74e22442..dcea6ae11e7 100644 --- a/application/src/main/java/org/opentripplanner/standalone/api/HttpRequestScoped.java +++ b/application/src/main/java/org/opentripplanner/standalone/api/HttpRequestScoped.java @@ -5,12 +5,13 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.opentripplanner.core.domain.framework.transaction.api.TransactionScope; import org.opentripplanner.standalone.configure.RequestScopedFactory; /** * A real Dagger scope for bindings that must be created exactly once per HTTP request and shared * for the lifetime of that request — most importantly the {@link - * org.opentripplanner.framework.transaction.api.TransactionScope} pinning a consistent view of + * TransactionScope} pinning a consistent view of * real-time data, and anything derived from it (e.g. {@link * org.opentripplanner.transit.service.TransitService}). See {@link * RequestScopedFactory}. 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 7960f449040..ff37cdc814a 100644 --- a/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java +++ b/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java @@ -3,6 +3,7 @@ import jakarta.ws.rs.core.Application; import javax.annotation.Nullable; import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; import org.opentripplanner.datastore.api.DataSource; import org.opentripplanner.ext.carpooling.CarpoolingRepository; import org.opentripplanner.ext.carpooling.routing.CarpoolTripVertexResolver; @@ -11,7 +12,6 @@ import org.opentripplanner.ext.stopconsolidation.StopConsolidationRepository; import org.opentripplanner.framework.application.LogMDCSupport; import org.opentripplanner.framework.application.OTPFeature; -import org.opentripplanner.framework.transaction.api.RepositoryHandle; import org.opentripplanner.graph_builder.GraphBuilder; import org.opentripplanner.graph_builder.GraphBuilderDataSources; import org.opentripplanner.graph_builder.issue.api.DataImportIssueSummary; diff --git a/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java b/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java index 75e3ac5d063..6b70c4104da 100644 --- a/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java +++ b/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java @@ -10,6 +10,8 @@ import org.opentripplanner.apis.transmodel.configure.TransmodelSchema; import org.opentripplanner.apis.transmodel.configure.TransmodelSchemaModule; import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.transaction.UpdateManager; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; import org.opentripplanner.ext.carpooling.CarpoolingRepository; import org.opentripplanner.ext.carpooling.CarpoolingService; import org.opentripplanner.ext.carpooling.configure.CarpoolingModule; @@ -27,8 +29,6 @@ import org.opentripplanner.ext.sorlandsbanen.configure.SorlandsbanenNorwayModule; import org.opentripplanner.ext.stopconsolidation.StopConsolidationRepository; import org.opentripplanner.ext.stopconsolidation.configure.StopConsolidationServiceModule; -import org.opentripplanner.framework.transaction.UpdateManager; -import org.opentripplanner.framework.transaction.api.RepositoryHandle; import org.opentripplanner.framework.transaction.configure.StreetDomain; import org.opentripplanner.framework.transaction.configure.TransactionModule; import org.opentripplanner.framework.transaction.configure.TransitDomain; diff --git a/application/src/main/java/org/opentripplanner/standalone/configure/RequestScopedFactory.java b/application/src/main/java/org/opentripplanner/standalone/configure/RequestScopedFactory.java index 82970bf58e1..9672c903243 100644 --- a/application/src/main/java/org/opentripplanner/standalone/configure/RequestScopedFactory.java +++ b/application/src/main/java/org/opentripplanner/standalone/configure/RequestScopedFactory.java @@ -9,11 +9,11 @@ import org.opentripplanner.apis.transmodel.TransmodelAPIParameters; import org.opentripplanner.apis.transmodel.TransmodelGraphQLRequestContext; import org.opentripplanner.apis.transmodel.configure.TransmodelSchema; +import org.opentripplanner.core.domain.framework.transaction.api.TransactionScope; import org.opentripplanner.ext.empiricaldelay.EmpiricalDelayService; import org.opentripplanner.ext.geocoder.LuceneIndex; import org.opentripplanner.ext.ojp.parameters.OjpApiParameters; import org.opentripplanner.ext.ojp.parameters.TriasApiParameters; -import org.opentripplanner.framework.transaction.api.TransactionScope; import org.opentripplanner.routing.api.RoutingService; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.fares.FareService; diff --git a/application/src/main/java/org/opentripplanner/standalone/configure/RequestScopedModule.java b/application/src/main/java/org/opentripplanner/standalone/configure/RequestScopedModule.java index 6e908f13ffc..361172c8a86 100644 --- a/application/src/main/java/org/opentripplanner/standalone/configure/RequestScopedModule.java +++ b/application/src/main/java/org/opentripplanner/standalone/configure/RequestScopedModule.java @@ -9,6 +9,9 @@ import org.opentripplanner.apis.gtfs.GtfsGraphQLRequestContext; import org.opentripplanner.apis.transmodel.TransmodelAPIParameters; import org.opentripplanner.apis.transmodel.TransmodelGraphQLRequestContext; +import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; +import org.opentripplanner.core.domain.framework.transaction.api.TransactionScope; import org.opentripplanner.ext.carpooling.CarpoolingService; import org.opentripplanner.ext.dataoverlay.configuration.DataOverlayParameterBindings; import org.opentripplanner.ext.flex.FlexParameters; @@ -18,9 +21,6 @@ import org.opentripplanner.ext.ridehailing.RideHailingService; import org.opentripplanner.ext.sorlandsbanen.SorlandsbanenNorwayService; import org.opentripplanner.ext.stopconsolidation.StopConsolidationService; -import org.opentripplanner.framework.transaction.RepositoryRegistry; -import org.opentripplanner.framework.transaction.api.RepositoryHandle; -import org.opentripplanner.framework.transaction.api.TransactionScope; import org.opentripplanner.framework.transaction.configure.TransitDomain; import org.opentripplanner.raptor.configure.RaptorConfig; import org.opentripplanner.routing.algorithm.filterchain.ext.EmissionDecorator; diff --git a/application/src/main/java/org/opentripplanner/standalone/server/MetricsLogging.java b/application/src/main/java/org/opentripplanner/standalone/server/MetricsLogging.java index a9b3804c488..a7aa580770c 100644 --- a/application/src/main/java/org/opentripplanner/standalone/server/MetricsLogging.java +++ b/application/src/main/java/org/opentripplanner/standalone/server/MetricsLogging.java @@ -19,8 +19,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ForkJoinPool; +import org.opentripplanner.core.domain.framework.transaction.UpdateManager; import org.opentripplanner.framework.application.OTPFeature; -import org.opentripplanner.framework.transaction.UpdateManager; import org.opentripplanner.framework.transaction.configure.StreetDomain; import org.opentripplanner.framework.transaction.configure.TransitDomain; import org.opentripplanner.graph_builder.issue.api.DataImportIssueSummary; diff --git a/application/src/main/java/org/opentripplanner/transit/configure/TransitModule.java b/application/src/main/java/org/opentripplanner/transit/configure/TransitModule.java index 0d35a4ab486..6c0b081700d 100644 --- a/application/src/main/java/org/opentripplanner/transit/configure/TransitModule.java +++ b/application/src/main/java/org/opentripplanner/transit/configure/TransitModule.java @@ -5,9 +5,9 @@ import dagger.Provides; import jakarta.inject.Singleton; import java.time.LocalDate; -import org.opentripplanner.framework.transaction.RepositoryRegistry; +import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; import org.opentripplanner.framework.transaction.TimetableSnapshotParameters; -import org.opentripplanner.framework.transaction.api.RepositoryHandle; import org.opentripplanner.framework.transaction.configure.TransitDomain; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitData; import org.opentripplanner.standalone.config.ConfigModel; diff --git a/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepository.java b/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepository.java index 945de2e601f..1798441f85a 100644 --- a/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepository.java +++ b/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepository.java @@ -2,13 +2,14 @@ import java.time.LocalDate; import javax.annotation.Nullable; +import org.opentripplanner.core.domain.framework.transaction.api.WriteContext; import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.transit.model.timetable.RealTimeTripUpdate; /** * The mutable repository for the realtime-updated timetables and trip calendar. It is managed by * the transaction framework: trip updaters obtain it through a - * {@link org.opentripplanner.framework.transaction.api.WriteContext} on the single writer thread, + * {@link WriteContext} on the single writer thread, * and {@link #createSnapshot()} is called at commit time to publish a new immutable * {@link TimetableRepositorySnapshot} for the request threads. */ diff --git a/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepositoryLifecycle.java b/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepositoryLifecycle.java index 44e6c905553..9e39e939613 100644 --- a/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepositoryLifecycle.java +++ b/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepositoryLifecycle.java @@ -2,7 +2,7 @@ import java.time.LocalDate; import java.util.function.Supplier; -import org.opentripplanner.framework.transaction.api.RepositoryLifecycle; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryLifecycle; /** * Copy-on-write / freeze lifecycle for the realtime-timetable repository. The repository is a diff --git a/application/src/main/java/org/opentripplanner/updater/GraphUpdaterManager.java b/application/src/main/java/org/opentripplanner/updater/GraphUpdaterManager.java index 553708db70a..801c9fb0456 100644 --- a/application/src/main/java/org/opentripplanner/updater/GraphUpdaterManager.java +++ b/application/src/main/java/org/opentripplanner/updater/GraphUpdaterManager.java @@ -10,6 +10,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.Predicate; import java.util.stream.Collectors; +import org.opentripplanner.core.domain.framework.transaction.UpdateManager; import org.opentripplanner.model.projectinfo.OtpProjectInfo; import org.opentripplanner.updater.spi.GraphUpdater; import org.opentripplanner.updater.spi.PollingGraphUpdater; @@ -26,7 +27,7 @@ * Write tasks submitted by updaters are serialised per {@link WriteDomain} by the * {@link WriteToGraphCallback}s passed at construction — currently {@link GraphWriterService} * instances, which will be replaced by the new - * {@link org.opentripplanner.framework.transaction.UpdateManager} framework. Each updater is + * {@link UpdateManager} framework. Each updater is * routed to the callback of its declared write domain, so updaters working on unrelated domains * run in parallel. */ diff --git a/application/src/main/java/org/opentripplanner/updater/GraphWriterService.java b/application/src/main/java/org/opentripplanner/updater/GraphWriterService.java index cc3c1c2bcb8..dabc8aff49c 100644 --- a/application/src/main/java/org/opentripplanner/updater/GraphWriterService.java +++ b/application/src/main/java/org/opentripplanner/updater/GraphWriterService.java @@ -2,9 +2,9 @@ import java.util.concurrent.Future; import java.util.function.Function; -import org.opentripplanner.framework.transaction.UpdateManager; -import org.opentripplanner.framework.transaction.api.RepositoryHandle; -import org.opentripplanner.framework.transaction.api.WriteContext; +import org.opentripplanner.core.domain.framework.transaction.UpdateManager; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; +import org.opentripplanner.core.domain.framework.transaction.api.WriteContext; import org.opentripplanner.service.realtimevehicles.RealtimeVehicleRepository; import org.opentripplanner.service.realtimevehicles.RealtimeVehicleRepositorySnapshot; import org.opentripplanner.street.graph.Graph; diff --git a/application/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java b/application/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java index fa840e4a17e..9d20459b326 100644 --- a/application/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java +++ b/application/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java @@ -5,6 +5,8 @@ import java.util.List; import javax.annotation.Nullable; import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.transaction.UpdateManager; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; import org.opentripplanner.ext.carpooling.CarpoolingRepository; import org.opentripplanner.ext.carpooling.routing.CarpoolTripVertexResolver; import org.opentripplanner.ext.carpooling.updater.SiriETCarpoolingUpdater; @@ -14,8 +16,6 @@ import org.opentripplanner.ext.vehiclerentalservicedirectory.api.VehicleRentalServiceDirectoryFetcherParameters; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.framework.io.OtpHttpClientFactory; -import org.opentripplanner.framework.transaction.UpdateManager; -import org.opentripplanner.framework.transaction.api.RepositoryHandle; import org.opentripplanner.gbfs.network.GbfsNetworkOverrides; import org.opentripplanner.routing.impl.DelegatingTransitAlertServiceImpl; import org.opentripplanner.service.realtimevehicles.RealtimeVehicleRepository; diff --git a/application/src/test-fixtures/java/org/opentripplanner/standalone/api/TestServerContext.java b/application/src/test-fixtures/java/org/opentripplanner/standalone/api/TestServerContext.java index 92f6dafa5c2..3df04a10f04 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/standalone/api/TestServerContext.java +++ b/application/src/test-fixtures/java/org/opentripplanner/standalone/api/TestServerContext.java @@ -5,11 +5,11 @@ import java.time.LocalDate; import java.util.List; import java.util.Optional; +import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; import org.opentripplanner.ext.emission.internal.DefaultEmissionRepository; import org.opentripplanner.ext.emission.internal.DefaultEmissionService; import org.opentripplanner.ext.emission.internal.itinerary.EmissionItineraryDecorator; -import org.opentripplanner.framework.transaction.RepositoryRegistry; -import org.opentripplanner.framework.transaction.api.RepositoryHandle; import org.opentripplanner.framework.transaction.internal.TransactionFactory; import org.opentripplanner.raptor.configure.RaptorConfig; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDecorator; diff --git a/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitTestEnvironment.java b/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitTestEnvironment.java index 03b44607fe8..1cb7e224b89 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitTestEnvironment.java +++ b/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitTestEnvironment.java @@ -6,10 +6,10 @@ import java.time.ZoneId; import java.util.concurrent.ExecutionException; import org.opentripplanner.LocalTimeParser; +import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; +import org.opentripplanner.core.domain.framework.transaction.UpdateManager; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; -import org.opentripplanner.framework.transaction.RepositoryRegistry; -import org.opentripplanner.framework.transaction.UpdateManager; -import org.opentripplanner.framework.transaction.api.RepositoryHandle; import org.opentripplanner.framework.transaction.internal.TransactionFactory; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitData; import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.RaptorTransitDataMapper; diff --git a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/TransactionFrameworkTest.java b/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/TransactionFrameworkTest.java index 52710e82670..d03ccffdd8a 100644 --- a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/TransactionFrameworkTest.java +++ b/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/TransactionFrameworkTest.java @@ -13,11 +13,11 @@ import java.util.function.Function; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.transaction.RepositoryRegistry; -import org.opentripplanner.framework.transaction.UpdateManager; -import org.opentripplanner.framework.transaction.api.RepositoryHandle; -import org.opentripplanner.framework.transaction.api.TransactionScope; -import org.opentripplanner.framework.transaction.api.WriteContext; +import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; +import org.opentripplanner.core.domain.framework.transaction.UpdateManager; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; +import org.opentripplanner.core.domain.framework.transaction.api.TransactionScope; +import org.opentripplanner.core.domain.framework.transaction.api.WriteContext; import org.opentripplanner.framework.transaction.internal.TransactionFactory; import org.opentripplanner.framework.transaction.moduletest.candyshop.base.Entity; import org.opentripplanner.framework.transaction.moduletest.candyshop.base.EntityIdProvider; diff --git a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/customer/internal/CustomerRepositoryLifecycle.java b/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/customer/internal/CustomerRepositoryLifecycle.java index aea61b893a2..ad803744b4a 100644 --- a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/customer/internal/CustomerRepositoryLifecycle.java +++ b/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/customer/internal/CustomerRepositoryLifecycle.java @@ -1,6 +1,6 @@ package org.opentripplanner.framework.transaction.moduletest.candyshop.customer.internal; -import org.opentripplanner.framework.transaction.api.RepositoryLifecycle; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryLifecycle; import org.opentripplanner.framework.transaction.moduletest.candyshop.customer.CustomerRepository; import org.opentripplanner.framework.transaction.moduletest.candyshop.customer.CustomerRepositorySnapshot; diff --git a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/event/CustomerEventHandler.java b/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/event/CustomerEventHandler.java index d039d4d3080..76c0352543c 100644 --- a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/event/CustomerEventHandler.java +++ b/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/event/CustomerEventHandler.java @@ -1,6 +1,6 @@ package org.opentripplanner.framework.transaction.moduletest.candyshop.event; -import org.opentripplanner.framework.event.EventHandler; +import org.opentripplanner.core.domain.framework.event.EventHandler; import org.opentripplanner.framework.transaction.moduletest.candyshop.customer.CustomerRepository; import org.opentripplanner.framework.transaction.moduletest.candyshop.customer.model.Customer; diff --git a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/event/CustomerOrderDomainEvent.java b/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/event/CustomerOrderDomainEvent.java index b0fee0baf41..286f267bd59 100644 --- a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/event/CustomerOrderDomainEvent.java +++ b/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/event/CustomerOrderDomainEvent.java @@ -1,6 +1,6 @@ package org.opentripplanner.framework.transaction.moduletest.candyshop.event; -import org.opentripplanner.framework.event.DomainEvent; +import org.opentripplanner.core.domain.framework.event.DomainEvent; public record CustomerOrderDomainEvent( int orderId, diff --git a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/event/OrderEventHandler.java b/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/event/OrderEventHandler.java index 19c44c93760..f6e293e7b6e 100644 --- a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/event/OrderEventHandler.java +++ b/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/event/OrderEventHandler.java @@ -1,6 +1,6 @@ package org.opentripplanner.framework.transaction.moduletest.candyshop.event; -import org.opentripplanner.framework.event.EventHandler; +import org.opentripplanner.core.domain.framework.event.EventHandler; import org.opentripplanner.framework.transaction.moduletest.candyshop.order.OrderRepository; import org.opentripplanner.framework.transaction.moduletest.candyshop.order.model.Order; diff --git a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/order/internal/OrderRepositoryLifecycle.java b/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/order/internal/OrderRepositoryLifecycle.java index 95e6cdc1f23..42dd7edaca8 100644 --- a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/order/internal/OrderRepositoryLifecycle.java +++ b/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/order/internal/OrderRepositoryLifecycle.java @@ -1,6 +1,6 @@ package org.opentripplanner.framework.transaction.moduletest.candyshop.order.internal; -import org.opentripplanner.framework.transaction.api.RepositoryLifecycle; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryLifecycle; import org.opentripplanner.framework.transaction.moduletest.candyshop.order.OrderRepository; import org.opentripplanner.framework.transaction.moduletest.candyshop.order.OrderService; diff --git a/application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java b/application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java index 5b0f1f844fe..97c84115d6e 100644 --- a/application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java +++ b/application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java @@ -12,9 +12,9 @@ import java.util.Map; import java.util.function.Predicate; import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; import org.opentripplanner.framework.application.OtpAppException; import org.opentripplanner.framework.transaction.TimetableSnapshotParameters; -import org.opentripplanner.framework.transaction.api.RepositoryHandle; import org.opentripplanner.framework.transaction.internal.TransactionFactory; import org.opentripplanner.gbfs.network.GbfsNetworkOverrides; import org.opentripplanner.model.plan.Itinerary; diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/event/DomainEvent.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/event/DomainEvent.java index 3bf9be15e09..05e26b6aefc 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/event/DomainEvent.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/event/DomainEvent.java @@ -1,3 +1,3 @@ -package org.opentripplanner.framework.event; +package org.opentripplanner.core.domain.framework.event; public interface DomainEvent {} diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/event/EventHandler.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/event/EventHandler.java index 80d48ab8c31..f1f3fcd2975 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/event/EventHandler.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/event/EventHandler.java @@ -1,6 +1,6 @@ -package org.opentripplanner.framework.event; +package org.opentripplanner.core.domain.framework.event; -import org.opentripplanner.framework.transaction.api.WriteContext; +import org.opentripplanner.core.domain.framework.transaction.api.WriteContext; /** * A write-side event handler that receives a mutable repository at dispatch time. diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/RepositoryRegistry.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/RepositoryRegistry.java index ba40eab18ad..6f7b266bbad 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/RepositoryRegistry.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/RepositoryRegistry.java @@ -1,9 +1,9 @@ -package org.opentripplanner.framework.transaction; +package org.opentripplanner.core.domain.framework.transaction; import java.util.function.Consumer; -import org.opentripplanner.framework.transaction.api.RepositoryHandle; -import org.opentripplanner.framework.transaction.api.RepositoryLifecycle; -import org.opentripplanner.framework.transaction.api.TransactionScope; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryLifecycle; +import org.opentripplanner.core.domain.framework.transaction.api.TransactionScope; /** * Application-scoped registry for transactional repositories. diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/UpdateManager.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/UpdateManager.java index 3e690510808..e3aa0a92790 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/UpdateManager.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/UpdateManager.java @@ -1,12 +1,12 @@ -package org.opentripplanner.framework.transaction; +package org.opentripplanner.core.domain.framework.transaction; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import java.util.function.Consumer; -import org.opentripplanner.framework.event.DomainEvent; -import org.opentripplanner.framework.event.EventHandler; -import org.opentripplanner.framework.transaction.api.RepositoryHandle; -import org.opentripplanner.framework.transaction.api.WriteContext; +import org.opentripplanner.core.domain.framework.event.DomainEvent; +import org.opentripplanner.core.domain.framework.event.EventHandler; +import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; +import org.opentripplanner.core.domain.framework.transaction.api.WriteContext; /** * Application-scoped manager for write operations against transactional repositories. @@ -31,7 +31,7 @@ public interface UpdateManager { * This method is NOT THREADSAFE and should not be called concurrently with or after event * publications. *

    - * When a {@link org.opentripplanner.framework.event.DomainEvent} matching + * When a {@link DomainEvent} matching * {@code handler.eventType()} is published, the {@link WriteContext} will call the * given event handler, injecting the mutable repository for {@code repoHandle} at dispatch time. * diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryHandle.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryHandle.java index f4609f710fd..939f3eadee7 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryHandle.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryHandle.java @@ -1,7 +1,6 @@ -package org.opentripplanner.framework.transaction.api; +package org.opentripplanner.core.domain.framework.transaction.api; -import org.opentripplanner.framework.transaction.RepositoryRegistry; -import org.opentripplanner.framework.transaction.UpdateManager; +import org.opentripplanner.core.domain.framework.transaction.UpdateManager; /** * Application-scoped handle for a transactional repository. Obtained once at wiring time via diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryLifecycle.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryLifecycle.java index 1f4070e6081..dc4d1493a95 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryLifecycle.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryLifecycle.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.transaction.api; +package org.opentripplanner.core.domain.framework.transaction.api; /** * Strategy for the copy-on-write / freeze lifecycle of a repository snapshot. diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/TransactionScope.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/TransactionScope.java index e3af0d3ba72..9e376fb3ef0 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/TransactionScope.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/TransactionScope.java @@ -1,6 +1,6 @@ -package org.opentripplanner.framework.transaction.api; +package org.opentripplanner.core.domain.framework.transaction.api; -import org.opentripplanner.framework.transaction.RepositoryRegistry; +import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; /** * Request-scoped consistent view over one or more repositories. diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/WriteContext.java b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/WriteContext.java index 8c8c290a2a7..242eea61e0d 100644 --- a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/WriteContext.java +++ b/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/WriteContext.java @@ -1,8 +1,8 @@ -package org.opentripplanner.framework.transaction.api; +package org.opentripplanner.core.domain.framework.transaction.api; -import org.opentripplanner.framework.event.DomainEvent; -import org.opentripplanner.framework.event.EventHandler; -import org.opentripplanner.framework.transaction.UpdateManager; +import org.opentripplanner.core.domain.framework.event.DomainEvent; +import org.opentripplanner.core.domain.framework.event.EventHandler; +import org.opentripplanner.core.domain.framework.transaction.UpdateManager; /** * Task-scoped coordination point for write access during a single update. From 0236ba361f49c08d4e0e97fbc4240e20b883812b Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 17 Sep 2026 20:56:07 +0200 Subject: [PATCH 36/68] refactor: move transaction framework internals to core-framework module(git-mv) --- .../transaction/configure/StreetDomain.java | 0 .../transaction/configure/TransitDomain.java | 0 .../images/tx-framework-repo-model-2.drawio | 0 .../images/tx-framework-repo-model-2.png | Bin .../images/tx-framework-repo-model.drawio | 0 .../transaction/images/tx-framework-repo-model.png | Bin .../internal/DefaultRepositoryHandle.java | 0 .../internal/DefaultRepositoryRegistry.java | 0 .../internal/DefaultTransactionScope.java | 0 .../transaction/internal/DefaultUpdateManager.java | 0 .../transaction/internal/DefaultWriteContext.java | 0 .../transaction/internal/HandlerEntry.java | 0 .../internal/PeriodicCommitScheduler.java | 0 .../internal/RepositorySnapshotCache.java | 0 .../framework/transaction/internal/Transaction.java | 0 .../transaction/internal/TransactionFactory.java | 0 .../transaction/internal/TransactionManager.java | 0 .../internal/TransactionalRepository.java | 0 .../core}/framework/transaction/package.md | 0 .../transaction/internal/TransactionTest.java | 0 .../internal/UpdateManagerMetricsTest.java | 0 .../moduletest/TransactionFrameworkTest.java | 0 .../moduletest/candyshop/base/EntityIdProvider.java | 0 .../moduletest/candyshop/base/EntityMap.java | 0 .../internal/CustomerRepositoryLifecycle.java | 0 .../internal/DefaultCustomerRepository.java | 0 .../candyshop/event/CustomerEventHandler.java | 0 .../candyshop/event/CustomerOrderDomainEvent.java | 0 .../candyshop/event/OrderEventHandler.java | 0 .../moduletest/candyshop/order/OrderService.java | 0 .../order/internal/DefaultOrderRepository.java | 0 .../order/internal/OrderRepositoryLifecycle.java | 0 .../testfixtures/lang}/AssertEqualsAndHashCode.java | 0 33 files changed, 0 insertions(+), 0 deletions(-) rename {application/src/main/java/org/opentripplanner => core/framework/src/main/java/org/opentripplanner/core}/framework/transaction/configure/StreetDomain.java (100%) rename {application/src/main/java/org/opentripplanner => core/framework/src/main/java/org/opentripplanner/core}/framework/transaction/configure/TransitDomain.java (100%) rename {application/src/main/java/org/opentripplanner => core/framework/src/main/java/org/opentripplanner/core}/framework/transaction/images/tx-framework-repo-model-2.drawio (100%) rename {application/src/main/java/org/opentripplanner => core/framework/src/main/java/org/opentripplanner/core}/framework/transaction/images/tx-framework-repo-model-2.png (100%) rename {application/src/main/java/org/opentripplanner => core/framework/src/main/java/org/opentripplanner/core}/framework/transaction/images/tx-framework-repo-model.drawio (100%) rename {application/src/main/java/org/opentripplanner => core/framework/src/main/java/org/opentripplanner/core}/framework/transaction/images/tx-framework-repo-model.png (100%) rename {application/src/main/java/org/opentripplanner => core/framework/src/main/java/org/opentripplanner/core}/framework/transaction/internal/DefaultRepositoryHandle.java (100%) rename {application/src/main/java/org/opentripplanner => core/framework/src/main/java/org/opentripplanner/core}/framework/transaction/internal/DefaultRepositoryRegistry.java (100%) rename {application/src/main/java/org/opentripplanner => core/framework/src/main/java/org/opentripplanner/core}/framework/transaction/internal/DefaultTransactionScope.java (100%) rename {application/src/main/java/org/opentripplanner => core/framework/src/main/java/org/opentripplanner/core}/framework/transaction/internal/DefaultUpdateManager.java (100%) rename {application/src/main/java/org/opentripplanner => core/framework/src/main/java/org/opentripplanner/core}/framework/transaction/internal/DefaultWriteContext.java (100%) rename {application/src/main/java/org/opentripplanner => core/framework/src/main/java/org/opentripplanner/core}/framework/transaction/internal/HandlerEntry.java (100%) rename {application/src/main/java/org/opentripplanner => core/framework/src/main/java/org/opentripplanner/core}/framework/transaction/internal/PeriodicCommitScheduler.java (100%) rename {application/src/main/java/org/opentripplanner => core/framework/src/main/java/org/opentripplanner/core}/framework/transaction/internal/RepositorySnapshotCache.java (100%) rename {application/src/main/java/org/opentripplanner => core/framework/src/main/java/org/opentripplanner/core}/framework/transaction/internal/Transaction.java (100%) rename {application/src/main/java/org/opentripplanner => core/framework/src/main/java/org/opentripplanner/core}/framework/transaction/internal/TransactionFactory.java (100%) rename {application/src/main/java/org/opentripplanner => core/framework/src/main/java/org/opentripplanner/core}/framework/transaction/internal/TransactionManager.java (100%) rename {application/src/main/java/org/opentripplanner => core/framework/src/main/java/org/opentripplanner/core}/framework/transaction/internal/TransactionalRepository.java (100%) rename {application/src/main/java/org/opentripplanner => core/framework/src/main/java/org/opentripplanner/core}/framework/transaction/package.md (100%) rename {application/src/test/java/org/opentripplanner => core/framework/src/test/java/org/opentripplanner/core}/framework/transaction/internal/TransactionTest.java (100%) rename {application/src/test/java/org/opentripplanner => core/framework/src/test/java/org/opentripplanner/core}/framework/transaction/internal/UpdateManagerMetricsTest.java (100%) rename {application/src/test/java/org/opentripplanner => core/framework/src/test/java/org/opentripplanner/core}/framework/transaction/moduletest/TransactionFrameworkTest.java (100%) rename {application/src/test/java/org/opentripplanner => core/framework/src/test/java/org/opentripplanner/core}/framework/transaction/moduletest/candyshop/base/EntityIdProvider.java (100%) rename {application/src/test/java/org/opentripplanner => core/framework/src/test/java/org/opentripplanner/core}/framework/transaction/moduletest/candyshop/base/EntityMap.java (100%) rename {application/src/test/java/org/opentripplanner => core/framework/src/test/java/org/opentripplanner/core}/framework/transaction/moduletest/candyshop/customer/internal/CustomerRepositoryLifecycle.java (100%) rename {application/src/test/java/org/opentripplanner => core/framework/src/test/java/org/opentripplanner/core}/framework/transaction/moduletest/candyshop/customer/internal/DefaultCustomerRepository.java (100%) rename {application/src/test/java/org/opentripplanner => core/framework/src/test/java/org/opentripplanner/core}/framework/transaction/moduletest/candyshop/event/CustomerEventHandler.java (100%) rename {application/src/test/java/org/opentripplanner => core/framework/src/test/java/org/opentripplanner/core}/framework/transaction/moduletest/candyshop/event/CustomerOrderDomainEvent.java (100%) rename {application/src/test/java/org/opentripplanner => core/framework/src/test/java/org/opentripplanner/core}/framework/transaction/moduletest/candyshop/event/OrderEventHandler.java (100%) rename {application/src/test/java/org/opentripplanner => core/framework/src/test/java/org/opentripplanner/core}/framework/transaction/moduletest/candyshop/order/OrderService.java (100%) rename {application/src/test/java/org/opentripplanner => core/framework/src/test/java/org/opentripplanner/core}/framework/transaction/moduletest/candyshop/order/internal/DefaultOrderRepository.java (100%) rename {application/src/test/java/org/opentripplanner => core/framework/src/test/java/org/opentripplanner/core}/framework/transaction/moduletest/candyshop/order/internal/OrderRepositoryLifecycle.java (100%) rename {application/src/test/java/org/opentripplanner/_support/asserts => core/test-fixtures/src/main/java/org/opentripplanner/core/testfixtures/lang}/AssertEqualsAndHashCode.java (100%) diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/configure/StreetDomain.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/configure/StreetDomain.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/transaction/configure/StreetDomain.java rename to core/framework/src/main/java/org/opentripplanner/core/framework/transaction/configure/StreetDomain.java diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/configure/TransitDomain.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/configure/TransitDomain.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/transaction/configure/TransitDomain.java rename to core/framework/src/main/java/org/opentripplanner/core/framework/transaction/configure/TransitDomain.java diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/images/tx-framework-repo-model-2.drawio b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/images/tx-framework-repo-model-2.drawio similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/transaction/images/tx-framework-repo-model-2.drawio rename to core/framework/src/main/java/org/opentripplanner/core/framework/transaction/images/tx-framework-repo-model-2.drawio diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/images/tx-framework-repo-model-2.png b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/images/tx-framework-repo-model-2.png similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/transaction/images/tx-framework-repo-model-2.png rename to core/framework/src/main/java/org/opentripplanner/core/framework/transaction/images/tx-framework-repo-model-2.png diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/images/tx-framework-repo-model.drawio b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/images/tx-framework-repo-model.drawio similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/transaction/images/tx-framework-repo-model.drawio rename to core/framework/src/main/java/org/opentripplanner/core/framework/transaction/images/tx-framework-repo-model.drawio diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/images/tx-framework-repo-model.png b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/images/tx-framework-repo-model.png similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/transaction/images/tx-framework-repo-model.png rename to core/framework/src/main/java/org/opentripplanner/core/framework/transaction/images/tx-framework-repo-model.png diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultRepositoryHandle.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultRepositoryHandle.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultRepositoryHandle.java rename to core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultRepositoryHandle.java diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultRepositoryRegistry.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultRepositoryRegistry.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultRepositoryRegistry.java rename to core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultRepositoryRegistry.java diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultTransactionScope.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultTransactionScope.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultTransactionScope.java rename to core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultTransactionScope.java diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultUpdateManager.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultUpdateManager.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultUpdateManager.java rename to core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultUpdateManager.java diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultWriteContext.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultWriteContext.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/transaction/internal/DefaultWriteContext.java rename to core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultWriteContext.java diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/internal/HandlerEntry.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/HandlerEntry.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/transaction/internal/HandlerEntry.java rename to core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/HandlerEntry.java diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/internal/PeriodicCommitScheduler.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/PeriodicCommitScheduler.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/transaction/internal/PeriodicCommitScheduler.java rename to core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/PeriodicCommitScheduler.java diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/internal/RepositorySnapshotCache.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/RepositorySnapshotCache.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/transaction/internal/RepositorySnapshotCache.java rename to core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/RepositorySnapshotCache.java diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/internal/Transaction.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/Transaction.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/transaction/internal/Transaction.java rename to core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/Transaction.java diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/internal/TransactionFactory.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionFactory.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/transaction/internal/TransactionFactory.java rename to core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionFactory.java diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/internal/TransactionManager.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionManager.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/transaction/internal/TransactionManager.java rename to core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionManager.java diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/internal/TransactionalRepository.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionalRepository.java similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/transaction/internal/TransactionalRepository.java rename to core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionalRepository.java diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/package.md b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/package.md similarity index 100% rename from application/src/main/java/org/opentripplanner/framework/transaction/package.md rename to core/framework/src/main/java/org/opentripplanner/core/framework/transaction/package.md diff --git a/application/src/test/java/org/opentripplanner/framework/transaction/internal/TransactionTest.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/internal/TransactionTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/transaction/internal/TransactionTest.java rename to core/framework/src/test/java/org/opentripplanner/core/framework/transaction/internal/TransactionTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/transaction/internal/UpdateManagerMetricsTest.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/internal/UpdateManagerMetricsTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/transaction/internal/UpdateManagerMetricsTest.java rename to core/framework/src/test/java/org/opentripplanner/core/framework/transaction/internal/UpdateManagerMetricsTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/TransactionFrameworkTest.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/TransactionFrameworkTest.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/transaction/moduletest/TransactionFrameworkTest.java rename to core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/TransactionFrameworkTest.java diff --git a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/base/EntityIdProvider.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/base/EntityIdProvider.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/base/EntityIdProvider.java rename to core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/base/EntityIdProvider.java diff --git a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/base/EntityMap.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/base/EntityMap.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/base/EntityMap.java rename to core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/base/EntityMap.java diff --git a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/customer/internal/CustomerRepositoryLifecycle.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/internal/CustomerRepositoryLifecycle.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/customer/internal/CustomerRepositoryLifecycle.java rename to core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/internal/CustomerRepositoryLifecycle.java diff --git a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/customer/internal/DefaultCustomerRepository.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/internal/DefaultCustomerRepository.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/customer/internal/DefaultCustomerRepository.java rename to core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/internal/DefaultCustomerRepository.java diff --git a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/event/CustomerEventHandler.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/CustomerEventHandler.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/event/CustomerEventHandler.java rename to core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/CustomerEventHandler.java diff --git a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/event/CustomerOrderDomainEvent.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/CustomerOrderDomainEvent.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/event/CustomerOrderDomainEvent.java rename to core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/CustomerOrderDomainEvent.java diff --git a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/event/OrderEventHandler.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/OrderEventHandler.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/event/OrderEventHandler.java rename to core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/OrderEventHandler.java diff --git a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/order/OrderService.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/OrderService.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/order/OrderService.java rename to core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/OrderService.java diff --git a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/order/internal/DefaultOrderRepository.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/internal/DefaultOrderRepository.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/order/internal/DefaultOrderRepository.java rename to core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/internal/DefaultOrderRepository.java diff --git a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/order/internal/OrderRepositoryLifecycle.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/internal/OrderRepositoryLifecycle.java similarity index 100% rename from application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/order/internal/OrderRepositoryLifecycle.java rename to core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/internal/OrderRepositoryLifecycle.java diff --git a/application/src/test/java/org/opentripplanner/_support/asserts/AssertEqualsAndHashCode.java b/core/test-fixtures/src/main/java/org/opentripplanner/core/testfixtures/lang/AssertEqualsAndHashCode.java similarity index 100% rename from application/src/test/java/org/opentripplanner/_support/asserts/AssertEqualsAndHashCode.java rename to core/test-fixtures/src/main/java/org/opentripplanner/core/testfixtures/lang/AssertEqualsAndHashCode.java From 9fee767b87b3501447e86152e33451f6912ef5da Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 17 Sep 2026 20:55:55 +0200 Subject: [PATCH 37/68] refactor: move transaction framework internals to core-framework module(code) --- ARCHITECTURE.md | 2 +- application/pom.xml | 24 +++++------- .../EmissionFeedParametersTest.java | 2 +- .../parameters/EmissionParametersTest.java | 2 +- .../EmissionVehicleParametersTest.java | 2 +- .../model/calendar/ServiceCalendarTest.java | 2 +- .../EmpiricalDelayParametersTest.java | 2 +- .../configure/TransactionModule.java | 4 +- .../RealtimeVehicleRepositoryModule.java | 2 +- .../ConstructApplicationFactory.java | 4 +- .../configure/RequestScopedModule.java | 2 +- .../standalone/server/MetricsLogging.java | 4 +- .../transit/configure/TransitModule.java | 2 +- .../standalone/api/TestServerContext.java | 2 +- .../transit/model/TransitTestEnvironment.java | 2 +- .../java/org/opentripplanner/GtfsTest.java | 15 ++++--- .../model/geometry/EncodedPolylineTest.java | 2 +- .../framework/model/CostTest.java | 2 +- .../moduletest/candyshop/base/Entity.java | 5 --- .../customer/CustomerRepository.java | 7 ---- .../customer/CustomerRepositorySnapshot.java | 5 --- .../candyshop/customer/model/Customer.java | 5 --- .../candyshop/order/OrderRepository.java | 7 ---- .../candyshop/order/model/Order.java | 5 --- .../model/GenericLocationTest.java | 2 +- .../DirectTransitPreferencesTest.java | 2 +- .../request/request/JourneyRequestTest.java | 2 +- .../request/request/StreetRequestTest.java | 2 +- .../request/request/TransitRequestTest.java | 2 +- .../via/PassThroughViaLocationTest.java | 2 +- .../api/request/via/VisitViaLocationTest.java | 2 +- .../routing/core/RouteRequestTest.java | 2 +- .../transit/speed_test/SpeedTest.java | 2 +- core/framework/pom.xml | 27 +++++++++---- .../transaction/configure/StreetDomain.java | 2 +- .../transaction/configure/TransitDomain.java | 2 +- .../internal/DefaultRepositoryHandle.java | 2 +- .../internal/DefaultRepositoryRegistry.java | 2 +- .../internal/DefaultTransactionScope.java | 2 +- .../internal/DefaultUpdateManager.java | 2 +- .../internal/DefaultWriteContext.java | 2 +- .../transaction/internal/HandlerEntry.java | 2 +- .../internal/PeriodicCommitScheduler.java | 2 +- .../internal/RepositorySnapshotCache.java | 2 +- .../transaction/internal/Transaction.java | 2 +- .../internal/TransactionFactory.java | 2 +- .../internal/TransactionManager.java | 2 +- .../internal/TransactionalRepository.java | 2 +- .../core/framework/transaction/package.md | 2 +- .../transaction/internal/TransactionTest.java | 4 +- .../internal/UpdateManagerMetricsTest.java | 2 +- .../moduletest/TransactionFrameworkTest.java | 34 ++++++++-------- .../moduletest/candyshop/base/Entity.java | 5 +++ .../candyshop/base/EntityIdProvider.java | 2 +- .../moduletest/candyshop/base/EntityMap.java | 2 +- .../customer/CustomerRepository.java | 7 ++++ .../customer/CustomerRepositorySnapshot.java | 5 +++ .../internal/CustomerRepositoryLifecycle.java | 6 +-- .../internal/DefaultCustomerRepository.java | 10 ++--- .../candyshop/customer/model/Customer.java | 5 +++ .../candyshop/event/CustomerEventHandler.java | 6 +-- .../event/CustomerOrderDomainEvent.java | 2 +- .../candyshop/event/OrderEventHandler.java | 6 +-- .../candyshop/order/OrderRepository.java | 7 ++++ .../candyshop/order/OrderService.java | 4 +- .../internal/DefaultOrderRepository.java | 10 ++--- .../internal/OrderRepositoryLifecycle.java | 6 +-- .../candyshop/order/model/Order.java | 5 +++ core/pom.xml | 3 +- core/test-fixtures/pom.xml | 39 +++++++++++++++++++ .../lang/AssertEqualsAndHashCode.java | 2 +- 71 files changed, 203 insertions(+), 155 deletions(-) delete mode 100644 application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/base/Entity.java delete mode 100644 application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/customer/CustomerRepository.java delete mode 100644 application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/customer/CustomerRepositorySnapshot.java delete mode 100644 application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/customer/model/Customer.java delete mode 100644 application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/order/OrderRepository.java delete mode 100644 application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/order/model/Order.java create mode 100644 core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/base/Entity.java create mode 100644 core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/CustomerRepository.java create mode 100644 core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/CustomerRepositorySnapshot.java create mode 100644 core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/model/Customer.java create mode 100644 core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/OrderRepository.java create mode 100644 core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/model/Order.java create mode 100644 core/test-fixtures/pom.xml diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md index 47df80c4682..1dda1d83bfd 100644 --- a/ARCHITECTURE.md +++ b/ARCHITECTURE.md @@ -97,7 +97,7 @@ in order to sort and reduce the number of returned itineraries. It can also be u returned itineraries, especially if it requires more complex calculations, which would be unfeasible to do during the routing process. -### [Transaction Framework](application/src/main/java/org/opentripplanner/framework/transaction/package.md) +### [Transaction Framework](core/framework/src/main/java/org/opentripplanner/core/framework/transaction/package.md) A generic, reusable copy-on-write concurrency mechanism for application-scoped repositories: any number of concurrent readers sees a consistent, unchanging snapshot while a single writer thread diff --git a/application/pom.xml b/application/pom.xml index 6c4ce50867b..ec35449b3a5 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -23,6 +23,11 @@ core-utils ${project.version} + + ${project.groupId} + core-framework + ${project.version} + ${project.groupId} raptor-router @@ -139,21 +144,10 @@ - org.junit.jupiter - junit-jupiter-api - ${junit.version} - test - - - org.junit.jupiter - junit-jupiter-params - ${junit.version} - test - - - com.google.truth - truth - 1.4.5 + + ${project.groupId} + core-test-fixtures + ${project.version} test diff --git a/application/src/ext-test/java/org/opentripplanner/ext/emission/parameters/EmissionFeedParametersTest.java b/application/src/ext-test/java/org/opentripplanner/ext/emission/parameters/EmissionFeedParametersTest.java index 1bf4536c91e..57382a7628f 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/emission/parameters/EmissionFeedParametersTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/emission/parameters/EmissionFeedParametersTest.java @@ -4,8 +4,8 @@ import java.net.URI; import org.junit.jupiter.api.Test; -import org.opentripplanner._support.asserts.AssertEqualsAndHashCode; import org.opentripplanner._support.net.URIUtils; +import org.opentripplanner.core.testfixtures.lang.AssertEqualsAndHashCode; class EmissionFeedParametersTest { diff --git a/application/src/ext-test/java/org/opentripplanner/ext/emission/parameters/EmissionParametersTest.java b/application/src/ext-test/java/org/opentripplanner/ext/emission/parameters/EmissionParametersTest.java index 5f4f90ede7d..00c2e48c06d 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/emission/parameters/EmissionParametersTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/emission/parameters/EmissionParametersTest.java @@ -5,8 +5,8 @@ import java.net.URI; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner._support.asserts.AssertEqualsAndHashCode; import org.opentripplanner._support.net.URIUtils; +import org.opentripplanner.core.testfixtures.lang.AssertEqualsAndHashCode; import org.opentripplanner.framework.model.Gram; class EmissionParametersTest { diff --git a/application/src/ext-test/java/org/opentripplanner/ext/emission/parameters/EmissionVehicleParametersTest.java b/application/src/ext-test/java/org/opentripplanner/ext/emission/parameters/EmissionVehicleParametersTest.java index 2213b75a207..e89e2f714f0 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/emission/parameters/EmissionVehicleParametersTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/emission/parameters/EmissionVehicleParametersTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import org.opentripplanner._support.asserts.AssertEqualsAndHashCode; +import org.opentripplanner.core.testfixtures.lang.AssertEqualsAndHashCode; import org.opentripplanner.framework.model.Gram; class EmissionVehicleParametersTest { diff --git a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/model/calendar/ServiceCalendarTest.java b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/model/calendar/ServiceCalendarTest.java index 7c3a8ff3e99..2faf4afc05a 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/model/calendar/ServiceCalendarTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/model/calendar/ServiceCalendarTest.java @@ -8,7 +8,7 @@ import java.time.LocalDate; import java.time.Month; import org.junit.jupiter.api.Test; -import org.opentripplanner._support.asserts.AssertEqualsAndHashCode; +import org.opentripplanner.core.testfixtures.lang.AssertEqualsAndHashCode; class ServiceCalendarTest { diff --git a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/parameters/EmpiricalDelayParametersTest.java b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/parameters/EmpiricalDelayParametersTest.java index c41d9b3cf21..be6b2080b50 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/parameters/EmpiricalDelayParametersTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/parameters/EmpiricalDelayParametersTest.java @@ -7,8 +7,8 @@ import java.net.URI; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner._support.asserts.AssertEqualsAndHashCode; import org.opentripplanner._support.net.URIUtils; +import org.opentripplanner.core.testfixtures.lang.AssertEqualsAndHashCode; class EmpiricalDelayParametersTest { diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/configure/TransactionModule.java b/application/src/main/java/org/opentripplanner/framework/transaction/configure/TransactionModule.java index c9cf6fb1c46..51f70ad622f 100644 --- a/application/src/main/java/org/opentripplanner/framework/transaction/configure/TransactionModule.java +++ b/application/src/main/java/org/opentripplanner/framework/transaction/configure/TransactionModule.java @@ -5,8 +5,10 @@ import jakarta.inject.Singleton; import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; import org.opentripplanner.core.domain.framework.transaction.UpdateManager; +import org.opentripplanner.core.framework.transaction.configure.StreetDomain; +import org.opentripplanner.core.framework.transaction.configure.TransitDomain; +import org.opentripplanner.core.framework.transaction.internal.TransactionFactory; import org.opentripplanner.framework.transaction.TimetableSnapshotParameters; -import org.opentripplanner.framework.transaction.internal.TransactionFactory; /** * Wires one {@code (RepositoryRegistry, UpdateManager)} pair per write domain. Each pair has its diff --git a/application/src/main/java/org/opentripplanner/service/realtimevehicles/configure/RealtimeVehicleRepositoryModule.java b/application/src/main/java/org/opentripplanner/service/realtimevehicles/configure/RealtimeVehicleRepositoryModule.java index c9bda360784..8dcb1f04821 100644 --- a/application/src/main/java/org/opentripplanner/service/realtimevehicles/configure/RealtimeVehicleRepositoryModule.java +++ b/application/src/main/java/org/opentripplanner/service/realtimevehicles/configure/RealtimeVehicleRepositoryModule.java @@ -5,7 +5,7 @@ import jakarta.inject.Singleton; import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; -import org.opentripplanner.framework.transaction.configure.TransitDomain; +import org.opentripplanner.core.framework.transaction.configure.TransitDomain; import org.opentripplanner.service.realtimevehicles.RealtimeVehicleRepository; import org.opentripplanner.service.realtimevehicles.RealtimeVehicleRepositorySnapshot; import org.opentripplanner.service.realtimevehicles.internal.DefaultRealtimeVehicleRepository; diff --git a/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java b/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java index 6b70c4104da..6d08aeeb770 100644 --- a/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java +++ b/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java @@ -12,6 +12,8 @@ import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; import org.opentripplanner.core.domain.framework.transaction.UpdateManager; import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; +import org.opentripplanner.core.framework.transaction.configure.StreetDomain; +import org.opentripplanner.core.framework.transaction.configure.TransitDomain; import org.opentripplanner.ext.carpooling.CarpoolingRepository; import org.opentripplanner.ext.carpooling.CarpoolingService; import org.opentripplanner.ext.carpooling.configure.CarpoolingModule; @@ -29,9 +31,7 @@ import org.opentripplanner.ext.sorlandsbanen.configure.SorlandsbanenNorwayModule; import org.opentripplanner.ext.stopconsolidation.StopConsolidationRepository; import org.opentripplanner.ext.stopconsolidation.configure.StopConsolidationServiceModule; -import org.opentripplanner.framework.transaction.configure.StreetDomain; import org.opentripplanner.framework.transaction.configure.TransactionModule; -import org.opentripplanner.framework.transaction.configure.TransitDomain; import org.opentripplanner.graph_builder.issue.api.DataImportIssueSummary; import org.opentripplanner.raptor.configure.RaptorConfig; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitData; diff --git a/application/src/main/java/org/opentripplanner/standalone/configure/RequestScopedModule.java b/application/src/main/java/org/opentripplanner/standalone/configure/RequestScopedModule.java index 361172c8a86..d5d3f60c93e 100644 --- a/application/src/main/java/org/opentripplanner/standalone/configure/RequestScopedModule.java +++ b/application/src/main/java/org/opentripplanner/standalone/configure/RequestScopedModule.java @@ -12,6 +12,7 @@ import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; import org.opentripplanner.core.domain.framework.transaction.api.TransactionScope; +import org.opentripplanner.core.framework.transaction.configure.TransitDomain; import org.opentripplanner.ext.carpooling.CarpoolingService; import org.opentripplanner.ext.dataoverlay.configuration.DataOverlayParameterBindings; import org.opentripplanner.ext.flex.FlexParameters; @@ -21,7 +22,6 @@ import org.opentripplanner.ext.ridehailing.RideHailingService; import org.opentripplanner.ext.sorlandsbanen.SorlandsbanenNorwayService; import org.opentripplanner.ext.stopconsolidation.StopConsolidationService; -import org.opentripplanner.framework.transaction.configure.TransitDomain; import org.opentripplanner.raptor.configure.RaptorConfig; import org.opentripplanner.routing.algorithm.filterchain.ext.EmissionDecorator; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDecorator; diff --git a/application/src/main/java/org/opentripplanner/standalone/server/MetricsLogging.java b/application/src/main/java/org/opentripplanner/standalone/server/MetricsLogging.java index a7aa580770c..f5a79aaf01e 100644 --- a/application/src/main/java/org/opentripplanner/standalone/server/MetricsLogging.java +++ b/application/src/main/java/org/opentripplanner/standalone/server/MetricsLogging.java @@ -20,9 +20,9 @@ import java.util.Map; import java.util.concurrent.ForkJoinPool; import org.opentripplanner.core.domain.framework.transaction.UpdateManager; +import org.opentripplanner.core.framework.transaction.configure.StreetDomain; +import org.opentripplanner.core.framework.transaction.configure.TransitDomain; import org.opentripplanner.framework.application.OTPFeature; -import org.opentripplanner.framework.transaction.configure.StreetDomain; -import org.opentripplanner.framework.transaction.configure.TransitDomain; import org.opentripplanner.graph_builder.issue.api.DataImportIssueSummary; import org.opentripplanner.raptor.configure.RaptorConfig; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripSchedule; diff --git a/application/src/main/java/org/opentripplanner/transit/configure/TransitModule.java b/application/src/main/java/org/opentripplanner/transit/configure/TransitModule.java index 6c0b081700d..957716d319d 100644 --- a/application/src/main/java/org/opentripplanner/transit/configure/TransitModule.java +++ b/application/src/main/java/org/opentripplanner/transit/configure/TransitModule.java @@ -7,8 +7,8 @@ import java.time.LocalDate; import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; +import org.opentripplanner.core.framework.transaction.configure.TransitDomain; import org.opentripplanner.framework.transaction.TimetableSnapshotParameters; -import org.opentripplanner.framework.transaction.configure.TransitDomain; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitData; import org.opentripplanner.standalone.config.ConfigModel; import org.opentripplanner.standalone.configure.RequestScopedFactory; diff --git a/application/src/test-fixtures/java/org/opentripplanner/standalone/api/TestServerContext.java b/application/src/test-fixtures/java/org/opentripplanner/standalone/api/TestServerContext.java index 3df04a10f04..1e3dc6202e3 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/standalone/api/TestServerContext.java +++ b/application/src/test-fixtures/java/org/opentripplanner/standalone/api/TestServerContext.java @@ -7,10 +7,10 @@ import java.util.Optional; import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; +import org.opentripplanner.core.framework.transaction.internal.TransactionFactory; import org.opentripplanner.ext.emission.internal.DefaultEmissionRepository; import org.opentripplanner.ext.emission.internal.DefaultEmissionService; import org.opentripplanner.ext.emission.internal.itinerary.EmissionItineraryDecorator; -import org.opentripplanner.framework.transaction.internal.TransactionFactory; import org.opentripplanner.raptor.configure.RaptorConfig; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDecorator; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitData; diff --git a/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitTestEnvironment.java b/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitTestEnvironment.java index 1cb7e224b89..5756b7b944e 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitTestEnvironment.java +++ b/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitTestEnvironment.java @@ -9,8 +9,8 @@ import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; import org.opentripplanner.core.domain.framework.transaction.UpdateManager; import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; +import org.opentripplanner.core.framework.transaction.internal.TransactionFactory; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; -import org.opentripplanner.framework.transaction.internal.TransactionFactory; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitData; import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.RaptorTransitDataMapper; import org.opentripplanner.routing.algorithm.raptoradapter.transit.request.DefaultTransitDataProviderFilterBuilder; diff --git a/application/src/test/java/org/opentripplanner/GtfsTest.java b/application/src/test/java/org/opentripplanner/GtfsTest.java index 34f1abc9c8f..614a6a44db1 100644 --- a/application/src/test/java/org/opentripplanner/GtfsTest.java +++ b/application/src/test/java/org/opentripplanner/GtfsTest.java @@ -20,6 +20,7 @@ import org.junit.jupiter.api.BeforeEach; import org.opentripplanner.core.domain.model.id.FeedScopedId; import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.framework.transaction.internal.TransactionFactory; import org.opentripplanner.gtfs.graphbuilder.GtfsBundle; import org.opentripplanner.gtfs.graphbuilder.GtfsBundleTestFactory; import org.opentripplanner.gtfs.graphbuilder.GtfsModule; @@ -211,8 +212,7 @@ protected void setUp() throws Exception { transferRepository ); transitRepository.initRaptorTransitData(scheduledRaptorData); - var registry = - org.opentripplanner.framework.transaction.internal.TransactionFactory.createRepositoryRegistry(); + var registry = TransactionFactory.createRepositoryRegistry(); var timetableSnapshot = new org.opentripplanner.transit.repository.DefaultTimetableRepository( new RaptorTransitData(scheduledRaptorData), transitRepository.getTripCalendar() @@ -225,12 +225,11 @@ protected void setUp() throws Exception { LocalDate::now ) ); - var updateManager = - org.opentripplanner.framework.transaction.internal.TransactionFactory.createUpdateManagerWithAtomicCommits( - "test", - registry, - java.util.concurrent.Executors.defaultThreadFactory() - ); + var updateManager = TransactionFactory.createUpdateManagerWithAtomicCommits( + "test", + registry, + java.util.concurrent.Executors.defaultThreadFactory() + ); tripUpdateAdapter = new GtfsRealTimeTripUpdateAdapter( transitRepository, diff --git a/application/src/test/java/org/opentripplanner/api/model/geometry/EncodedPolylineTest.java b/application/src/test/java/org/opentripplanner/api/model/geometry/EncodedPolylineTest.java index eca349f78f1..10a4a0c26d6 100644 --- a/application/src/test/java/org/opentripplanner/api/model/geometry/EncodedPolylineTest.java +++ b/application/src/test/java/org/opentripplanner/api/model/geometry/EncodedPolylineTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner._support.asserts.AssertEqualsAndHashCode; +import org.opentripplanner.core.testfixtures.lang.AssertEqualsAndHashCode; import org.opentripplanner.street.geometry.GeometryUtils; class EncodedPolylineTest { diff --git a/application/src/test/java/org/opentripplanner/framework/model/CostTest.java b/application/src/test/java/org/opentripplanner/framework/model/CostTest.java index dd3e487592b..91ec879e101 100644 --- a/application/src/test/java/org/opentripplanner/framework/model/CostTest.java +++ b/application/src/test/java/org/opentripplanner/framework/model/CostTest.java @@ -10,8 +10,8 @@ import java.util.List; import java.util.stream.Stream; import org.junit.jupiter.api.Test; -import org.opentripplanner._support.asserts.AssertEqualsAndHashCode; import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.testfixtures.lang.AssertEqualsAndHashCode; class CostTest { diff --git a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/base/Entity.java b/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/base/Entity.java deleted file mode 100644 index 1ac46579001..00000000000 --- a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/base/Entity.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.opentripplanner.framework.transaction.moduletest.candyshop.base; - -public interface Entity { - Integer id(); -} diff --git a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/customer/CustomerRepository.java b/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/customer/CustomerRepository.java deleted file mode 100644 index 7c64d30f23a..00000000000 --- a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/customer/CustomerRepository.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.opentripplanner.framework.transaction.moduletest.candyshop.customer; - -import org.opentripplanner.framework.transaction.moduletest.candyshop.customer.model.Customer; - -public interface CustomerRepository { - Customer save(Customer customer); -} diff --git a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/customer/CustomerRepositorySnapshot.java b/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/customer/CustomerRepositorySnapshot.java deleted file mode 100644 index 16a310b2565..00000000000 --- a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/customer/CustomerRepositorySnapshot.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.opentripplanner.framework.transaction.moduletest.candyshop.customer; - -import org.opentripplanner.framework.transaction.moduletest.candyshop.base.EntityIdProvider; - -public interface CustomerRepositorySnapshot extends EntityIdProvider {} diff --git a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/customer/model/Customer.java b/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/customer/model/Customer.java deleted file mode 100644 index aad5ce0e3fd..00000000000 --- a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/customer/model/Customer.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.opentripplanner.framework.transaction.moduletest.candyshop.customer.model; - -import org.opentripplanner.framework.transaction.moduletest.candyshop.base.Entity; - -public record Customer(Integer id, String name) implements Entity {} diff --git a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/order/OrderRepository.java b/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/order/OrderRepository.java deleted file mode 100644 index ce4700ff171..00000000000 --- a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/order/OrderRepository.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.opentripplanner.framework.transaction.moduletest.candyshop.order; - -import org.opentripplanner.framework.transaction.moduletest.candyshop.order.model.Order; - -public interface OrderRepository { - Order save(Order order); -} diff --git a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/order/model/Order.java b/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/order/model/Order.java deleted file mode 100644 index bc2485e8ae0..00000000000 --- a/application/src/test/java/org/opentripplanner/framework/transaction/moduletest/candyshop/order/model/Order.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.opentripplanner.framework.transaction.moduletest.candyshop.order.model; - -import org.opentripplanner.framework.transaction.moduletest.candyshop.base.Entity; - -public record Order(Integer id, String description) implements Entity {} diff --git a/application/src/test/java/org/opentripplanner/model/GenericLocationTest.java b/application/src/test/java/org/opentripplanner/model/GenericLocationTest.java index f5e75dc736e..be193111426 100644 --- a/application/src/test/java/org/opentripplanner/model/GenericLocationTest.java +++ b/application/src/test/java/org/opentripplanner/model/GenericLocationTest.java @@ -5,8 +5,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.api.Test; -import org.opentripplanner._support.asserts.AssertEqualsAndHashCode; import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.testfixtures.lang.AssertEqualsAndHashCode; import org.opentripplanner.street.geometry.WgsCoordinate; class GenericLocationTest { diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/preference/DirectTransitPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/DirectTransitPreferencesTest.java index af08bfa4416..09af7c6ea61 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/preference/DirectTransitPreferencesTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/preference/DirectTransitPreferencesTest.java @@ -8,8 +8,8 @@ import java.time.Duration; import java.util.Optional; import org.junit.jupiter.api.Test; -import org.opentripplanner._support.asserts.AssertEqualsAndHashCode; import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.testfixtures.lang.AssertEqualsAndHashCode; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; class DirectTransitPreferencesTest { diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/request/JourneyRequestTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/request/JourneyRequestTest.java index 8fd7b1f68b1..62b13bc74aa 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/request/JourneyRequestTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/request/JourneyRequestTest.java @@ -5,8 +5,8 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner._support.asserts.AssertEqualsAndHashCode; import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.testfixtures.lang.AssertEqualsAndHashCode; import org.opentripplanner.routing.api.request.RequestModes; import org.opentripplanner.routing.api.request.request.filter.SelectRequest; import org.opentripplanner.street.model.StreetMode; diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/request/StreetRequestTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/request/StreetRequestTest.java index 2245f0f5726..716fd8ebef9 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/request/StreetRequestTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/request/StreetRequestTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import org.opentripplanner._support.asserts.AssertEqualsAndHashCode; +import org.opentripplanner.core.testfixtures.lang.AssertEqualsAndHashCode; import org.opentripplanner.street.model.StreetMode; class StreetRequestTest { diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/request/TransitRequestTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/request/TransitRequestTest.java index 46c07e99024..2667d82687f 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/request/TransitRequestTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/request/TransitRequestTest.java @@ -7,8 +7,8 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner._support.asserts.AssertEqualsAndHashCode; import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.testfixtures.lang.AssertEqualsAndHashCode; import org.opentripplanner.routing.api.request.DebugRaptor; import org.opentripplanner.routing.api.request.request.filter.SelectRequest; import org.opentripplanner.routing.api.request.request.filter.TransitFilter; diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/via/PassThroughViaLocationTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/via/PassThroughViaLocationTest.java index 0d22b964900..4bcb0c5a371 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/via/PassThroughViaLocationTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/via/PassThroughViaLocationTest.java @@ -6,8 +6,8 @@ import java.time.Duration; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner._support.asserts.AssertEqualsAndHashCode; import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.testfixtures.lang.AssertEqualsAndHashCode; class PassThroughViaLocationTest { diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/via/VisitViaLocationTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/via/VisitViaLocationTest.java index e21ff1ed957..e8a0419ddc5 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/via/VisitViaLocationTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/via/VisitViaLocationTest.java @@ -6,8 +6,8 @@ import java.time.Duration; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner._support.asserts.AssertEqualsAndHashCode; import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.testfixtures.lang.AssertEqualsAndHashCode; import org.opentripplanner.street.geometry.WgsCoordinate; class VisitViaLocationTest { diff --git a/application/src/test/java/org/opentripplanner/routing/core/RouteRequestTest.java b/application/src/test/java/org/opentripplanner/routing/core/RouteRequestTest.java index fea42db8c46..ba1f778679d 100644 --- a/application/src/test/java/org/opentripplanner/routing/core/RouteRequestTest.java +++ b/application/src/test/java/org/opentripplanner/routing/core/RouteRequestTest.java @@ -15,8 +15,8 @@ import java.time.ZoneOffset; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner._support.asserts.AssertEqualsAndHashCode; import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.testfixtures.lang.AssertEqualsAndHashCode; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.model.plan.SortOrder; import org.opentripplanner.model.plan.paging.cursor.PageCursor; diff --git a/application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java b/application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java index 97c84115d6e..bacbe3d88d8 100644 --- a/application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java +++ b/application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java @@ -13,9 +13,9 @@ import java.util.function.Predicate; import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; +import org.opentripplanner.core.framework.transaction.internal.TransactionFactory; import org.opentripplanner.framework.application.OtpAppException; import org.opentripplanner.framework.transaction.TimetableSnapshotParameters; -import org.opentripplanner.framework.transaction.internal.TransactionFactory; import org.opentripplanner.gbfs.network.GbfsNetworkOverrides; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.raptor.configure.RaptorConfig; diff --git a/core/framework/pom.xml b/core/framework/pom.xml index 8bed6875d41..cd72809a9f0 100644 --- a/core/framework/pom.xml +++ b/core/framework/pom.xml @@ -31,6 +31,11 @@ + + com.google.dagger + dagger + ${google.dagger.version} + net.sf.trove4j trove4j @@ -39,16 +44,24 @@ org.slf4j slf4j-api - - - org.junit.jupiter - junit-jupiter-api - test + io.micrometer + micrometer-registry-prometheus + ${micrometer.version} + + + + - com.google.truth - truth + ${project.groupId} + core-test-fixtures + ${project.version} test diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/configure/StreetDomain.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/configure/StreetDomain.java index e2ec350d7e5..2e808e958dc 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/configure/StreetDomain.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/configure/StreetDomain.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.transaction.configure; +package org.opentripplanner.core.framework.transaction.configure; import jakarta.inject.Qualifier; import java.lang.annotation.ElementType; diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/configure/TransitDomain.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/configure/TransitDomain.java index a0c141d316f..fd885cfb6e9 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/configure/TransitDomain.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/configure/TransitDomain.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.transaction.configure; +package org.opentripplanner.core.framework.transaction.configure; import jakarta.inject.Qualifier; import java.lang.annotation.ElementType; diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultRepositoryHandle.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultRepositoryHandle.java index 1697a96fbef..95b922004bb 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultRepositoryHandle.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultRepositoryHandle.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.transaction.internal; +package org.opentripplanner.core.framework.transaction.internal; import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; import org.opentripplanner.core.domain.framework.transaction.api.TransactionScope; diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultRepositoryRegistry.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultRepositoryRegistry.java index cdc86d95caf..3ba63a2e878 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultRepositoryRegistry.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultRepositoryRegistry.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.transaction.internal; +package org.opentripplanner.core.framework.transaction.internal; import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; import org.opentripplanner.core.domain.framework.transaction.UpdateManager; diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultTransactionScope.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultTransactionScope.java index 028f0f4dd81..9e82d235ce4 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultTransactionScope.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultTransactionScope.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.transaction.internal; +package org.opentripplanner.core.framework.transaction.internal; import java.util.Objects; import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultUpdateManager.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultUpdateManager.java index be3e6fcfb78..3770f21c1c7 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultUpdateManager.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultUpdateManager.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.transaction.internal; +package org.opentripplanner.core.framework.transaction.internal; import java.time.Duration; import java.util.ArrayList; diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultWriteContext.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultWriteContext.java index 6d4a0589f1c..eb658907822 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultWriteContext.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultWriteContext.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.transaction.internal; +package org.opentripplanner.core.framework.transaction.internal; import java.util.Collections; import java.util.List; diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/HandlerEntry.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/HandlerEntry.java index 1b55a430495..55ad1db2c80 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/HandlerEntry.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/HandlerEntry.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.transaction.internal; +package org.opentripplanner.core.framework.transaction.internal; import org.opentripplanner.core.domain.framework.event.DomainEvent; import org.opentripplanner.core.domain.framework.event.EventHandler; diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/PeriodicCommitScheduler.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/PeriodicCommitScheduler.java index d211cf1e980..4202b6ea932 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/PeriodicCommitScheduler.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/PeriodicCommitScheduler.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.transaction.internal; +package org.opentripplanner.core.framework.transaction.internal; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/RepositorySnapshotCache.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/RepositorySnapshotCache.java index 5978a2fe701..20e57218a7a 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/RepositorySnapshotCache.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/RepositorySnapshotCache.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.transaction.internal; +package org.opentripplanner.core.framework.transaction.internal; import java.util.Map; import java.util.Objects; diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/Transaction.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/Transaction.java index b258739f24b..9a49379b3b2 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/Transaction.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/Transaction.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.transaction.internal; +package org.opentripplanner.core.framework.transaction.internal; import java.util.Objects; import java.util.function.Consumer; diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionFactory.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionFactory.java index fc709d6b826..48c4557f3b2 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionFactory.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionFactory.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.transaction.internal; +package org.opentripplanner.core.framework.transaction.internal; import java.time.Duration; import java.util.concurrent.ThreadFactory; diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionManager.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionManager.java index ba7168ec80f..b7b90f610e8 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionManager.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionManager.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.transaction.internal; +package org.opentripplanner.core.framework.transaction.internal; import java.util.ArrayList; import java.util.List; diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionalRepository.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionalRepository.java index 230bc22a4ed..760a597f4ca 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionalRepository.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionalRepository.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.transaction.internal; +package org.opentripplanner.core.framework.transaction.internal; import java.util.Objects; import java.util.function.Supplier; diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/package.md b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/package.md index 138491e6fa1..902313031ed 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/package.md +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/package.md @@ -7,7 +7,7 @@ single writer thread applies changes and periodically (or atomically) publishes subsequent readers to see. No locking is required on the read path. The model is a generalization of the timetable-snapshot concurrency approach described in -[`updater/package.md`](../../updater/package.md#realtime-concurrency). That document is still the +[`updater/package.md`](../../../../../../../../../../application/src/main/java/org/opentripplanner/updater/package.md#realtime-concurrency). That document is still the best source for the full rationale (why copy-on-write, why a single writer thread, why multiple coexisting snapshots) — read it first if the "why" here feels thin. This package extracts the same mechanism so any repository, not just the timetable, can use it without re-implementing the diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/internal/TransactionTest.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/internal/TransactionTest.java index dd78a0fa31c..5a969743f53 100644 --- a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/internal/TransactionTest.java +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/internal/TransactionTest.java @@ -1,9 +1,9 @@ -package org.opentripplanner.framework.transaction.internal; +package org.opentripplanner.core.framework.transaction.internal; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import org.opentripplanner._support.asserts.AssertEqualsAndHashCode; +import org.opentripplanner.core.testfixtures.lang.AssertEqualsAndHashCode; class TransactionTest { diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/internal/UpdateManagerMetricsTest.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/internal/UpdateManagerMetricsTest.java index a7f1955ec03..f93c4fa4a88 100644 --- a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/internal/UpdateManagerMetricsTest.java +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/internal/UpdateManagerMetricsTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.transaction.internal; +package org.opentripplanner.core.framework.transaction.internal; import static com.google.common.truth.Truth.assertThat; diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/TransactionFrameworkTest.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/TransactionFrameworkTest.java index d03ccffdd8a..039898f3340 100644 --- a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/TransactionFrameworkTest.java +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/TransactionFrameworkTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.transaction.moduletest; +package org.opentripplanner.core.framework.transaction.moduletest; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; @@ -18,22 +18,22 @@ import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; import org.opentripplanner.core.domain.framework.transaction.api.TransactionScope; import org.opentripplanner.core.domain.framework.transaction.api.WriteContext; -import org.opentripplanner.framework.transaction.internal.TransactionFactory; -import org.opentripplanner.framework.transaction.moduletest.candyshop.base.Entity; -import org.opentripplanner.framework.transaction.moduletest.candyshop.base.EntityIdProvider; -import org.opentripplanner.framework.transaction.moduletest.candyshop.customer.CustomerRepository; -import org.opentripplanner.framework.transaction.moduletest.candyshop.customer.CustomerRepositorySnapshot; -import org.opentripplanner.framework.transaction.moduletest.candyshop.customer.internal.CustomerRepositoryLifecycle; -import org.opentripplanner.framework.transaction.moduletest.candyshop.customer.internal.DefaultCustomerRepository; -import org.opentripplanner.framework.transaction.moduletest.candyshop.customer.model.Customer; -import org.opentripplanner.framework.transaction.moduletest.candyshop.event.CustomerEventHandler; -import org.opentripplanner.framework.transaction.moduletest.candyshop.event.CustomerOrderDomainEvent; -import org.opentripplanner.framework.transaction.moduletest.candyshop.event.OrderEventHandler; -import org.opentripplanner.framework.transaction.moduletest.candyshop.order.OrderRepository; -import org.opentripplanner.framework.transaction.moduletest.candyshop.order.OrderService; -import org.opentripplanner.framework.transaction.moduletest.candyshop.order.internal.DefaultOrderRepository; -import org.opentripplanner.framework.transaction.moduletest.candyshop.order.internal.OrderRepositoryLifecycle; -import org.opentripplanner.framework.transaction.moduletest.candyshop.order.model.Order; +import org.opentripplanner.core.framework.transaction.internal.TransactionFactory; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.base.Entity; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.base.EntityIdProvider; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.CustomerRepository; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.CustomerRepositorySnapshot; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.internal.CustomerRepositoryLifecycle; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.internal.DefaultCustomerRepository; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.model.Customer; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.event.CustomerEventHandler; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.event.CustomerOrderDomainEvent; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.event.OrderEventHandler; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.OrderRepository; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.OrderService; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.internal.DefaultOrderRepository; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.internal.OrderRepositoryLifecycle; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.model.Order; /** * This test demonstrates how the snapshot framework can be used with two repositories. The example diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/base/Entity.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/base/Entity.java new file mode 100644 index 00000000000..2cc5f2146f9 --- /dev/null +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/base/Entity.java @@ -0,0 +1,5 @@ +package org.opentripplanner.core.framework.transaction.moduletest.candyshop.base; + +public interface Entity { + Integer id(); +} diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/base/EntityIdProvider.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/base/EntityIdProvider.java index 60119489cdd..51ba2dfa88f 100644 --- a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/base/EntityIdProvider.java +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/base/EntityIdProvider.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.transaction.moduletest.candyshop.base; +package org.opentripplanner.core.framework.transaction.moduletest.candyshop.base; import java.util.Collection; diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/base/EntityMap.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/base/EntityMap.java index e41a3d56d71..6f79864231c 100644 --- a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/base/EntityMap.java +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/base/EntityMap.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.transaction.moduletest.candyshop.base; +package org.opentripplanner.core.framework.transaction.moduletest.candyshop.base; import java.util.Collection; import java.util.Collections; diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/CustomerRepository.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/CustomerRepository.java new file mode 100644 index 00000000000..07524d3e934 --- /dev/null +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/CustomerRepository.java @@ -0,0 +1,7 @@ +package org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer; + +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.model.Customer; + +public interface CustomerRepository { + Customer save(Customer customer); +} diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/CustomerRepositorySnapshot.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/CustomerRepositorySnapshot.java new file mode 100644 index 00000000000..b1a7fb70b93 --- /dev/null +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/CustomerRepositorySnapshot.java @@ -0,0 +1,5 @@ +package org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer; + +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.base.EntityIdProvider; + +public interface CustomerRepositorySnapshot extends EntityIdProvider {} diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/internal/CustomerRepositoryLifecycle.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/internal/CustomerRepositoryLifecycle.java index ad803744b4a..a1d1b57693c 100644 --- a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/internal/CustomerRepositoryLifecycle.java +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/internal/CustomerRepositoryLifecycle.java @@ -1,8 +1,8 @@ -package org.opentripplanner.framework.transaction.moduletest.candyshop.customer.internal; +package org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.internal; import org.opentripplanner.core.domain.framework.transaction.api.RepositoryLifecycle; -import org.opentripplanner.framework.transaction.moduletest.candyshop.customer.CustomerRepository; -import org.opentripplanner.framework.transaction.moduletest.candyshop.customer.CustomerRepositorySnapshot; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.CustomerRepository; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.CustomerRepositorySnapshot; /** * This life-cycle will create a new mutable repository for each transaction and freeze it into a diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/internal/DefaultCustomerRepository.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/internal/DefaultCustomerRepository.java index d155bd8fb3c..b9b05354d26 100644 --- a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/internal/DefaultCustomerRepository.java +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/internal/DefaultCustomerRepository.java @@ -1,10 +1,10 @@ -package org.opentripplanner.framework.transaction.moduletest.candyshop.customer.internal; +package org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.internal; import java.util.Collection; -import org.opentripplanner.framework.transaction.moduletest.candyshop.base.EntityMap; -import org.opentripplanner.framework.transaction.moduletest.candyshop.customer.CustomerRepository; -import org.opentripplanner.framework.transaction.moduletest.candyshop.customer.CustomerRepositorySnapshot; -import org.opentripplanner.framework.transaction.moduletest.candyshop.customer.model.Customer; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.base.EntityMap; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.CustomerRepository; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.CustomerRepositorySnapshot; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.model.Customer; /** * The repository implementation implements both the {@link CustomerRepository} and diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/model/Customer.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/model/Customer.java new file mode 100644 index 00000000000..accd6cd12da --- /dev/null +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/model/Customer.java @@ -0,0 +1,5 @@ +package org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.model; + +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.base.Entity; + +public record Customer(Integer id, String name) implements Entity {} diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/CustomerEventHandler.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/CustomerEventHandler.java index 76c0352543c..92017662ed0 100644 --- a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/CustomerEventHandler.java +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/CustomerEventHandler.java @@ -1,8 +1,8 @@ -package org.opentripplanner.framework.transaction.moduletest.candyshop.event; +package org.opentripplanner.core.framework.transaction.moduletest.candyshop.event; import org.opentripplanner.core.domain.framework.event.EventHandler; -import org.opentripplanner.framework.transaction.moduletest.candyshop.customer.CustomerRepository; -import org.opentripplanner.framework.transaction.moduletest.candyshop.customer.model.Customer; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.CustomerRepository; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.model.Customer; public class CustomerEventHandler implements EventHandler diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/CustomerOrderDomainEvent.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/CustomerOrderDomainEvent.java index 286f267bd59..1d421da6b78 100644 --- a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/CustomerOrderDomainEvent.java +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/CustomerOrderDomainEvent.java @@ -1,4 +1,4 @@ -package org.opentripplanner.framework.transaction.moduletest.candyshop.event; +package org.opentripplanner.core.framework.transaction.moduletest.candyshop.event; import org.opentripplanner.core.domain.framework.event.DomainEvent; diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/OrderEventHandler.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/OrderEventHandler.java index f6e293e7b6e..39ec99007b6 100644 --- a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/OrderEventHandler.java +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/OrderEventHandler.java @@ -1,8 +1,8 @@ -package org.opentripplanner.framework.transaction.moduletest.candyshop.event; +package org.opentripplanner.core.framework.transaction.moduletest.candyshop.event; import org.opentripplanner.core.domain.framework.event.EventHandler; -import org.opentripplanner.framework.transaction.moduletest.candyshop.order.OrderRepository; -import org.opentripplanner.framework.transaction.moduletest.candyshop.order.model.Order; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.OrderRepository; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.model.Order; public class OrderEventHandler implements EventHandler { diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/OrderRepository.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/OrderRepository.java new file mode 100644 index 00000000000..1ae352c8d4a --- /dev/null +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/OrderRepository.java @@ -0,0 +1,7 @@ +package org.opentripplanner.core.framework.transaction.moduletest.candyshop.order; + +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.model.Order; + +public interface OrderRepository { + Order save(Order order); +} diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/OrderService.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/OrderService.java index 8bf7b0c8f1c..8dfa48318fc 100644 --- a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/OrderService.java +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/OrderService.java @@ -1,6 +1,6 @@ -package org.opentripplanner.framework.transaction.moduletest.candyshop.order; +package org.opentripplanner.core.framework.transaction.moduletest.candyshop.order; -import org.opentripplanner.framework.transaction.moduletest.candyshop.base.EntityIdProvider; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.base.EntityIdProvider; /** * In this case we demonstrate that the service can also play the repository snapshot role. diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/internal/DefaultOrderRepository.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/internal/DefaultOrderRepository.java index 30e51627ff6..404bd46eeef 100644 --- a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/internal/DefaultOrderRepository.java +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/internal/DefaultOrderRepository.java @@ -1,10 +1,10 @@ -package org.opentripplanner.framework.transaction.moduletest.candyshop.order.internal; +package org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.internal; import java.util.Collection; -import org.opentripplanner.framework.transaction.moduletest.candyshop.base.EntityMap; -import org.opentripplanner.framework.transaction.moduletest.candyshop.order.OrderRepository; -import org.opentripplanner.framework.transaction.moduletest.candyshop.order.OrderService; -import org.opentripplanner.framework.transaction.moduletest.candyshop.order.model.Order; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.base.EntityMap; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.OrderRepository; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.OrderService; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.model.Order; /** * The repository implementation implements both the {@link OrderRepository} and diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/internal/OrderRepositoryLifecycle.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/internal/OrderRepositoryLifecycle.java index 42dd7edaca8..4bc8c093588 100644 --- a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/internal/OrderRepositoryLifecycle.java +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/internal/OrderRepositoryLifecycle.java @@ -1,8 +1,8 @@ -package org.opentripplanner.framework.transaction.moduletest.candyshop.order.internal; +package org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.internal; import org.opentripplanner.core.domain.framework.transaction.api.RepositoryLifecycle; -import org.opentripplanner.framework.transaction.moduletest.candyshop.order.OrderRepository; -import org.opentripplanner.framework.transaction.moduletest.candyshop.order.OrderService; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.OrderRepository; +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.OrderService; /** * This lifecycle implements the {@link RepositoryLifecycle} interface, but does not create a new diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/model/Order.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/model/Order.java new file mode 100644 index 00000000000..c13331992ee --- /dev/null +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/model/Order.java @@ -0,0 +1,5 @@ +package org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.model; + +import org.opentripplanner.core.framework.transaction.moduletest.candyshop.base.Entity; + +public record Order(Integer id, String description) implements Entity {} diff --git a/core/pom.xml b/core/pom.xml index d072055d661..3a41e85b059 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -15,7 +15,8 @@ domain - utils framework + test-fixtures + utils diff --git a/core/test-fixtures/pom.xml b/core/test-fixtures/pom.xml new file mode 100644 index 00000000000..fb7fe6c6a26 --- /dev/null +++ b/core/test-fixtures/pom.xml @@ -0,0 +1,39 @@ + + + 4.0.0 + + org.opentripplanner + core + 2.11.0-SNAPSHOT + + + core-test-fixtures + OpenTripPlanner - Test Fixtures + + + + + com.diffplug.spotless + spotless-maven-plugin + + + + + + + + org.junit.jupiter + junit-jupiter-api + + + org.junit.jupiter + junit-jupiter-params + + + com.google.truth + truth + + + diff --git a/core/test-fixtures/src/main/java/org/opentripplanner/core/testfixtures/lang/AssertEqualsAndHashCode.java b/core/test-fixtures/src/main/java/org/opentripplanner/core/testfixtures/lang/AssertEqualsAndHashCode.java index 9f084c1b04b..aee85ec1a9d 100644 --- a/core/test-fixtures/src/main/java/org/opentripplanner/core/testfixtures/lang/AssertEqualsAndHashCode.java +++ b/core/test-fixtures/src/main/java/org/opentripplanner/core/testfixtures/lang/AssertEqualsAndHashCode.java @@ -1,4 +1,4 @@ -package org.opentripplanner._support.asserts; +package org.opentripplanner.core.testfixtures.lang; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; From dcfd12500b963291fc967acee06f35b50795746b Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 17 Sep 2026 21:18:54 +0200 Subject: [PATCH 38/68] style: fix prettier formatting in core-framework transaction package.md --- .../core/framework/transaction/package.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/package.md b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/package.md index 902313031ed..8d86741c7d7 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/package.md +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/package.md @@ -7,11 +7,11 @@ single writer thread applies changes and periodically (or atomically) publishes subsequent readers to see. No locking is required on the read path. The model is a generalization of the timetable-snapshot concurrency approach described in -[`updater/package.md`](../../../../../../../../../../application/src/main/java/org/opentripplanner/updater/package.md#realtime-concurrency). That document is still the -best source for the full rationale (why copy-on-write, why a single writer thread, why multiple -coexisting snapshots) — read it first if the "why" here feels thin. This package extracts the same -mechanism so any repository, not just the timetable, can use it without re-implementing the -snapshot/copy-on-write bookkeeping by hand. +[`updater/package.md`](../../../../../../../../../../application/src/main/java/org/opentripplanner/updater/package.md#realtime-concurrency). +That document is still the best source for the full rationale (why copy-on-write, why a single +writer thread, why multiple coexisting snapshots) — read it first if the "why" here feels thin. This +package extracts the same mechanism so any repository, not just the timetable, can use it without +re-implementing the snapshot/copy-on-write bookkeeping by hand. ## Core Concepts From bf8b857cbe3eaf7d48d1e19206ea7409fa0622ba Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 17 Sep 2026 21:20:48 +0200 Subject: [PATCH 39/68] refactor: remove unused Maven dependencies in core-domain, core-framework, core-test-fixtures, astar, and street Replace the junit-jupiter aggregator with the specific junit-jupiter-api/-params artifacts actually used, drop dagger/trove4j/micrometer-registry-prometheus from core-framework and the unused geotools coverage artifacts from street, and drop truth/junit-jupiter-params from core-test-fixtures. Declare dependencies directly where they were only available transitively through the removed artifacts (jakarta.inject-api and micrometer-core in core-framework, guava in street, and the geotools coverage artifacts plus junit-jupiter-params/truth in application, which no longer rides on core-test-fixtures for those). application and otp-shaded are left untouched. --- application/pom.xml | 24 +++++++++++++++++++++++- astar/pom.xml | 2 +- core/domain/pom.xml | 8 ++++++-- core/framework/pom.xml | 33 ++++++++++++++------------------- core/test-fixtures/pom.xml | 8 -------- street/pom.xml | 24 +++++++++++------------- 6 files changed, 55 insertions(+), 44 deletions(-) diff --git a/application/pom.xml b/application/pom.xml index ec35449b3a5..a2591e56c1f 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -144,12 +144,21 @@ - ${project.groupId} core-test-fixtures ${project.version} test + + org.junit.jupiter + junit-jupiter-params + test + + + com.google.truth + truth + test + com.tngtech.archunit archunit @@ -186,6 +195,19 @@ com.google.guava guava + + + org.geotools + gt-coverage + + + org.geotools + gt-geotiff + + + org.geotools + gt-api + org.glassfish.jersey.core diff --git a/astar/pom.xml b/astar/pom.xml index f4188e78f1a..642202001f3 100644 --- a/astar/pom.xml +++ b/astar/pom.xml @@ -35,7 +35,7 @@ org.junit.jupiter - junit-jupiter + junit-jupiter-api ${junit.version} test diff --git a/core/domain/pom.xml b/core/domain/pom.xml index a3f951bbb84..cd9e68aad91 100644 --- a/core/domain/pom.xml +++ b/core/domain/pom.xml @@ -35,8 +35,12 @@ org.junit.jupiter - junit-jupiter - ${junit.version} + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-params test diff --git a/core/framework/pom.xml b/core/framework/pom.xml index cd72809a9f0..ae7baf54e31 100644 --- a/core/framework/pom.xml +++ b/core/framework/pom.xml @@ -31,31 +31,15 @@ - - com.google.dagger - dagger - ${google.dagger.version} - - - net.sf.trove4j - trove4j - org.slf4j slf4j-api - io.micrometer - micrometer-registry-prometheus - ${micrometer.version} + jakarta.inject + jakarta.inject-api + 2.0.1 - - @@ -64,5 +48,16 @@ ${project.version} test + + io.micrometer + micrometer-core + ${micrometer.version} + test + + + com.google.truth + truth + test + diff --git a/core/test-fixtures/pom.xml b/core/test-fixtures/pom.xml index fb7fe6c6a26..98075e96694 100644 --- a/core/test-fixtures/pom.xml +++ b/core/test-fixtures/pom.xml @@ -27,13 +27,5 @@ org.junit.jupiter junit-jupiter-api - - org.junit.jupiter - junit-jupiter-params - - - com.google.truth - truth - diff --git a/street/pom.xml b/street/pom.xml index c2c5e66d6a7..93763043999 100644 --- a/street/pom.xml +++ b/street/pom.xml @@ -40,7 +40,13 @@ org.junit.jupiter - junit-jupiter + junit-jupiter-api + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-params ${junit.version} test @@ -49,6 +55,10 @@ dagger ${google.dagger.version} + + com.google.guava + guava + - - org.geotools - gt-coverage - - - org.geotools - gt-geotiff - - - org.geotools - gt-api - org.geotools gt-geojson-core From e88297f769a9ff645132a4976a042ffac3807b5f Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 17 Sep 2026 21:35:00 +0200 Subject: [PATCH 40/68] refactor: rename core/raptor submodule artifactIds to match their directory names Move the core-/raptor- prefix from the submodule artifactId into a dedicated groupId per aggregator (org.opentripplanner.core, org.opentripplanner.raptor) instead. This makes directory name, the entry in the parent pom, and artifactId identical for every submodule (core-domain -> domain, core-framework -> framework, core-test-fixtures -> test-fixtures, core-utils -> utils, raptor-router -> router, raptor-data -> data), while the distinct groupId per aggregator keeps coordinates unambiguous across subtrees. Update every cross-module dependency declaration accordingly, using an explicit groupId wherever the consumer sits outside the producing aggregator's own subtree (since ${project.groupId} no longer resolves to the same value across subtrees). --- application/pom.xml | 16 ++++++++-------- astar/pom.xml | 4 ++-- core/domain/pom.xml | 6 +++--- core/framework/pom.xml | 10 +++++----- core/pom.xml | 1 + core/test-fixtures/pom.xml | 4 ++-- core/utils/pom.xml | 4 ++-- raptor/data/pom.xml | 6 +++--- raptor/pom.xml | 1 + raptor/router/pom.xml | 8 ++++---- street/pom.xml | 4 ++-- transit/pom.xml | 4 ++-- 12 files changed, 35 insertions(+), 33 deletions(-) diff --git a/application/pom.xml b/application/pom.xml index a2591e56c1f..184e490baef 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -19,18 +19,18 @@ ${project.version} - ${project.groupId} - core-utils + org.opentripplanner.core + utils ${project.version} - ${project.groupId} - core-framework + org.opentripplanner.core + framework ${project.version} - ${project.groupId} - raptor-router + org.opentripplanner.raptor + router ${project.version} @@ -144,8 +144,8 @@ - ${project.groupId} - core-test-fixtures + org.opentripplanner.core + test-fixtures ${project.version} test diff --git a/astar/pom.xml b/astar/pom.xml index 642202001f3..c3f8a1b5495 100644 --- a/astar/pom.xml +++ b/astar/pom.xml @@ -23,8 +23,8 @@ - ${project.groupId} - core-utils + org.opentripplanner.core + utils ${project.version} diff --git a/core/domain/pom.xml b/core/domain/pom.xml index cd9e68aad91..7415b747557 100644 --- a/core/domain/pom.xml +++ b/core/domain/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.opentripplanner + org.opentripplanner.core core 2.11.0-SNAPSHOT - core-domain + domain OpenTripPlanner - Core Domain @@ -24,7 +24,7 @@ ${project.groupId} - core-utils + utils ${project.version} diff --git a/core/framework/pom.xml b/core/framework/pom.xml index ae7baf54e31..223e7e96ac9 100644 --- a/core/framework/pom.xml +++ b/core/framework/pom.xml @@ -4,14 +4,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.opentripplanner + org.opentripplanner.core core 2.11.0-SNAPSHOT - core-framework + framework OpenTripPlanner - Core Framework - Core framework implementation - the api should be in the core-domain + Core framework implementation - the api should be in the domain module @@ -26,7 +26,7 @@ ${project.groupId} - core-domain + domain ${project.version} @@ -44,7 +44,7 @@ ${project.groupId} - core-test-fixtures + test-fixtures ${project.version} test diff --git a/core/pom.xml b/core/pom.xml index 3a41e85b059..d823a6c86e8 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -9,6 +9,7 @@ 2.11.0-SNAPSHOT + org.opentripplanner.core core OpenTripPlanner - Core pom diff --git a/core/test-fixtures/pom.xml b/core/test-fixtures/pom.xml index 98075e96694..03085395a56 100644 --- a/core/test-fixtures/pom.xml +++ b/core/test-fixtures/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.opentripplanner + org.opentripplanner.core core 2.11.0-SNAPSHOT - core-test-fixtures + test-fixtures OpenTripPlanner - Test Fixtures diff --git a/core/utils/pom.xml b/core/utils/pom.xml index 4e3f44eb9fd..7b9cdaa0d25 100644 --- a/core/utils/pom.xml +++ b/core/utils/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.opentripplanner + org.opentripplanner.core core 2.11.0-SNAPSHOT - core-utils + utils OpenTripPlanner - Utils diff --git a/raptor/data/pom.xml b/raptor/data/pom.xml index d8631b7b2ce..55b412588cd 100644 --- a/raptor/data/pom.xml +++ b/raptor/data/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.opentripplanner + org.opentripplanner.raptor raptor 2.11.0-SNAPSHOT - raptor-data + data OpenTripPlanner - Raptor Data @@ -25,7 +25,7 @@ ${project.groupId} - raptor-router + router ${project.version} diff --git a/raptor/pom.xml b/raptor/pom.xml index dede1118e6f..d7e161ecd3c 100644 --- a/raptor/pom.xml +++ b/raptor/pom.xml @@ -9,6 +9,7 @@ 2.11.0-SNAPSHOT + org.opentripplanner.raptor raptor OpenTripPlanner - Raptor pom diff --git a/raptor/router/pom.xml b/raptor/router/pom.xml index 1df26e318bd..418c26b5b37 100644 --- a/raptor/router/pom.xml +++ b/raptor/router/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.opentripplanner + org.opentripplanner.raptor raptor 2.11.0-SNAPSHOT - raptor-router + router OpenTripPlanner - Raptor Router @@ -25,8 +25,8 @@ - ${project.groupId} - core-utils + org.opentripplanner.core + utils ${project.version} diff --git a/street/pom.xml b/street/pom.xml index 93763043999..90b7fd086a8 100644 --- a/street/pom.xml +++ b/street/pom.xml @@ -23,8 +23,8 @@ - ${project.groupId} - core-domain + org.opentripplanner.core + domain ${project.version} diff --git a/transit/pom.xml b/transit/pom.xml index f75c7bd1acb..e16e46a18cc 100644 --- a/transit/pom.xml +++ b/transit/pom.xml @@ -24,8 +24,8 @@ - ${project.groupId} - core-domain + org.opentripplanner.core + domain ${project.version} From c1651b5934209669a6b4ab652f06da0fbda48194 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 17 Sep 2026 21:46:57 +0200 Subject: [PATCH 41/68] style: organize and sort Maven dependency declarations by section Group each module's block into project dependencies, 3rd party dependencies, and test dependencies (a dependency with test is classified as a test dependency even if it points at a project module), skipping a section header when a module has no dependencies in that category. Sort dependencies within each section by groupId then artifactId. No dependency was added, removed, or had its version/scope changed; this is a pure reordering plus comment cleanup (dropped a few redundant section-label comments like "TESTING"/"SIRI"/"netcdf4" now covered by the new headers, kept every comment that explains why a dependency is needed). --- application/pom.xml | 455 ++++++++++++++++----------------- astar/pom.xml | 5 +- core/domain/pom.xml | 26 +- core/framework/pom.xml | 18 +- core/utils/pom.xml | 14 +- gtfs-realtime-protobuf/pom.xml | 1 + raptor/data/pom.xml | 8 +- raptor/router/pom.xml | 15 +- street/pom.xml | 63 +++-- test/integration/pom.xml | 13 +- transit/pom.xml | 14 +- 11 files changed, 307 insertions(+), 325 deletions(-) diff --git a/application/pom.xml b/application/pom.xml index 184e490baef..2c0d259cfb4 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -13,14 +13,19 @@ + + ${project.groupId} + astar + ${project.version} + ${project.groupId} gtfs-realtime-protobuf ${project.version} - org.opentripplanner.core - utils + ${project.groupId} + street ${project.version} @@ -28,191 +33,233 @@ framework ${project.version} + + org.opentripplanner.core + utils + ${project.version} + org.opentripplanner.raptor router ${project.version} + + - ${project.groupId} - astar - ${project.version} + ch.poole + OpeningHoursParser + 0.29.0 + - ${project.groupId} - street - ${project.version} + ch.qos.logback + logback-classic + ${logback.version} - - - - - net.sf.trove4j - trove4j + com.azure + azure-core + 1.59.1 - - org.slf4j - slf4j-api + com.azure + azure-identity + 1.18.6 + compile - - org.slf4j - jul-to-slf4j - ${slf4j.version} + com.azure + azure-messaging-servicebus + 7.17.20 - + - ch.qos.logback - logback-classic - ${logback.version} + com.beust + jcommander + 1.82 - + + - net.logstash.logback - logstash-logback-encoder - 9.0 + com.conveyal + kryo-tools + 1.6.0 + + + + com.fasterxml.jackson.core + jackson-annotations + 2.22 + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jdk8 + ${jackson.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson.version} + + + + + com.google.cloud + google-cloud-pubsub + + + + com.google.cloud + google-cloud-storage - com.google.dagger dagger ${google.dagger.version} - - + - org.apache.lucene - lucene-core - ${lucene.version} + com.google.guava + guava + - org.apache.lucene - lucene-queryparser - ${lucene.version} + com.google.protobuf + protobuf-java - org.apache.lucene - lucene-suggest - ${lucene.version} + com.graphql-java + graphql-java + 26.1 - - io.micrometer - micrometer-registry-prometheus - ${micrometer.version} + com.graphql-java + graphql-java-extended-scalars + 24.0 - io.micrometer - micrometer-registry-influx - ${micrometer.version} - test + com.hivemq + hivemq-mqtt-client + 1.4.0 + + + + de.javakaffee + kryo-serializers + 0.45 - - - edu.ucar netcdf4 ${netcdf4.version} - - org.entur - netex-java-model - ${netex-java-model.version} + io.github.ci-cmg + mapbox-vector-tile + 4.0.7 - - - org.entur - siri-java-model - ${siri-java-model.version} + io.micrometer + micrometer-registry-prometheus + ${micrometer.version} - + - org.mobilitydata - gbfs-java-model - 1.0.14 + net.java.dev.jets3t + jets3t + 0.9.4 - - + - org.opentripplanner.core - test-fixtures - ${project.version} - test + net.logstash.logback + logstash-logback-encoder + 9.0 - org.junit.jupiter - junit-jupiter-params - test + net.objecthunter + exp4j + 0.4.8 - com.google.truth - truth - test + net.sf.trove4j + trove4j - com.tngtech.archunit - archunit - 1.5.0 - test + net.sourceforge.javacsv + javacsv + 2.0 - org.mockito - mockito-core - 5.23.0 - test + org.apache.httpcomponents.client5 + httpclient5 + 5.6.4 + - io.github.origin-energy - java-snapshot-testing-junit5 - 2.3.0 - test + org.apache.lucene + lucene-core + ${lucene.version} - - - com.conveyal - kryo-tools - 1.6.0 + org.apache.lucene + lucene-queryparser + ${lucene.version} - - de.javakaffee - kryo-serializers - 0.45 + org.apache.lucene + lucene-suggest + ${lucene.version} - + - com.google.guava - guava + org.entur + netex-java-model + ${netex-java-model.version} + + + org.entur + siri-java-model + ${siri-java-model.version} org.geotools - gt-coverage + gt-api org.geotools - gt-geotiff + gt-coverage org.geotools - gt-api + gt-geotiff - + - org.glassfish.jersey.core - jersey-server - ${jersey.version} + org.glassfish.jaxb + jaxb-runtime + ${jaxb-runtime.version} @@ -220,16 +267,10 @@ jersey-container-grizzly2-http ${jersey.version} - - - org.glassfish.jersey.media - jersey-media-json-jackson - ${jersey.version} - - + - org.glassfish.jersey.media - jersey-media-jaxb + org.glassfish.jersey.core + jersey-server ${jersey.version} @@ -238,166 +279,104 @@ jersey-hk2 ${jersey.version} - - - - org.glassfish.jaxb - jaxb-runtime - ${jaxb-runtime.version} - - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jdk8 - ${jackson.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson.version} - - - - com.fasterxml.jackson.core - jackson-annotations - 2.22 - - - - - + - com.google.cloud - google-cloud-storage + org.glassfish.jersey.media + jersey-media-jaxb + ${jersey.version} - - + - com.google.cloud - google-cloud-pubsub + org.glassfish.jersey.media + jersey-media-json-jackson + ${jersey.version} - - - com.google.protobuf - protobuf-java + org.mobilitydata + gbfs-java-model + 1.0.14 - org.onebusaway onebusaway-gtfs 14.2.3 - - - net.java.dev.jets3t - jets3t - 0.9.4 - org.openstreetmap.pbf osmpbf 1.8.0 - - com.beust - jcommander - 1.82 + org.opentripplanner + ojp-java-model + 2.0.7 + - com.graphql-java - graphql-java - 26.1 + org.slf4j + jul-to-slf4j + ${slf4j.version} + - com.graphql-java - graphql-java-extended-scalars - 24.0 + org.slf4j + slf4j-api + + - org.apache.httpcomponents.client5 - httpclient5 - 5.6.4 + com.google.truth + truth + test - commons-cli - commons-cli + com.tngtech.archunit + archunit 1.5.0 test - net.sourceforge.javacsv - javacsv - 2.0 - - - com.hivemq - hivemq-mqtt-client - 1.4.0 - - - io.github.ci-cmg - mapbox-vector-tile - 4.0.7 - - - net.objecthunter - exp4j - 0.4.8 + commons-cli + commons-cli + 1.5.0 + test - com.azure - azure-core - 1.59.1 + io.github.origin-energy + java-snapshot-testing-junit5 + 2.3.0 + test - com.azure - azure-messaging-servicebus - 7.17.20 + io.micrometer + micrometer-registry-influx + ${micrometer.version} + test + - com.azure - azure-identity - 1.18.6 - compile + org.apache.commons + commons-compress + 1.28.0 + test - ch.poole - OpeningHoursParser - 0.29.0 + org.junit.jupiter + junit-jupiter-params + test - - org.opentripplanner - ojp-java-model - 2.0.7 + org.mockito + mockito-core + 5.23.0 + test - - - org.apache.commons - commons-compress - 1.28.0 + org.opentripplanner.core + test-fixtures + ${project.version} test diff --git a/astar/pom.xml b/astar/pom.xml index c3f8a1b5495..fe99090cc6e 100644 --- a/astar/pom.xml +++ b/astar/pom.xml @@ -22,17 +22,21 @@ + org.opentripplanner.core utils ${project.version} + org.slf4j slf4j-api ${slf4j.version} + + org.junit.jupiter junit-jupiter-api @@ -45,7 +49,6 @@ 5.23.0 test - \ No newline at end of file diff --git a/core/domain/pom.xml b/core/domain/pom.xml index 7415b747557..df75b47e01a 100644 --- a/core/domain/pom.xml +++ b/core/domain/pom.xml @@ -22,38 +22,40 @@ + ${project.groupId} utils ${project.version} + + + javax.inject + javax.inject + 1 + org.slf4j slf4j-api ${slf4j.version} + + - org.junit.jupiter - junit-jupiter-api + com.google.truth + truth test org.junit.jupiter - junit-jupiter-params + junit-jupiter-api test - com.google.truth - truth + org.junit.jupiter + junit-jupiter-params test - - - javax.inject - javax.inject - 1 - - \ No newline at end of file diff --git a/core/framework/pom.xml b/core/framework/pom.xml index 223e7e96ac9..e6bb3654936 100644 --- a/core/framework/pom.xml +++ b/core/framework/pom.xml @@ -31,21 +31,20 @@ - - org.slf4j - slf4j-api - jakarta.inject jakarta.inject-api 2.0.1 + + org.slf4j + slf4j-api + - ${project.groupId} - test-fixtures - ${project.version} + com.google.truth + truth test @@ -55,8 +54,9 @@ test - com.google.truth - truth + ${project.groupId} + test-fixtures + ${project.version} test diff --git a/core/utils/pom.xml b/core/utils/pom.xml index 7b9cdaa0d25..184e2e47f2d 100644 --- a/core/utils/pom.xml +++ b/core/utils/pom.xml @@ -22,27 +22,27 @@ + com.google.code.findbugs jsr305 - - + - org.junit.jupiter - junit-jupiter-api + com.google.truth + truth test org.junit.jupiter - junit-jupiter-params + junit-jupiter-api test - com.google.truth - truth + org.junit.jupiter + junit-jupiter-params test diff --git a/gtfs-realtime-protobuf/pom.xml b/gtfs-realtime-protobuf/pom.xml index 000893bf35b..85ff9da1579 100644 --- a/gtfs-realtime-protobuf/pom.xml +++ b/gtfs-realtime-protobuf/pom.xml @@ -13,6 +13,7 @@ + com.google.protobuf protobuf-java diff --git a/raptor/data/pom.xml b/raptor/data/pom.xml index 55b412588cd..0a6a7cb31f1 100644 --- a/raptor/data/pom.xml +++ b/raptor/data/pom.xml @@ -41,13 +41,13 @@ - org.junit.jupiter - junit-jupiter-api + com.google.truth + truth test - com.google.truth - truth + org.junit.jupiter + junit-jupiter-api test diff --git a/raptor/router/pom.xml b/raptor/router/pom.xml index 418c26b5b37..e95168a9b42 100644 --- a/raptor/router/pom.xml +++ b/raptor/router/pom.xml @@ -23,7 +23,6 @@ - org.opentripplanner.core utils @@ -31,7 +30,6 @@ - com.google.code.findbugs @@ -47,21 +45,20 @@ slf4j-api - - + - org.junit.jupiter - junit-jupiter-api + com.tngtech.archunit + archunit test org.junit.jupiter - junit-jupiter-params + junit-jupiter-api test - com.tngtech.archunit - archunit + org.junit.jupiter + junit-jupiter-params test diff --git a/street/pom.xml b/street/pom.xml index 90b7fd086a8..9139dd6a30d 100644 --- a/street/pom.xml +++ b/street/pom.xml @@ -22,34 +22,19 @@ - - org.opentripplanner.core - domain - ${project.version} - + ${project.groupId} astar ${project.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.junit.jupiter - junit-jupiter-api - ${junit.version} - test - - org.junit.jupiter - junit-jupiter-params - ${junit.version} - test + org.opentripplanner.core + domain + ${project.version} + + com.google.dagger dagger @@ -59,33 +44,47 @@ com.google.guava guava + + de.grundid.opendatalab + geojson-jackson + + + net.sf.trove4j + trove4j + - - org.geotools gt-geojson-core - de.grundid.opendatalab - geojson-jackson - - - net.sf.trove4j - trove4j + org.slf4j + slf4j-api + ${slf4j.version} + + com.google.truth truth test - + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-params + ${junit.version} + test + - - \ No newline at end of file diff --git a/test/integration/pom.xml b/test/integration/pom.xml index eb647d138b5..13dff1d25c1 100644 --- a/test/integration/pom.xml +++ b/test/integration/pom.xml @@ -14,12 +14,7 @@ integration-test - - ${project.groupId} - application - ${project.version} - test - + org.junit.jupiter junit-jupiter-api @@ -32,6 +27,12 @@ ${junit.version} test + + ${project.groupId} + application + ${project.version} + test + diff --git a/transit/pom.xml b/transit/pom.xml index e16e46a18cc..16841fce7bf 100644 --- a/transit/pom.xml +++ b/transit/pom.xml @@ -29,22 +29,22 @@ ${project.version} - + org.slf4j slf4j-api - + - org.junit.jupiter - junit-jupiter - ${junit.version} + com.google.truth + truth test - com.google.truth - truth + org.junit.jupiter + junit-jupiter + ${junit.version} test From ccef7ab3c908db3c5d79ebba3d3981172a9e7003 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 17 Sep 2026 22:01:09 +0200 Subject: [PATCH 42/68] fix: pin transitive dependency versions that drifted after dependency sort Sorting a module's alphabetically can change which sibling's transitive dependency graph wins Maven's "nearest depth, first-declared-on-tie" version mediation, silently changing a resolved transitive version even though no direct dependency changed. Verified this with mvn dependency:list/dependency:tree before/after the sort commit and found three affected artifacts. - com.azure:azure-core-http-netty: application/otp-shaded/integration-test all originally resolved 1.16.6; pinned reactor-wide in the root pom since no other module references this artifact. - com.google.errorprone:error_prone_annotations: application originally resolved 2.41.0, while street/otp-shaded/integration-test correctly and independently resolve 2.50.0 via a different path. Pinned only in application's own dependencyManagement so the other modules are unaffected. - org.jspecify:jspecify: core-framework originally resolved 1.0.1 while every other module resolves 1.0.0. Pinned only in core-framework's own dependencyManagement for the same reason. Re-verified with the same before/after dependency:list comparison across all 16 modules: zero differences. --- application/pom.xml | 15 +++++++++++++++ core/framework/pom.xml | 15 +++++++++++++++ pom.xml | 11 +++++++++++ 3 files changed, 41 insertions(+) diff --git a/application/pom.xml b/application/pom.xml index 2c0d259cfb4..14e62504b40 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -11,6 +11,21 @@ application OpenTripPlanner - Application + + + + + com.google.errorprone + error_prone_annotations + 2.41.0 + + + + diff --git a/core/framework/pom.xml b/core/framework/pom.xml index e6bb3654936..46a981890d3 100644 --- a/core/framework/pom.xml +++ b/core/framework/pom.xml @@ -13,6 +13,21 @@ OpenTripPlanner - Core Framework Core framework implementation - the api should be in the domain module + + + + + org.jspecify + jspecify + 1.0.1 + + + + diff --git a/pom.xml b/pom.xml index 7f42f7347d0..4b25e1b6983 100644 --- a/pom.xml +++ b/pom.xml @@ -618,6 +618,17 @@ 33.7.1-jre + + + com.azure + azure-core-http-netty + 1.16.6 + + org.slf4j From 38fb033fb213feafcc5e02ac93b842fb6cc2cc2e Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 21 Sep 2026 16:58:52 +0200 Subject: [PATCH 43/68] refactor: rename core/domain module to core/model Renames the core-domain Maven module to core-model (directory, artifactId, and pom name) and updates all references across the reactor (root pom, core/pom.xml module list, street/transit dependencies, CLAUDE.md). Also moves the jspecify dependencyManagement pin from core/framework/pom.xml to the root pom. Java packages under the module still say org.opentripplanner.core.domain and will be repackaged to core.model in a follow-up commit. --- CLAUDE.md | 2 +- core/framework/pom.xml | 19 ++----------------- core/{domain => model}/pom.xml | 4 ++-- .../deduplicator/DeduplicatorNoop.java | 0 .../deduplicator/DeduplicatorService.java | 0 .../framework/di/TransitServicePeriod.java | 0 .../domain/framework/event/DomainEvent.java | 0 .../domain/framework/event/EventHandler.java | 0 .../resources/ResourceBundleAdaptor.java | 0 .../resources/ResourceBundleSingleton.java | 0 .../transaction/RepositoryRegistry.java | 0 .../framework/transaction/UpdateManager.java | 0 .../transaction/api/RepositoryHandle.java | 0 .../transaction/api/RepositoryLifecycle.java | 0 .../transaction/api/TransactionScope.java | 0 .../transaction/api/WriteContext.java | 0 .../model/accessibility/Accessibility.java | 0 .../core/domain/model/basic/Cost.java | 0 .../core/domain/model/basic/Distance.java | 0 .../domain/model/basic/NormalizedCost.java | 0 .../core/domain/model/basic/Ratio.java | 0 .../core/domain/model/doc/DocumentedEnum.java | 0 .../core/domain/model/i18n/I18NString.java | 0 .../domain/model/i18n/I18NStringMapper.java | 0 .../domain/model/i18n/LocalizedString.java | 0 .../model/i18n/LocalizedStringFormat.java | 0 .../domain/model/i18n/NonLocalizedString.java | 0 .../domain/model/i18n/TranslatedString.java | 0 .../core/domain/model/id/FeedScopedId.java | 0 .../domain/model/time/LocalDateRange.java | 0 .../core/domain/model/time/TimePeriod.java | 0 .../src/main/resources/Message.properties | 0 .../src/main/resources/Message_de.properties | 0 .../src/main/resources/Message_es.properties | 0 .../src/main/resources/Message_fr.properties | 0 .../src/main/resources/Message_hu.properties | 0 .../src/main/resources/Message_nl.properties | 0 .../main/resources/WayProperties.properties | 0 .../resources/WayProperties_de.properties | 0 .../resources/WayProperties_fi.properties | 0 .../resources/WayProperties_fr.properties | 0 .../resources/WayProperties_hu.properties | 0 .../resources/WayProperties_nl.properties | 0 .../resources/WayProperties_no.properties | 0 .../resources/WayProperties_sv.properties | 0 .../src/main/resources/internals.properties | 0 .../main/resources/internals_de.properties | 0 .../main/resources/internals_fi.properties | 0 .../main/resources/internals_fr.properties | 0 .../main/resources/internals_hu.properties | 0 .../main/resources/internals_no.properties | 0 .../main/resources/internals_sv.properties | 0 .../domain/model/i18n/I18NStringTest.java | 0 .../model/i18n/LocalizedStringTest.java | 0 .../model/i18n/TranslatedStringTest.java | 0 .../domain/model/id/FeedScopedIdTest.java | 0 .../domain/model/time/LocalDateRangeTest.java | 0 .../domain/model/time/TimePeriodTest.java | 0 core/pom.xml | 2 +- pom.xml | 11 +++++++++++ street/pom.xml | 2 +- transit/pom.xml | 2 +- 62 files changed, 19 insertions(+), 23 deletions(-) rename core/{domain => model}/pom.xml (95%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorNoop.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorService.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/framework/di/TransitServicePeriod.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/framework/event/DomainEvent.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/framework/event/EventHandler.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleAdaptor.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleSingleton.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/framework/transaction/RepositoryRegistry.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/framework/transaction/UpdateManager.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryHandle.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryLifecycle.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/TransactionScope.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/WriteContext.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/model/accessibility/Accessibility.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/model/basic/Cost.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/model/basic/Distance.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/model/basic/NormalizedCost.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/model/basic/Ratio.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/model/doc/DocumentedEnum.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NString.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NStringMapper.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedString.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringFormat.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/model/i18n/NonLocalizedString.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/model/i18n/TranslatedString.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/model/id/FeedScopedId.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/model/time/LocalDateRange.java (100%) rename core/{domain => model}/src/main/java/org/opentripplanner/core/domain/model/time/TimePeriod.java (100%) rename core/{domain => model}/src/main/resources/Message.properties (100%) rename core/{domain => model}/src/main/resources/Message_de.properties (100%) rename core/{domain => model}/src/main/resources/Message_es.properties (100%) rename core/{domain => model}/src/main/resources/Message_fr.properties (100%) rename core/{domain => model}/src/main/resources/Message_hu.properties (100%) rename core/{domain => model}/src/main/resources/Message_nl.properties (100%) rename core/{domain => model}/src/main/resources/WayProperties.properties (100%) rename core/{domain => model}/src/main/resources/WayProperties_de.properties (100%) rename core/{domain => model}/src/main/resources/WayProperties_fi.properties (100%) rename core/{domain => model}/src/main/resources/WayProperties_fr.properties (100%) rename core/{domain => model}/src/main/resources/WayProperties_hu.properties (100%) rename core/{domain => model}/src/main/resources/WayProperties_nl.properties (100%) rename core/{domain => model}/src/main/resources/WayProperties_no.properties (100%) rename core/{domain => model}/src/main/resources/WayProperties_sv.properties (100%) rename core/{domain => model}/src/main/resources/internals.properties (100%) rename core/{domain => model}/src/main/resources/internals_de.properties (100%) rename core/{domain => model}/src/main/resources/internals_fi.properties (100%) rename core/{domain => model}/src/main/resources/internals_fr.properties (100%) rename core/{domain => model}/src/main/resources/internals_hu.properties (100%) rename core/{domain => model}/src/main/resources/internals_no.properties (100%) rename core/{domain => model}/src/main/resources/internals_sv.properties (100%) rename core/{domain => model}/src/test/java/org/opentripplanner/core/domain/model/i18n/I18NStringTest.java (100%) rename core/{domain => model}/src/test/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringTest.java (100%) rename core/{domain => model}/src/test/java/org/opentripplanner/core/domain/model/i18n/TranslatedStringTest.java (100%) rename core/{domain => model}/src/test/java/org/opentripplanner/core/domain/model/id/FeedScopedIdTest.java (100%) rename core/{domain => model}/src/test/java/org/opentripplanner/core/domain/model/time/LocalDateRangeTest.java (100%) rename core/{domain => model}/src/test/java/org/opentripplanner/core/domain/model/time/TimePeriodTest.java (100%) diff --git a/CLAUDE.md b/CLAUDE.md index 706faac2699..6afb48997e9 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -78,7 +78,7 @@ mvn test -Dtest=ClassName#methodName Multi-module Maven project (root `pom.xml` ``): - **utils**: low-level utilities shared by all modules -- **domain-core**: core domain primitives (`org.opentripplanner.core`) — `FeedScopedId`, `Cost`, +- **model-core**: core domain primitives (`org.opentripplanner.core`) — `FeedScopedId`, `Cost`, `Distance`, `I18NString`, `Accessibility`, plus framework (deduplicator, DI, resources) - **raptor**: transit routing engine — `raptor/router/src`. Isolated: **zero dependencies on OTP code** (only utilities). Performance-critical; data is supplied via the SPI in `raptor/spi`. diff --git a/core/framework/pom.xml b/core/framework/pom.xml index 46a981890d3..ce4b9fcd92a 100644 --- a/core/framework/pom.xml +++ b/core/framework/pom.xml @@ -11,22 +11,7 @@ framework OpenTripPlanner - Core Framework - Core framework implementation - the api should be in the domain module - - - - - - org.jspecify - jspecify - 1.0.1 - - - + Core framework implementation - the api should be in the core model module @@ -41,7 +26,7 @@ ${project.groupId} - domain + model ${project.version} diff --git a/core/domain/pom.xml b/core/model/pom.xml similarity index 95% rename from core/domain/pom.xml rename to core/model/pom.xml index df75b47e01a..678d4d9a624 100644 --- a/core/domain/pom.xml +++ b/core/model/pom.xml @@ -9,8 +9,8 @@ 2.11.0-SNAPSHOT - domain - OpenTripPlanner - Core Domain + model + OpenTripPlanner - Core Model diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorNoop.java b/core/model/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorNoop.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorNoop.java rename to core/model/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorNoop.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorService.java b/core/model/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorService.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorService.java rename to core/model/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorService.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/di/TransitServicePeriod.java b/core/model/src/main/java/org/opentripplanner/core/domain/framework/di/TransitServicePeriod.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/framework/di/TransitServicePeriod.java rename to core/model/src/main/java/org/opentripplanner/core/domain/framework/di/TransitServicePeriod.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/event/DomainEvent.java b/core/model/src/main/java/org/opentripplanner/core/domain/framework/event/DomainEvent.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/framework/event/DomainEvent.java rename to core/model/src/main/java/org/opentripplanner/core/domain/framework/event/DomainEvent.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/event/EventHandler.java b/core/model/src/main/java/org/opentripplanner/core/domain/framework/event/EventHandler.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/framework/event/EventHandler.java rename to core/model/src/main/java/org/opentripplanner/core/domain/framework/event/EventHandler.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleAdaptor.java b/core/model/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleAdaptor.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleAdaptor.java rename to core/model/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleAdaptor.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleSingleton.java b/core/model/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleSingleton.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleSingleton.java rename to core/model/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleSingleton.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/RepositoryRegistry.java b/core/model/src/main/java/org/opentripplanner/core/domain/framework/transaction/RepositoryRegistry.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/RepositoryRegistry.java rename to core/model/src/main/java/org/opentripplanner/core/domain/framework/transaction/RepositoryRegistry.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/UpdateManager.java b/core/model/src/main/java/org/opentripplanner/core/domain/framework/transaction/UpdateManager.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/UpdateManager.java rename to core/model/src/main/java/org/opentripplanner/core/domain/framework/transaction/UpdateManager.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryHandle.java b/core/model/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryHandle.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryHandle.java rename to core/model/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryHandle.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryLifecycle.java b/core/model/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryLifecycle.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryLifecycle.java rename to core/model/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryLifecycle.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/TransactionScope.java b/core/model/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/TransactionScope.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/TransactionScope.java rename to core/model/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/TransactionScope.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/WriteContext.java b/core/model/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/WriteContext.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/WriteContext.java rename to core/model/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/WriteContext.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/accessibility/Accessibility.java b/core/model/src/main/java/org/opentripplanner/core/domain/model/accessibility/Accessibility.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/model/accessibility/Accessibility.java rename to core/model/src/main/java/org/opentripplanner/core/domain/model/accessibility/Accessibility.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/Cost.java b/core/model/src/main/java/org/opentripplanner/core/domain/model/basic/Cost.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/Cost.java rename to core/model/src/main/java/org/opentripplanner/core/domain/model/basic/Cost.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/Distance.java b/core/model/src/main/java/org/opentripplanner/core/domain/model/basic/Distance.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/Distance.java rename to core/model/src/main/java/org/opentripplanner/core/domain/model/basic/Distance.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/NormalizedCost.java b/core/model/src/main/java/org/opentripplanner/core/domain/model/basic/NormalizedCost.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/NormalizedCost.java rename to core/model/src/main/java/org/opentripplanner/core/domain/model/basic/NormalizedCost.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/Ratio.java b/core/model/src/main/java/org/opentripplanner/core/domain/model/basic/Ratio.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/model/basic/Ratio.java rename to core/model/src/main/java/org/opentripplanner/core/domain/model/basic/Ratio.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/doc/DocumentedEnum.java b/core/model/src/main/java/org/opentripplanner/core/domain/model/doc/DocumentedEnum.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/model/doc/DocumentedEnum.java rename to core/model/src/main/java/org/opentripplanner/core/domain/model/doc/DocumentedEnum.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NString.java b/core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NString.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NString.java rename to core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NString.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NStringMapper.java b/core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NStringMapper.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NStringMapper.java rename to core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NStringMapper.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedString.java b/core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedString.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedString.java rename to core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedString.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringFormat.java b/core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringFormat.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringFormat.java rename to core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringFormat.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/NonLocalizedString.java b/core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/NonLocalizedString.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/NonLocalizedString.java rename to core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/NonLocalizedString.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/TranslatedString.java b/core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/TranslatedString.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/model/i18n/TranslatedString.java rename to core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/TranslatedString.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/id/FeedScopedId.java b/core/model/src/main/java/org/opentripplanner/core/domain/model/id/FeedScopedId.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/model/id/FeedScopedId.java rename to core/model/src/main/java/org/opentripplanner/core/domain/model/id/FeedScopedId.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/time/LocalDateRange.java b/core/model/src/main/java/org/opentripplanner/core/domain/model/time/LocalDateRange.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/model/time/LocalDateRange.java rename to core/model/src/main/java/org/opentripplanner/core/domain/model/time/LocalDateRange.java diff --git a/core/domain/src/main/java/org/opentripplanner/core/domain/model/time/TimePeriod.java b/core/model/src/main/java/org/opentripplanner/core/domain/model/time/TimePeriod.java similarity index 100% rename from core/domain/src/main/java/org/opentripplanner/core/domain/model/time/TimePeriod.java rename to core/model/src/main/java/org/opentripplanner/core/domain/model/time/TimePeriod.java diff --git a/core/domain/src/main/resources/Message.properties b/core/model/src/main/resources/Message.properties similarity index 100% rename from core/domain/src/main/resources/Message.properties rename to core/model/src/main/resources/Message.properties diff --git a/core/domain/src/main/resources/Message_de.properties b/core/model/src/main/resources/Message_de.properties similarity index 100% rename from core/domain/src/main/resources/Message_de.properties rename to core/model/src/main/resources/Message_de.properties diff --git a/core/domain/src/main/resources/Message_es.properties b/core/model/src/main/resources/Message_es.properties similarity index 100% rename from core/domain/src/main/resources/Message_es.properties rename to core/model/src/main/resources/Message_es.properties diff --git a/core/domain/src/main/resources/Message_fr.properties b/core/model/src/main/resources/Message_fr.properties similarity index 100% rename from core/domain/src/main/resources/Message_fr.properties rename to core/model/src/main/resources/Message_fr.properties diff --git a/core/domain/src/main/resources/Message_hu.properties b/core/model/src/main/resources/Message_hu.properties similarity index 100% rename from core/domain/src/main/resources/Message_hu.properties rename to core/model/src/main/resources/Message_hu.properties diff --git a/core/domain/src/main/resources/Message_nl.properties b/core/model/src/main/resources/Message_nl.properties similarity index 100% rename from core/domain/src/main/resources/Message_nl.properties rename to core/model/src/main/resources/Message_nl.properties diff --git a/core/domain/src/main/resources/WayProperties.properties b/core/model/src/main/resources/WayProperties.properties similarity index 100% rename from core/domain/src/main/resources/WayProperties.properties rename to core/model/src/main/resources/WayProperties.properties diff --git a/core/domain/src/main/resources/WayProperties_de.properties b/core/model/src/main/resources/WayProperties_de.properties similarity index 100% rename from core/domain/src/main/resources/WayProperties_de.properties rename to core/model/src/main/resources/WayProperties_de.properties diff --git a/core/domain/src/main/resources/WayProperties_fi.properties b/core/model/src/main/resources/WayProperties_fi.properties similarity index 100% rename from core/domain/src/main/resources/WayProperties_fi.properties rename to core/model/src/main/resources/WayProperties_fi.properties diff --git a/core/domain/src/main/resources/WayProperties_fr.properties b/core/model/src/main/resources/WayProperties_fr.properties similarity index 100% rename from core/domain/src/main/resources/WayProperties_fr.properties rename to core/model/src/main/resources/WayProperties_fr.properties diff --git a/core/domain/src/main/resources/WayProperties_hu.properties b/core/model/src/main/resources/WayProperties_hu.properties similarity index 100% rename from core/domain/src/main/resources/WayProperties_hu.properties rename to core/model/src/main/resources/WayProperties_hu.properties diff --git a/core/domain/src/main/resources/WayProperties_nl.properties b/core/model/src/main/resources/WayProperties_nl.properties similarity index 100% rename from core/domain/src/main/resources/WayProperties_nl.properties rename to core/model/src/main/resources/WayProperties_nl.properties diff --git a/core/domain/src/main/resources/WayProperties_no.properties b/core/model/src/main/resources/WayProperties_no.properties similarity index 100% rename from core/domain/src/main/resources/WayProperties_no.properties rename to core/model/src/main/resources/WayProperties_no.properties diff --git a/core/domain/src/main/resources/WayProperties_sv.properties b/core/model/src/main/resources/WayProperties_sv.properties similarity index 100% rename from core/domain/src/main/resources/WayProperties_sv.properties rename to core/model/src/main/resources/WayProperties_sv.properties diff --git a/core/domain/src/main/resources/internals.properties b/core/model/src/main/resources/internals.properties similarity index 100% rename from core/domain/src/main/resources/internals.properties rename to core/model/src/main/resources/internals.properties diff --git a/core/domain/src/main/resources/internals_de.properties b/core/model/src/main/resources/internals_de.properties similarity index 100% rename from core/domain/src/main/resources/internals_de.properties rename to core/model/src/main/resources/internals_de.properties diff --git a/core/domain/src/main/resources/internals_fi.properties b/core/model/src/main/resources/internals_fi.properties similarity index 100% rename from core/domain/src/main/resources/internals_fi.properties rename to core/model/src/main/resources/internals_fi.properties diff --git a/core/domain/src/main/resources/internals_fr.properties b/core/model/src/main/resources/internals_fr.properties similarity index 100% rename from core/domain/src/main/resources/internals_fr.properties rename to core/model/src/main/resources/internals_fr.properties diff --git a/core/domain/src/main/resources/internals_hu.properties b/core/model/src/main/resources/internals_hu.properties similarity index 100% rename from core/domain/src/main/resources/internals_hu.properties rename to core/model/src/main/resources/internals_hu.properties diff --git a/core/domain/src/main/resources/internals_no.properties b/core/model/src/main/resources/internals_no.properties similarity index 100% rename from core/domain/src/main/resources/internals_no.properties rename to core/model/src/main/resources/internals_no.properties diff --git a/core/domain/src/main/resources/internals_sv.properties b/core/model/src/main/resources/internals_sv.properties similarity index 100% rename from core/domain/src/main/resources/internals_sv.properties rename to core/model/src/main/resources/internals_sv.properties diff --git a/core/domain/src/test/java/org/opentripplanner/core/domain/model/i18n/I18NStringTest.java b/core/model/src/test/java/org/opentripplanner/core/domain/model/i18n/I18NStringTest.java similarity index 100% rename from core/domain/src/test/java/org/opentripplanner/core/domain/model/i18n/I18NStringTest.java rename to core/model/src/test/java/org/opentripplanner/core/domain/model/i18n/I18NStringTest.java diff --git a/core/domain/src/test/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringTest.java b/core/model/src/test/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringTest.java similarity index 100% rename from core/domain/src/test/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringTest.java rename to core/model/src/test/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringTest.java diff --git a/core/domain/src/test/java/org/opentripplanner/core/domain/model/i18n/TranslatedStringTest.java b/core/model/src/test/java/org/opentripplanner/core/domain/model/i18n/TranslatedStringTest.java similarity index 100% rename from core/domain/src/test/java/org/opentripplanner/core/domain/model/i18n/TranslatedStringTest.java rename to core/model/src/test/java/org/opentripplanner/core/domain/model/i18n/TranslatedStringTest.java diff --git a/core/domain/src/test/java/org/opentripplanner/core/domain/model/id/FeedScopedIdTest.java b/core/model/src/test/java/org/opentripplanner/core/domain/model/id/FeedScopedIdTest.java similarity index 100% rename from core/domain/src/test/java/org/opentripplanner/core/domain/model/id/FeedScopedIdTest.java rename to core/model/src/test/java/org/opentripplanner/core/domain/model/id/FeedScopedIdTest.java diff --git a/core/domain/src/test/java/org/opentripplanner/core/domain/model/time/LocalDateRangeTest.java b/core/model/src/test/java/org/opentripplanner/core/domain/model/time/LocalDateRangeTest.java similarity index 100% rename from core/domain/src/test/java/org/opentripplanner/core/domain/model/time/LocalDateRangeTest.java rename to core/model/src/test/java/org/opentripplanner/core/domain/model/time/LocalDateRangeTest.java diff --git a/core/domain/src/test/java/org/opentripplanner/core/domain/model/time/TimePeriodTest.java b/core/model/src/test/java/org/opentripplanner/core/domain/model/time/TimePeriodTest.java similarity index 100% rename from core/domain/src/test/java/org/opentripplanner/core/domain/model/time/TimePeriodTest.java rename to core/model/src/test/java/org/opentripplanner/core/domain/model/time/TimePeriodTest.java diff --git a/core/pom.xml b/core/pom.xml index d823a6c86e8..e37bc59a096 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -15,7 +15,7 @@ pom - domain + model framework test-fixtures utils diff --git a/pom.xml b/pom.xml index 4b25e1b6983..d046e0a2ce2 100644 --- a/pom.xml +++ b/pom.xml @@ -629,6 +629,17 @@ 1.16.6 + + + org.jspecify + jspecify + 1.0.1 + + org.slf4j diff --git a/street/pom.xml b/street/pom.xml index 9139dd6a30d..8005517ca88 100644 --- a/street/pom.xml +++ b/street/pom.xml @@ -30,7 +30,7 @@ org.opentripplanner.core - domain + model ${project.version} diff --git a/transit/pom.xml b/transit/pom.xml index 16841fce7bf..5b82c8a70f7 100644 --- a/transit/pom.xml +++ b/transit/pom.xml @@ -25,7 +25,7 @@ org.opentripplanner.core - domain + model ${project.version} From c4099bb3eaca27a13538f6a66e35a5043f25ddbe Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 21 Sep 2026 17:48:46 +0200 Subject: [PATCH 44/68] refactor: Repackage core.domain to core.model (git-mv) --- .../core/{domain/framework => model}/event/DomainEvent.java | 0 .../core/{domain/framework => model}/event/EventHandler.java | 0 .../core/{domain => }/model/i18n/LocalizedString.java | 0 .../transaction/api => model/transaction}/RepositoryHandle.java | 0 .../api => model/transaction}/RepositoryLifecycle.java | 0 .../framework => model}/transaction/RepositoryRegistry.java | 0 .../transaction/api => model/transaction}/TransactionScope.java | 0 .../{domain/framework => model}/transaction/UpdateManager.java | 0 .../transaction/api => model/transaction}/WriteContext.java | 0 .../core/{domain => }/model/i18n/I18NStringTest.java | 0 .../core/{domain => }/model/i18n/LocalizedStringTest.java | 0 .../core/{domain => }/model/i18n/TranslatedStringTest.java | 0 .../core/{domain => }/model/id/FeedScopedIdTest.java | 0 .../core/{domain => }/model/time/LocalDateRangeTest.java | 0 .../core/{domain => }/model/time/TimePeriodTest.java | 0 15 files changed, 0 insertions(+), 0 deletions(-) rename core/model/src/main/java/org/opentripplanner/core/{domain/framework => model}/event/DomainEvent.java (100%) rename core/model/src/main/java/org/opentripplanner/core/{domain/framework => model}/event/EventHandler.java (100%) rename core/model/src/main/java/org/opentripplanner/core/{domain => }/model/i18n/LocalizedString.java (100%) rename core/model/src/main/java/org/opentripplanner/core/{domain/framework/transaction/api => model/transaction}/RepositoryHandle.java (100%) rename core/model/src/main/java/org/opentripplanner/core/{domain/framework/transaction/api => model/transaction}/RepositoryLifecycle.java (100%) rename core/model/src/main/java/org/opentripplanner/core/{domain/framework => model}/transaction/RepositoryRegistry.java (100%) rename core/model/src/main/java/org/opentripplanner/core/{domain/framework/transaction/api => model/transaction}/TransactionScope.java (100%) rename core/model/src/main/java/org/opentripplanner/core/{domain/framework => model}/transaction/UpdateManager.java (100%) rename core/model/src/main/java/org/opentripplanner/core/{domain/framework/transaction/api => model/transaction}/WriteContext.java (100%) rename core/model/src/test/java/org/opentripplanner/core/{domain => }/model/i18n/I18NStringTest.java (100%) rename core/model/src/test/java/org/opentripplanner/core/{domain => }/model/i18n/LocalizedStringTest.java (100%) rename core/model/src/test/java/org/opentripplanner/core/{domain => }/model/i18n/TranslatedStringTest.java (100%) rename core/model/src/test/java/org/opentripplanner/core/{domain => }/model/id/FeedScopedIdTest.java (100%) rename core/model/src/test/java/org/opentripplanner/core/{domain => }/model/time/LocalDateRangeTest.java (100%) rename core/model/src/test/java/org/opentripplanner/core/{domain => }/model/time/TimePeriodTest.java (100%) diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/framework/event/DomainEvent.java b/core/model/src/main/java/org/opentripplanner/core/model/event/DomainEvent.java similarity index 100% rename from core/model/src/main/java/org/opentripplanner/core/domain/framework/event/DomainEvent.java rename to core/model/src/main/java/org/opentripplanner/core/model/event/DomainEvent.java diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/framework/event/EventHandler.java b/core/model/src/main/java/org/opentripplanner/core/model/event/EventHandler.java similarity index 100% rename from core/model/src/main/java/org/opentripplanner/core/domain/framework/event/EventHandler.java rename to core/model/src/main/java/org/opentripplanner/core/model/event/EventHandler.java diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedString.java b/core/model/src/main/java/org/opentripplanner/core/model/i18n/LocalizedString.java similarity index 100% rename from core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedString.java rename to core/model/src/main/java/org/opentripplanner/core/model/i18n/LocalizedString.java diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryHandle.java b/core/model/src/main/java/org/opentripplanner/core/model/transaction/RepositoryHandle.java similarity index 100% rename from core/model/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryHandle.java rename to core/model/src/main/java/org/opentripplanner/core/model/transaction/RepositoryHandle.java diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryLifecycle.java b/core/model/src/main/java/org/opentripplanner/core/model/transaction/RepositoryLifecycle.java similarity index 100% rename from core/model/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/RepositoryLifecycle.java rename to core/model/src/main/java/org/opentripplanner/core/model/transaction/RepositoryLifecycle.java diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/framework/transaction/RepositoryRegistry.java b/core/model/src/main/java/org/opentripplanner/core/model/transaction/RepositoryRegistry.java similarity index 100% rename from core/model/src/main/java/org/opentripplanner/core/domain/framework/transaction/RepositoryRegistry.java rename to core/model/src/main/java/org/opentripplanner/core/model/transaction/RepositoryRegistry.java diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/TransactionScope.java b/core/model/src/main/java/org/opentripplanner/core/model/transaction/TransactionScope.java similarity index 100% rename from core/model/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/TransactionScope.java rename to core/model/src/main/java/org/opentripplanner/core/model/transaction/TransactionScope.java diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/framework/transaction/UpdateManager.java b/core/model/src/main/java/org/opentripplanner/core/model/transaction/UpdateManager.java similarity index 100% rename from core/model/src/main/java/org/opentripplanner/core/domain/framework/transaction/UpdateManager.java rename to core/model/src/main/java/org/opentripplanner/core/model/transaction/UpdateManager.java diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/WriteContext.java b/core/model/src/main/java/org/opentripplanner/core/model/transaction/WriteContext.java similarity index 100% rename from core/model/src/main/java/org/opentripplanner/core/domain/framework/transaction/api/WriteContext.java rename to core/model/src/main/java/org/opentripplanner/core/model/transaction/WriteContext.java diff --git a/core/model/src/test/java/org/opentripplanner/core/domain/model/i18n/I18NStringTest.java b/core/model/src/test/java/org/opentripplanner/core/model/i18n/I18NStringTest.java similarity index 100% rename from core/model/src/test/java/org/opentripplanner/core/domain/model/i18n/I18NStringTest.java rename to core/model/src/test/java/org/opentripplanner/core/model/i18n/I18NStringTest.java diff --git a/core/model/src/test/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringTest.java b/core/model/src/test/java/org/opentripplanner/core/model/i18n/LocalizedStringTest.java similarity index 100% rename from core/model/src/test/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringTest.java rename to core/model/src/test/java/org/opentripplanner/core/model/i18n/LocalizedStringTest.java diff --git a/core/model/src/test/java/org/opentripplanner/core/domain/model/i18n/TranslatedStringTest.java b/core/model/src/test/java/org/opentripplanner/core/model/i18n/TranslatedStringTest.java similarity index 100% rename from core/model/src/test/java/org/opentripplanner/core/domain/model/i18n/TranslatedStringTest.java rename to core/model/src/test/java/org/opentripplanner/core/model/i18n/TranslatedStringTest.java diff --git a/core/model/src/test/java/org/opentripplanner/core/domain/model/id/FeedScopedIdTest.java b/core/model/src/test/java/org/opentripplanner/core/model/id/FeedScopedIdTest.java similarity index 100% rename from core/model/src/test/java/org/opentripplanner/core/domain/model/id/FeedScopedIdTest.java rename to core/model/src/test/java/org/opentripplanner/core/model/id/FeedScopedIdTest.java diff --git a/core/model/src/test/java/org/opentripplanner/core/domain/model/time/LocalDateRangeTest.java b/core/model/src/test/java/org/opentripplanner/core/model/time/LocalDateRangeTest.java similarity index 100% rename from core/model/src/test/java/org/opentripplanner/core/domain/model/time/LocalDateRangeTest.java rename to core/model/src/test/java/org/opentripplanner/core/model/time/LocalDateRangeTest.java diff --git a/core/model/src/test/java/org/opentripplanner/core/domain/model/time/TimePeriodTest.java b/core/model/src/test/java/org/opentripplanner/core/model/time/TimePeriodTest.java similarity index 100% rename from core/model/src/test/java/org/opentripplanner/core/domain/model/time/TimePeriodTest.java rename to core/model/src/test/java/org/opentripplanner/core/model/time/TimePeriodTest.java From 8ad73ce6fcafc02646876866bfc0890bd0e75fd3 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 21 Sep 2026 17:48:15 +0200 Subject: [PATCH 45/68] refactor: Repackage core.domain to core.model (code) --- .../ext/carpooling/CarpoolTripTestData.java | 2 +- .../PassengerDelayConstraintsTest.java | 2 +- .../DefaultCarpoolingRepositoryTest.java | 2 +- .../model/CarpoolStopBuilderTest.java | 2 +- .../model/CarpoolTripBuilderTest.java | 2 +- .../routing/CarpoolAccessEgressTest.java | 2 +- ...arpoolingServiceCrossLegInsertionTest.java | 2 +- ...DefaultCarpoolingServiceTreeLimitTest.java | 2 +- .../MultiFeedSiriETCarpoolingUpdaterTest.java | 2 +- .../updater/SiriETCarpoolingUpdaterTest.java | 2 +- .../ext/edgenaming/CrosswalkNamerTest.java | 2 +- .../ext/edgenaming/SidewalkNamerTest.java | 2 +- .../ext/emission/EmissionTestData.java | 2 +- .../csvdata/EmissionDataReaderTest.java | 2 +- .../csvdata/route/RouteDataReaderTest.java | 2 +- .../csvdata/trip/EmissionAggregatorTest.java | 2 +- .../csvdata/trip/TripHopMapperTest.java | 2 +- .../EmissionItineraryDecoratorTest.java | 2 +- .../EmpiricalDelayRepositoryTest.java | 2 +- .../EmpiricalDelayServiceTest.java | 2 +- .../EmpiricalDelayTestData.java | 2 +- .../EmpiricalDelayCsvDataReaderTest.java | 2 +- .../delay/TripTimeDelayCsvParserTest.java | 2 +- .../graphbuilder/TripDelaysMapperTest.java | 2 +- .../internal/model/DelayAtStopDtoTest.java | 2 +- .../model/EmpiricalDelaySummaryTest.java | 2 +- .../internal/model/TripDelaysDtoTest.java | 2 +- .../empiricaldelay/model/TripDelaysTest.java | 2 +- .../ext/fares/FareRuleSetTest.java | 2 +- .../ext/fares/model/FareProductTest.java | 2 +- .../v1/custom/AtlantaFareServiceTest.java | 4 +- .../gtfs/v1/custom/HSLFareServiceTest.java | 4 +- ...reInFreeTransferWindowFareServiceTest.java | 4 +- .../gtfs/v1/custom/OrcaFareServiceTest.java | 6 +- .../ext/fares/service/gtfs/v2/AreasTest.java | 2 +- .../gtfs/v2/CostedTransferInNetworkTest.java | 2 +- .../v2/DepartureToArrivalTimeLimitTest.java | 2 +- .../v2/DepartureToDepartureTimeLimitTest.java | 2 +- .../fares/service/gtfs/v2/FlexLegTest.java | 2 +- .../gtfs/v2/FreeTransferInNetworkTest.java | 2 +- .../gtfs/v2/FreeTransferTimeLimitTest.java | 2 +- .../gtfs/v2/GtfsFaresV2ServiceTest.java | 2 +- .../gtfs/v2/OnlyFromTimeframeMatcherTest.java | 2 +- .../gtfs/v2/SameGroupIdPriorityTest.java | 2 +- .../fares/service/gtfs/v2/StopCountTest.java | 2 +- .../service/gtfs/v2/TimeframeMatcherTest.java | 2 +- .../v2/custom/OregonHopFareFactoryTest.java | 2 +- .../flex/AreaStopsToVerticesMapperTest.java | 2 +- .../ext/flex/FlexIndexTest.java | 2 +- .../ext/flex/FlexIntegrationTest.java | 4 +- .../ext/flex/FlexIntegrationTestData.java | 2 +- .../ext/flex/FlexRouterTest.java | 2 +- .../ext/flex/FlexibleTransitLegTest.java | 2 +- .../ext/flex/GtfsFlexTest.java | 2 +- .../ext/flex/filter/FilterMapperTest.java | 2 +- .../ext/flex/template/ClosestTripTest.java | 2 +- .../template/FlexTemplateFactoryTest.java | 2 +- .../ScheduledDeviatedTripIntegrationTest.java | 2 +- .../ext/geocoder/LuceneIndexTest.java | 2 +- .../ext/geocoder/StopClusterMapperTest.java | 2 +- .../ojp/service/CallAtStopServiceTest.java | 2 +- .../service/StopEventParamsMapperTest.java | 2 +- .../StopConsolidationParserTest.java | 2 +- .../TestStopConsolidationModel.java | 2 +- .../model/ConsolidatedStopLegBuilderTest.java | 2 +- .../areastops/AreaStopsLayerBuilderTest.java | 4 +- .../DigitransitStationPropertyMapperTest.java | 2 +- .../layers/stops/RealtimeStopsLayerTest.java | 4 +- .../layers/stops/StopsLayerTest.java | 6 +- .../VehicleParkingGroupsLayerTest.java | 6 +- .../VehicleParkingsLayerTest.java | 4 +- ...ransitRentalVehiclePropertyMapperTest.java | 6 +- ...ehicleRentalStationPropertyMapperTest.java | 6 +- .../bikely/BikelyUpdaterTest.java | 2 +- .../DecorateWithAccessibilityScore.java | 2 +- .../ext/carpooling/CarpoolingRepository.java | 2 +- .../internal/CarpoolItineraryMapper.java | 8 +- .../internal/DefaultCarpoolingRepository.java | 2 +- .../ext/carpooling/model/CarpoolLeg.java | 4 +- .../ext/carpooling/model/CarpoolStop.java | 2 +- .../carpooling/model/CarpoolStopBuilder.java | 2 +- .../carpooling/model/CarpoolTripBuilder.java | 2 +- .../service/DefaultCarpoolingService.java | 2 +- .../carpooling/updater/CarpoolSiriMapper.java | 2 +- .../updater/SiriETCarpoolingUpdater.java | 2 +- .../ext/edgenaming/CrosswalkNamer.java | 4 +- .../ext/edgenaming/PortlandCustomNamer.java | 4 +- .../edgenaming/SidewalkCrosswalkNamer.java | 2 +- .../ext/edgenaming/SidewalkNamer.java | 2 +- .../ext/emission/EmissionRepository.java | 2 +- .../internal/DefaultEmissionRepository.java | 2 +- .../csvdata/route/RouteDataReader.java | 2 +- .../csvdata/trip/EmissionAggregator.java | 2 +- .../internal/csvdata/trip/TripHopMapper.java | 2 +- .../graphbuilder/EmissionGraphBuilder.java | 2 +- .../EmpiricalDelayRepository.java | 2 +- .../empiricaldelay/EmpiricalDelayService.java | 2 +- .../EmpiricalDelayGraphBuilderModule.java | 2 +- .../DefaultEmpiricalDelayRepository.java | 2 +- .../DefaultEmpiricalDelayService.java | 2 +- .../csvinput/EmpiricalDelayCsvDataReader.java | 2 +- .../delay/TripTimeDelayCsvParser.java | 2 +- .../csvinput/delay/TripTimeDelayRow.java | 2 +- .../EmpiricalDelayGraphBuilder.java | 4 +- .../graphbuilder/TripDelaysMapper.java | 4 +- .../internal/model/DelayAtStopDto.java | 2 +- .../internal/model/EmpiricalDelaySummary.java | 2 +- .../internal/model/TripDelaysAgregator.java | 2 +- .../ext/empiricaldelay/model/TripDelays.java | 2 +- .../ext/fares/model/FareAttribute.java | 2 +- .../ext/fares/model/FareAttributeBuilder.java | 2 +- .../ext/fares/model/FareLegRule.java | 2 +- .../ext/fares/model/FareLegRuleBuilder.java | 2 +- .../ext/fares/model/FareRuleSet.java | 2 +- .../ext/fares/model/FareRulesData.java | 2 +- .../ext/fares/model/FareTransferRule.java | 2 +- .../fares/model/FareTransferRuleBuilder.java | 2 +- .../ext/fares/model/Timeframe.java | 2 +- .../ext/fares/model/TimeframeBuilder.java | 2 +- .../service/gtfs/v1/DefaultFareService.java | 2 +- .../ext/fares/service/gtfs/v1/FareAndId.java | 2 +- .../gtfs/v1/GtfsFareServiceFactory.java | 2 +- .../gtfs/v1/custom/AtlantaFareService.java | 2 +- .../v1/custom/AtlantaFareServiceFactory.java | 2 +- .../gtfs/v1/custom/HSLFareServiceFactory.java | 2 +- ...stFareInFreeTransferWindowFareService.java | 2 +- ...nFreeTransferWindowFareServiceFactory.java | 2 +- .../gtfs/v1/custom/OrcaFareFactory.java | 2 +- .../gtfs/v1/custom/OrcaFareService.java | 4 +- .../fares/service/gtfs/v2/AreaMatcher.java | 2 +- .../service/gtfs/v2/FareLookupService.java | 2 +- .../service/gtfs/v2/GtfsFaresV2Service.java | 2 +- .../gtfs/v2/GtfsFaresV2ServiceBuilder.java | 2 +- .../fares/service/gtfs/v2/NetworkMatcher.java | 2 +- .../service/gtfs/v2/TimeframeMatcher.java | 2 +- .../gtfs/v2/custom/OregonHopFareFactory.java | 2 +- .../ext/flex/AreaStopsToVerticesMapper.java | 2 +- .../opentripplanner/ext/flex/FlexIndex.java | 2 +- .../opentripplanner/ext/flex/FlexRouter.java | 2 +- .../ext/flex/FlexibleTransitLeg.java | 4 +- .../ext/flex/edgetype/FlexTripEdge.java | 4 +- .../ext/flex/filter/FilterMapper.java | 2 +- .../flex/template/AbstractFlexTemplate.java | 2 +- .../FlexAccessEgressCallbackAdapter.java | 2 +- .../ext/flex/template/FlexAccessTemplate.java | 2 +- .../flex/template/FlexDirectPathFactory.java | 2 +- .../ext/flex/template/FlexEgressTemplate.java | 2 +- .../ext/flex/trip/FlexTrip.java | 2 +- .../ext/flex/trip/FlexTripBuilder.java | 2 +- .../ext/flex/trip/ScheduledDeviatedTrip.java | 2 +- .../trip/ScheduledDeviatedTripBuilder.java | 2 +- .../ext/flex/trip/UnscheduledTrip.java | 2 +- .../ext/flex/trip/UnscheduledTripBuilder.java | 2 +- .../ext/geocoder/LuceneIndex.java | 4 +- .../ext/geocoder/LuceneStopCluster.java | 2 +- .../ext/geocoder/StopCluster.java | 2 +- .../ext/geocoder/StopClusterMapper.java | 4 +- .../ext/ojp/mapping/FilterMapper.java | 2 +- .../ojp/mapping/StopEventParamsMapper.java | 2 +- .../ext/ojp/mapping/TextMapper.java | 2 +- .../ext/ojp/service/CallAtStopService.java | 2 +- .../ext/ojp/service/OjpService.java | 2 +- .../parkAndRideApi/ParkAndRideResource.java | 2 +- .../ext/reportapi/model/TransfersReport.java | 2 +- .../SorlandsbanenNorwayService.java | 2 +- .../StopConsolidationParser.java | 2 +- .../StopConsolidationService.java | 2 +- .../DefaultStopConsolidationService.java | 2 +- .../model/ConsolidatedStopGroup.java | 2 +- .../model/StopReplacement.java | 2 +- .../DirectTransferAnalyzer.java | 2 +- .../ext/vectortiles/layers/LayerFilters.java | 2 +- .../areastops/AreaStopPropertyMapper.java | 2 +- .../DigitransitStationPropertyMapper.java | 4 +- ...DigitransitRealtimeStopPropertyMapper.java | 2 +- .../stops/DigitransitStopPropertyMapper.java | 2 +- ...nsitVehicleParkingGroupPropertyMapper.java | 2 +- ...gitransitVehicleParkingPropertyMapper.java | 2 +- ...StadtnaviVehicleParkingPropertyMapper.java | 2 +- ...imeVehicleRentalStationPropertyMapper.java | 2 +- ...igitransitVehicleRentalPropertyMapper.java | 2 +- ...sitVehicleRentalStationPropertyMapper.java | 2 +- .../vehicleparking/bikeep/BikeepUpdater.java | 4 +- .../vehicleparking/bikely/BikelyUpdater.java | 6 +- .../liipi/LiipiFacilitiesDownloader.java | 2 +- .../LiipiHubToVehicleParkingGroupMapper.java | 8 +- .../liipi/LiipiHubsDownloader.java | 2 +- .../vehicleparking/liipi/LiipiParkPatch.java | 2 +- .../LiipiParkToVehicleParkingMapper.java | 8 +- .../liipi/LiipiParkUpdater.java | 2 +- .../parkapi/ParkAPIUpdater.java | 8 +- .../sirifm/SiriFmDataSource.java | 2 +- .../api/common/LocationStringParser.java | 2 +- .../opentripplanner/api/common/Message.java | 2 +- .../model/transit/DefaultFeedIdMapper.java | 2 +- .../api/model/transit/FeedScopedIdMapper.java | 2 +- .../api/model/transit/HideFeedIdMapper.java | 2 +- .../apis/gtfs/GraphQLScalars.java | 2 +- .../apis/gtfs/GraphQLUtils.java | 4 +- .../apis/gtfs/datafetchers/AlertImpl.java | 6 +- .../apis/gtfs/datafetchers/QueryTypeImpl.java | 2 +- .../apis/gtfs/datafetchers/StopImpl.java | 4 +- .../apis/gtfs/datafetchers/TripImpl.java | 2 +- .../datafetchers/TripOnServiceDateImpl.java | 2 +- .../apis/gtfs/generated/GraphQLTypes.java | 101 +++++++----------- .../mapping/AlertsConnectionFilterMapper.java | 2 +- .../mapping/CanceledTripsFilterMapper.java | 4 +- .../LegacyRouteRequestMapper.java | 2 +- .../routerequest/RouteRequestMapper.java | 2 +- .../routerequest/SelectRequestMapper.java | 2 +- .../TransitPreferencesMapper.java | 2 +- .../routerequest/ViaLocationMapper.java | 2 +- .../apis/gtfs/model/OffsetDateTimeRange.java | 2 +- .../apis/gtfs/service/ApiTransitService.java | 6 +- .../filter/PatternByDateFilterUtil.java | 2 +- .../gtfs/support/time/LocalDateRangeUtil.java | 2 +- .../support/time/OffsetDateTimeRangeUtil.java | 2 +- .../injectdoc/ApiDocumentationProfile.java | 2 +- .../TransmodelGraphQLSchemaFactory.java | 2 +- .../mapping/GenericLocationMapper.java | 2 +- .../mapping/TransitFilterOldWayMapper.java | 2 +- .../mapping/TripViaLocationMapper.java | 2 +- .../apis/transmodel/model/EnumTypes.java | 4 +- .../model/plan/JourneyWhiteListed.java | 2 +- .../transmodel/model/plan/RelaxCostType.java | 2 +- .../model/siri/et/EstimatedCallType.java | 4 +- .../transmodel/model/siri/sx/AffectsType.java | 2 +- .../model/siri/sx/PtSituationElementType.java | 4 +- .../model/stop/MonoOrMultiModalStation.java | 6 +- .../apis/transmodel/model/stop/QuayType.java | 2 +- .../transmodel/model/stop/StopPlaceType.java | 2 +- .../timetable/DatedServiceJourneyQuery.java | 2 +- .../framework/graphql/GraphQLUtils.java | 2 +- .../graphql/scalar/CostScalarFactory.java | 2 +- .../framework/model/TimeAndCost.java | 2 +- .../configure/TransactionModule.java | 4 +- .../gbfs/GbfsGeofencingZoneMapper.java | 4 +- .../gbfs/network/GeofencingZoneOtpPhase.java | 2 +- .../gbfs/v2/GbfsFreeVehicleStatusMapper.java | 8 +- .../gbfs/v2/GbfsGeofencingZoneMapper.java | 4 +- .../gbfs/v2/GbfsStationInformationMapper.java | 4 +- .../gbfs/v2/GbfsSystemInformationMapper.java | 4 +- .../gbfs/v2/GbfsVehicleTypeMapper.java | 4 +- .../gbfs/v3/GbfsFeedMapper.java | 4 +- .../gbfs/v3/GbfsGeofencingZoneMapper.java | 2 +- .../gbfs/v3/GbfsStationInformationMapper.java | 2 +- .../gbfs/v3/GbfsVehicleStatusMapper.java | 8 +- .../gbfs/v3/GbfsVehicleTypeMapper.java | 2 +- .../graph_builder/GraphBuilder.java | 2 +- .../configure/GraphBuilderModule.java | 2 +- .../issues/BogusShapeGeometry.java | 2 +- .../issues/BogusShapeGeometryCaught.java | 2 +- .../issues/ShapeGeometryTooFar.java | 2 +- .../module/AddTransitEntitiesToGraph.java | 4 +- .../module/AddTransitEntitiesToTimetable.java | 2 +- .../module/OsmBoardingLocationsModule.java | 4 +- .../RouteToCentroidStationIdsValidator.java | 2 +- .../TransitWithFutureDateValidator.java | 2 +- .../graph_builder/module/cache/CacheTask.java | 2 +- .../module/configure/GraphBuilderModules.java | 2 +- .../module/geometry/GeometryProcessor.java | 2 +- .../module/geometry/ShapeSegmentKey.java | 2 +- .../module/osm/BarrierEdgeBuilder.java | 2 +- .../graph_builder/module/osm/EdgeNamer.java | 2 +- .../module/osm/ElevatorProcessor.java | 2 +- .../graph_builder/module/osm/OsmModule.java | 2 +- .../module/osm/ParkingProcessor.java | 8 +- .../osm/internal/naming/DefaultNamer.java | 2 +- .../walkablearea/WalkableAreaBuilder.java | 2 +- .../module/osm/storage/VertexGenerator.java | 4 +- .../gtfs/GenerateTripPatternsOperation.java | 4 +- .../gtfs/graphbuilder/GtfsModule.java | 6 +- .../gtfs/interlining/InterlineProcessor.java | 2 +- .../gtfs/mapping/BoardingAreaMapper.java | 2 +- .../gtfs/mapping/DirectionMapper.java | 2 +- .../gtfs/mapping/EntranceMapper.java | 2 +- .../gtfs/mapping/FareAttributeMapper.java | 2 +- .../gtfs/mapping/FareLegRuleMapper.java | 2 +- .../gtfs/mapping/FareProductMapper.java | 2 +- .../gtfs/mapping/FareTransferRuleMapper.java | 2 +- .../GTFSToTransitDataImportMapper.java | 2 +- .../gtfs/mapping/IdFactory.java | 2 +- .../gtfs/mapping/LocationGroupMapper.java | 4 +- .../gtfs/mapping/LocationMapper.java | 2 +- .../gtfs/mapping/NoticeAssignmentMapper.java | 2 +- .../gtfs/mapping/NoticeMapper.java | 2 +- .../gtfs/mapping/PathwayNodeMapper.java | 2 +- .../gtfs/mapping/RouteMapper.java | 4 +- .../mapping/RouteNetworkAssignmentMapper.java | 2 +- .../gtfs/mapping/ServiceDateMapper.java | 2 +- .../gtfs/mapping/ShapePointMapper.java | 2 +- .../gtfs/mapping/StopAreaMapper.java | 2 +- .../gtfs/mapping/StopMapper.java | 2 +- .../gtfs/mapping/StopMappingWrapper.java | 4 +- .../gtfs/mapping/StopTimeMapper.java | 2 +- .../gtfs/mapping/TimeframeMapper.java | 2 +- .../gtfs/mapping/TranslationHelper.java | 6 +- .../gtfs/mapping/TripMapper.java | 2 +- .../gtfs/mapping/TripSegmentMapper.java | 2 +- .../WheelchairAccessibilityMapper.java | 2 +- .../inspector/vector/KeyValue.java | 4 +- .../stop/StopLocationPropertyMapper.java | 2 +- .../model/GenericLocation.java | 2 +- .../org/opentripplanner/model/StopTime.java | 2 +- .../model/TransitDataImport.java | 2 +- .../opentripplanner/model/TripTimeOnDate.java | 2 +- .../model/calendar/CalendarService.java | 2 +- .../model/calendar/CalendarServiceData.java | 2 +- .../model/calendar/ServiceCalendar.java | 4 +- .../model/calendar/ServiceCalendarDate.java | 2 +- .../impl/CalendarServiceDataFactoryImpl.java | 2 +- .../calendar/impl/CalendarServiceImpl.java | 2 +- ...ultipleCalendarsForServiceIdException.java | 2 +- .../model/fare/FareMedium.java | 2 +- .../model/fare/FareProduct.java | 2 +- .../model/fare/FareProductBuilder.java | 2 +- .../model/fare/RiderCategory.java | 2 +- .../model/fare/RiderCategoryBuilder.java | 2 +- .../model/impl/DefaultTransitDataImport.java | 2 +- .../model/impl/TransitDataImportBuilder.java | 4 +- .../opentripplanner/model/plan/Itinerary.java | 2 +- .../model/plan/ItineraryBuilder.java | 2 +- .../model/plan/ItinerarySortKey.java | 2 +- .../org/opentripplanner/model/plan/Leg.java | 4 +- .../org/opentripplanner/model/plan/Place.java | 6 +- .../model/plan/leg/ScheduledTransitLeg.java | 6 +- .../legreference/LegReferenceSerializer.java | 2 +- .../ScheduledTransitLegReference.java | 2 +- .../paging/cursor/DeduplicationPageCut.java | 2 +- .../model/plan/paging/cursor/PageCursor.java | 2 +- .../plan/paging/cursor/PageCursorFactory.java | 2 +- .../plan/paging/cursor/PageCursorInput.java | 2 +- .../paging/cursor/PageCursorSerializer.java | 2 +- .../model/plan/walkstep/WalkStep.java | 2 +- .../model/plan/walkstep/WalkStepBuilder.java | 2 +- .../opentripplanner/netex/NetexBundle.java | 4 +- .../opentripplanner/netex/NetexModule.java | 4 +- .../netex/configure/NetexConfigure.java | 2 +- .../netex/mapping/FlexStopsMapper.java | 2 +- .../netex/mapping/GroupOfStationsMapper.java | 6 +- .../netex/mapping/HeadsignMapper.java | 2 +- .../mapping/MultiModalStationMapper.java | 2 +- .../netex/mapping/NetexMapper.java | 4 +- .../netex/mapping/NoticeAssignmentMapper.java | 2 +- .../netex/mapping/NoticeMapper.java | 2 +- .../netex/mapping/QuayMapper.java | 6 +- .../netex/mapping/RouteMapper.java | 4 +- .../netex/mapping/StationMapper.java | 8 +- .../netex/mapping/StopAndStationMapper.java | 4 +- .../netex/mapping/StopTimesMapper.java | 2 +- .../netex/mapping/TariffZoneMapper.java | 2 +- .../netex/mapping/TransferMapper.java | 2 +- .../netex/mapping/TripCalendarBuilder.java | 2 +- .../netex/mapping/TripMapper.java | 6 +- .../netex/mapping/TripPatternMapper.java | 4 +- .../netex/mapping/VehicleParkingMapper.java | 2 +- .../netex/mapping/WheelChairMapper.java | 2 +- .../calendar/CalendarServiceBuilder.java | 4 +- .../mapping/support/FeedScopedIdFactory.java | 2 +- .../opentripplanner/osm/model/OsmEntity.java | 8 +- .../osm/wayproperty/CreativeNamer.java | 2 +- .../wayproperty/LocalizedStringMapper.java | 8 +- .../osm/wayproperty/WayPropertySet.java | 2 +- .../place/NearbyPlaceFinder.java | 2 +- .../opentripplanner/place/api/NearbyStop.java | 2 +- .../place/api/PatternAtStop.java | 2 +- .../CompositeNearbyStopFilter.java | 2 +- .../FlexTripNearbyStopFilter.java | 2 +- .../nearbystopfinder/NearbyStopFilter.java | 2 +- .../NearbyStopFinderVisitor.java | 2 +- .../PatternNearbyStopFilter.java | 2 +- .../PlaceFinderTraverseVisitor.java | 2 +- .../placefinder/StreetNearbyPlaceFinder.java | 2 +- .../routing/alertpatch/AlertCalendar.java | 2 +- .../routing/alertpatch/EntityKey.java | 2 +- .../routing/alertpatch/EntitySelector.java | 2 +- .../routing/alertpatch/TransitAlert.java | 6 +- .../alertpatch/TransitAlertBuilder.java | 4 +- .../ItineraryListFilterChainBuilder.java | 2 +- ...nsitItinerariesBasedOnGeneralizedCost.java | 2 +- .../RemoveTransitIfStreetOnlyIsBetter.java | 2 +- ...moveTransitIfStreetOnlyIsBetterResult.java | 2 +- .../transit/TransitGeneralizedCostFilter.java | 2 +- ...veOtherThanSameLegsMaxGeneralizedCost.java | 2 +- .../groupids/GroupByAllSameStations.java | 2 +- .../groupids/GroupBySameFirstOrLastTrip.java | 2 +- .../groupids/GroupBySameRoutesAndStops.java | 2 +- .../paging/DefaultPageCursorInput.java | 2 +- .../algorithm/mapping/AlertToLegMapper.java | 4 +- .../mapping/LegsToItineraryMapper.java | 2 +- .../mapping/RaptorPathToItineraryMapper.java | 4 +- .../mapping/StatesToWalkStepsMapper.java | 4 +- .../mapping/StreetPathToLegsMapper.java | 2 +- .../algorithm/mapping/TripPlanMapper.java | 2 +- .../raptoradapter/router/TransitRouter.java | 2 +- .../TripAndServiceDateResolver.java | 2 +- .../TripLocationResolver.java | 2 +- .../transit/cost/DefaultTripSchedule.java | 2 +- .../cost/RaptorCostLinearFunction.java | 2 +- .../cost/WheelchairCostCalculator.java | 2 +- .../FrequencyBoardOrAlightEvent.java | 2 +- .../GeneralizedCostParametersMapper.java | 2 +- .../mappers/LookupStopIndexCallback.java | 2 +- .../transit/mappers/RaptorRequestMapper.java | 2 +- .../mappers/TimetableUpdateMapper.java | 2 +- .../DefaultTransitDataProviderFilter.java | 4 +- ...faultTransitDataProviderFilterBuilder.java | 2 +- .../transit/request/TripPatternForDates.java | 2 +- .../request/TripScheduleWithOffset.java | 2 +- .../routing/api/request/TripLocation.java | 2 +- .../api/request/TripOnDateReference.java | 2 +- .../TripOnDateReferenceWithTripAndDate.java | 2 +- ...nDateReferenceWithTripOnServiceDateId.java | 2 +- .../request/framework/CostLinearFunction.java | 2 +- .../LinearFunctionSerialization.java | 2 +- .../request/framework/TimeAndCostPenalty.java | 2 +- .../preference/AccessibilityPreferences.java | 2 +- .../request/preference/BikePreferences.java | 2 +- .../request/preference/CarPreferences.java | 2 +- .../preference/DirectTransitPreferences.java | 2 +- .../preference/ElevatorPreferences.java | 2 +- .../ItineraryFilterDebugProfile.java | 2 +- .../preference/TransferPreferences.java | 2 +- .../preference/TransitPreferences.java | 2 +- .../preference/VehicleParkingPreferences.java | 2 +- .../preference/VehicleRentalPreferences.java | 2 +- .../preference/VehicleWalkingPreferences.java | 2 +- .../request/preference/WalkPreferences.java | 2 +- .../api/request/request/TransitRequest.java | 2 +- .../request/TransitRequestBuilder.java | 2 +- .../request/request/filter/SelectRequest.java | 2 +- .../request/filter/TransitGroupSelect.java | 2 +- .../api/request/via/AbstractViaLocation.java | 2 +- .../request/via/PassThroughViaLocation.java | 2 +- .../routing/api/request/via/ViaLocation.java | 2 +- .../api/request/via/VisitViaLocation.java | 2 +- .../DelegatingTransitAlertServiceImpl.java | 2 +- .../routing/impl/TransitAlertServiceImpl.java | 2 +- .../linking/LinkingContextFactory.java | 2 +- .../internal/VertexCreationService.java | 6 +- .../refetch/RefetchItineraryService.java | 2 +- .../routing/services/TransitAlertService.java | 2 +- .../service/osminfo/model/Platform.java | 2 +- .../RealtimeVehicleRepository.java | 2 +- .../RealtimeVehicleRepositoryModule.java | 4 +- .../RealtimeVehicleRepositoryLifecycle.java | 2 +- .../model/RealtimeVehicle.java | 2 +- .../model/RealtimeVehicleBuilder.java | 2 +- .../standalone/api/HttpRequestScoped.java | 2 +- .../standalone/config/BuildConfig.java | 4 +- .../configure/DeduplicatorServiceModule.java | 2 +- .../config/configure/LoadConfigModule.java | 4 +- .../config/framework/json/EnumMapper.java | 2 +- .../framework/json/ParameterBuilder.java | 2 +- .../configure/ConstructApplication.java | 4 +- .../ConstructApplicationFactory.java | 6 +- .../configure/RequestScopedFactory.java | 2 +- .../configure/RequestScopedModule.java | 6 +- .../standalone/server/MetricsLogging.java | 2 +- .../streetadapter/VertexFactory.java | 4 +- .../model/ConstrainedTransfer.java | 2 +- .../transit/EntranceResolver.java | 2 +- .../opentripplanner/transit/SiteResolver.java | 2 +- .../opentripplanner/transit/StopResolver.java | 2 +- .../transit/api/model/FilterValues.java | 2 +- .../api/request/TripOnServiceDateRequest.java | 6 +- .../TripOnServiceDateRequestBuilder.java | 6 +- .../transit/api/request/TripRequest.java | 2 +- .../api/request/TripRequestBuilder.java | 2 +- .../api/request/TripTimeOnDateRequest.java | 6 +- .../request/TripTimeOnDateRequestBuilder.java | 6 +- .../transit/configure/TransitModule.java | 4 +- .../transit/model/basic/LocalizedMoney.java | 2 +- .../transit/model/basic/Notice.java | 2 +- .../transit/model/basic/NoticeBuilder.java | 2 +- .../transit/model/basic/TransitMode.java | 2 +- .../transit/model/calendar/TripCalendars.java | 2 +- .../transit/TransitAlertMatcherFactory.java | 2 +- .../transit/TransitAlertSelectRequest.java | 2 +- .../filter/transit/TripMatcherFactory.java | 2 +- .../TripOnServiceDateMatcherFactory.java | 6 +- .../TripOnServiceDateSelectRequest.java | 6 +- .../transit/TripTimeOnDateMatcherFactory.java | 4 +- .../transit/TripTimeOnDateSelectRequest.java | 2 +- .../framework/AbstractEntityBuilder.java | 2 +- .../framework/AbstractTransitEntity.java | 2 +- .../transit/model/framework/Deduplicator.java | 2 +- .../model/framework/DefaultEntityById.java | 2 +- .../transit/model/framework/EntityById.java | 2 +- .../framework/EntityNotFoundException.java | 2 +- .../model/framework/ImmutableEntityById.java | 2 +- .../model/framework/TransitEntity.java | 2 +- .../transit/model/network/GroupOfRoutes.java | 2 +- .../model/network/GroupOfRoutesBuilder.java | 2 +- .../transit/model/network/Route.java | 4 +- .../transit/model/network/RouteBuilder.java | 4 +- .../transit/model/network/StopPattern.java | 2 +- .../transit/model/network/TripPattern.java | 6 +- .../model/network/TripPatternBuilder.java | 2 +- .../network/grouppriority/EntityAdapter.java | 2 +- .../model/network/grouppriority/Matchers.java | 2 +- .../TransitGroupPriorityService.java | 2 +- .../network/grouppriority/TripAdapter.java | 2 +- .../grouppriority/TripPatternAdapter.java | 2 +- .../transit/model/organization/Agency.java | 2 +- .../model/organization/AgencyBuilder.java | 2 +- .../transit/model/organization/Branding.java | 2 +- .../model/organization/BrandingBuilder.java | 2 +- .../transit/model/organization/Operator.java | 2 +- .../model/organization/OperatorBuilder.java | 2 +- .../transit/model/site/AreaStop.java | 6 +- .../transit/model/site/AreaStopBuilder.java | 4 +- .../transit/model/site/BoardingArea.java | 2 +- .../model/site/BoardingAreaBuilder.java | 2 +- .../transit/model/site/Entrance.java | 2 +- .../transit/model/site/EntranceBuilder.java | 2 +- .../transit/model/site/FareZone.java | 2 +- .../transit/model/site/FareZoneBuilder.java | 2 +- .../transit/model/site/GroupOfStations.java | 4 +- .../model/site/GroupOfStationsBuilder.java | 4 +- .../transit/model/site/GroupStop.java | 4 +- .../transit/model/site/GroupStopBuilder.java | 4 +- .../transit/model/site/MultiModalStation.java | 4 +- .../model/site/MultiModalStationBuilder.java | 4 +- .../transit/model/site/Pathway.java | 2 +- .../transit/model/site/PathwayBuilder.java | 2 +- .../transit/model/site/PathwayNode.java | 2 +- .../model/site/PathwayNodeBuilder.java | 2 +- .../transit/model/site/RegularStop.java | 4 +- .../model/site/RegularStopBuilder.java | 4 +- .../transit/model/site/Station.java | 4 +- .../transit/model/site/StationBuilder.java | 4 +- .../transit/model/site/StationElement.java | 6 +- .../model/site/StationElementBuilder.java | 6 +- .../transit/model/site/StopLocation.java | 6 +- .../model/site/StopLocationsGroup.java | 4 +- .../model/timetable/OccupancyStatus.java | 2 +- .../model/timetable/RealTimeTripTimes.java | 6 +- .../timetable/RealTimeTripTimesBuilder.java | 6 +- .../model/timetable/ScheduledTripTimes.java | 8 +- .../timetable/ScheduledTripTimesBuilder.java | 4 +- .../transit/model/timetable/StopTimeKey.java | 2 +- .../model/timetable/StopTimeKeyBuilder.java | 2 +- .../StopTimeToScheduledTripTimesMapper.java | 4 +- .../transit/model/timetable/Timetable.java | 2 +- .../model/timetable/TimetableBuilder.java | 2 +- .../transit/model/timetable/Trip.java | 6 +- .../transit/model/timetable/TripBuilder.java | 6 +- .../model/timetable/TripIdAndServiceDate.java | 2 +- .../model/timetable/TripOnServiceDate.java | 2 +- .../timetable/TripOnServiceDateBuilder.java | 2 +- .../transit/model/timetable/TripTimes.java | 8 +- .../model/timetable/TripTimesFactory.java | 2 +- .../DefaultTimetableRepository.java | 2 +- .../repository/TimetableRepository.java | 4 +- .../TimetableRepositoryLifecycle.java | 2 +- .../TimetableRepositorySnapshot.java | 2 +- .../service/DefaultTransitService.java | 4 +- .../service/PatternByServiceDatesFilter.java | 2 +- .../transit/service/SiteRepository.java | 2 +- .../service/SiteRepositoryBuilder.java | 2 +- .../transit/service/TransitRepository.java | 2 +- .../service/TransitRepositoryIndex.java | 2 +- .../transit/service/TransitService.java | 2 +- .../service/TransitServiceResolver.java | 2 +- .../updater/GraphUpdaterManager.java | 2 +- .../updater/GraphWriterService.java | 6 +- .../alert/gtfs/AlertsUpdateHandler.java | 8 +- .../alert/siri/SiriAlertsUpdateHandler.java | 10 +- .../alert/siri/mapping/AffectsMapper.java | 2 +- .../configure/UpdaterConfigurator.java | 6 +- .../updater/spi/UpdateError.java | 2 +- .../updater/spi/UpdateException.java | 2 +- .../trip/gtfs/CanceledTripHandler.java | 2 +- .../trip/gtfs/DuplicatedTripHandler.java | 4 +- .../gtfs/GtfsRealTimeTripUpdateAdapter.java | 2 +- .../gtfs/GtfsRealtimeFuzzyTripMatcher.java | 2 +- .../updater/trip/gtfs/NewTripHandler.java | 2 +- .../updater/trip/gtfs/RouteFactory.java | 6 +- .../trip/gtfs/ScheduledTripHandler.java | 2 +- .../updater/trip/gtfs/StopPositionMapper.java | 2 +- .../updater/trip/gtfs/TripTimesUpdater.java | 2 +- .../BackwardsDelayPropagationType.java | 2 +- .../ForwardsDelayPropagationType.java | 2 +- .../trip/gtfs/model/GtfsRealtimeMapper.java | 2 +- .../trip/gtfs/model/StopTimeUpdate.java | 2 +- .../updater/trip/gtfs/model/TripUpdate.java | 6 +- .../patterncache/TripPatternIdGenerator.java | 2 +- .../updater/trip/siri/AddedTripBuilder.java | 6 +- .../updater/trip/siri/EntityResolver.java | 2 +- .../trip/siri/ExtraCallTripBuilder.java | 4 +- .../trip/siri/ModifiedTripBuilder.java | 2 +- .../trip/siri/SiriFuzzyTripMatcher.java | 2 +- .../siri/SiriRealTimeTripUpdateAdapter.java | 2 +- .../trip/siri/SiriRealTimeUpdateHandler.java | 2 +- .../updater/trip/siri/StopTimesMapper.java | 2 +- .../updater/trip/siri/TimetableHelper.java | 2 +- .../vehicle_parking/AvailabiltyUpdate.java | 2 +- .../VehicleParkingAvailabilityUpdater.java | 2 +- .../VehicleParkingUpdater.java | 2 +- .../RealtimeVehiclePatternMatcher.java | 2 +- .../vehicle_rental/VehicleRentalUpdater.java | 2 +- .../datasources/params/RentalPickupType.java | 2 +- .../opentripplanner/warmup/api/WarmupApi.java | 2 +- .../model/id/FeedScopedIdForTestFactory.java | 2 - .../ext/fares/model/FareModelForTest.java | 4 +- .../ext/fares/model/FareTestConstants.java | 2 +- .../module/islandpruning/TestNamer.java | 4 +- .../graphbuilder/GtfsModuleTestFactory.java | 2 +- .../model/plan/TestItinerary.java | 2 +- .../model/plan/TestTransitLegBuilder.java | 2 +- .../model/RentalVehicleTypeFactory.java | 4 +- .../standalone/api/TestServerContext.java | 4 +- .../street/model/StreetModelForTest.java | 4 +- .../street/model/vertex/SimpleVertex.java | 2 +- .../street/search/state/TestStateBuilder.java | 4 +- .../model/SiteRepositoryTestBuilder.java | 2 +- .../model/TransitRepositoryTestBuilder.java | 2 +- .../transit/model/TransitTestEnvironment.java | 6 +- .../model/TransitTestEnvironmentBuilder.java | 2 +- .../transit/model/TripInput.java | 4 +- .../transit/model/TripOnDateDataFetcher.java | 2 +- .../transit/model/site/TestStopLocation.java | 4 +- .../transit/service/NoopSiteResolver.java | 2 +- .../updater/trip/gtfs/GtfsRtTestHelper.java | 2 +- .../updater/trip/siri/SiriTestHelper.java | 2 +- .../opentripplanner/ConstantsForTests.java | 6 +- .../java/org/opentripplanner/GtfsTest.java | 4 +- .../OtpArchitectureModules.java | 10 +- .../_support/text/I18NStrings.java | 4 +- .../api/common/LocationStringParserTest.java | 2 +- .../transit/DefaultFeedIdMapperTest.java | 2 +- .../model/transit/FeedScopedIdMapperTest.java | 2 +- .../model/transit/HideFeedIdMapperTest.java | 2 +- .../apis/gtfs/CostScalarTest.java | 2 +- .../apis/gtfs/GraphQLIntegrationTest.java | 10 +- .../AlertsConnectionFilterMapperTest.java | 2 +- .../CanceledTripsFilterMapperTest.java | 4 +- .../routerequest/AlertsFilterTest.java | 4 +- .../LegacyRouteRequestMapperTest.java | 2 +- .../RouteRequestMapperBicycleTest.java | 2 +- .../RouteRequestMapperCarTest.java | 2 +- .../RouteRequestMapperScooterTest.java | 2 +- .../routerequest/RouteRequestMapperTest.java | 2 +- .../RouteRequestMapperTransitTest.java | 2 +- .../RouteRequestMapperWalkTest.java | 2 +- .../gtfs/model/OffsetDateTimeRangeTest.java | 2 +- .../gtfs/service/ApiTransitServiceTest.java | 4 +- .../sort/AlertsConnectionOrderingTest.java | 4 +- .../time/OffsetDateTimeRangeUtilTest.java | 2 +- .../mapping/FixedFeedIdGeneratorTest.java | 2 +- .../apis/transmodel/model/EnumTypesTest.java | 2 +- .../model/PlanResponseBuilderTest.java | 2 +- .../model/plan/RelaxCostTypeTest.java | 2 +- .../plan/TripPlanTimePenaltyDtoTest.java | 2 +- .../framework/FrameworkArchitectureTest.java | 7 +- .../doc/DocumentedEnumTestHelper.java | 2 +- .../framework/graphql/GraphQLUtilsTest.java | 2 +- .../graphql/scalar/CostScalarFactoryTest.java | 2 +- .../framework/model/CostTest.java | 4 +- .../framework/model/TimeAndCostTest.java | 2 +- .../v2/GbfsFreeVehicleStatusMapperTest.java | 4 +- .../gbfs/v3/GbfsFeedMapperTest.java | 2 +- .../v3/GbfsStationInformationMapperTest.java | 4 +- .../gbfs/v3/GbfsVehicleStatusMapperTest.java | 4 +- .../OsmBoardingLocationsModuleTest.java | 4 +- .../module/StreetLinkerModuleTest.java | 2 +- .../CalculateWorldEnvelopeModuleTest.java | 2 +- .../geometry/GeometryProcessorTest.java | 2 +- .../islandpruning/SubgraphOnlyFerryTest.java | 2 +- .../ned/MissingElevationHandlerTest.java | 2 +- .../module/osm/ParkingProcessorTest.java | 2 +- .../elevator/MultipleLevelsTest.java | 2 +- .../GenerateTripPatternsOperationTest.java | 2 +- .../gtfs/graphbuilder/GtfsModuleTest.java | 2 +- .../interlining/InterlineProcessorTest.java | 2 +- .../gtfs/mapping/BoardingAreaMapperTest.java | 2 +- .../gtfs/mapping/EntranceMapperTest.java | 2 +- .../gtfs/mapping/IdFactoryTest.java | 2 +- .../gtfs/mapping/LocationGroupMapperTest.java | 2 +- .../gtfs/mapping/PathwayNodeMapperTest.java | 2 +- .../gtfs/mapping/RouteMapperTest.java | 2 +- .../gtfs/mapping/ShapePointMapperTest.java | 2 +- .../gtfs/mapping/StopMapperTest.java | 2 +- .../gtfs/mapping/TranslationHelperTest.java | 2 +- .../gtfs/mapping/TripMapperTest.java | 2 +- .../inspector/vector/KeyValueTest.java | 2 +- .../vector/stop/AreaStopLayerBuilderTest.java | 4 +- .../model/GenericLocationTest.java | 2 +- .../model/TripPatternTest.java | 2 +- .../CalendarServiceDataFactoryImplTest.java | 2 +- .../impl/DefaultTransitDataImportTest.java | 2 +- ...ansitDataImportBuilderLimitPeriodTest.java | 4 +- .../impl/TransitDataImportBuilderTest.java | 2 +- .../model/plan/ItineraryTest.java | 2 +- .../opentripplanner/model/plan/PlaceTest.java | 6 +- .../model/plan/TestItineraryBuilder.java | 6 +- .../plan/leg/ScheduledTransitLegTest.java | 4 +- .../LegReferenceSerializerTest.java | 2 +- .../ScheduledTransitLegReferenceTest.java | 2 +- .../cursor/DeduplicationPageCutTest.java | 4 +- .../paging/cursor/PageCursorFactoryTest.java | 2 +- .../cursor/PageCursorSerializerTest.java | 2 +- .../plan/paging/cursor/PageCursorTest.java | 2 +- .../model/plan/walkstep/WalkStepTest.java | 2 +- .../netex/NetexEpipBundleSmokeTest.java | 4 +- .../netex/NetexNordicBundleSmokeTest.java | 4 +- .../mapping/FeedScopedIdFactoryTest.java | 2 +- .../netex/mapping/NetexMapperTest.java | 2 +- .../netex/mapping/ServiceLinkMapperTest.java | 4 +- .../mapping/StopAndStationMapperTest.java | 2 +- .../mapping/TripCalendarBuilderTest.java | 2 +- .../netex/mapping/TripMapperTest.java | 4 +- .../netex/mapping/TripPatternMapperTest.java | 2 +- .../calendar/CalendarServiceBuilderTest.java | 2 +- .../osm/model/OsmEntityTest.java | 2 +- .../NearbyStopFinderVisitorTest.java | 2 +- .../PlaceFinderTraverseVisitorTest.java | 2 +- .../_data/transit/TestAccessEgress.java | 2 +- .../_data/transit/TestTripSchedule.java | 4 +- .../routing/alertpatch/AlertCalendarTest.java | 2 +- .../alertpatch/EntitySelectorTest.java | 2 +- .../routing/algorithm/FilterTest.java | 2 +- .../routing/algorithm/GraphRoutingTest.java | 8 +- .../routing/algorithm/TestBanning.java | 2 +- .../system/mcmax/McMaxLimitFilterTest.java | 2 +- .../transit/DecorateTransitAlertTest.java | 2 +- ...RemoveTransitIfStreetOnlyIsBetterTest.java | 2 +- .../TransitGeneralizedCostFilterTest.java | 2 +- .../RaptorPathToItineraryMapperTest.java | 2 +- .../mapping/StatesToWalkStepsMapperTest.java | 4 +- .../mapping/TransitSnapshotTest.java | 2 +- .../_support/mapping/FeedScopedIdMapper.java | 2 +- .../mapping/_support/mapping/LegMapper.java | 2 +- .../mapping/_support/mapping/PlaceMapper.java | 2 +- .../router/street/AccessEgressRouterTest.java | 2 +- .../router/street/AccessEgressesTest.java | 2 +- .../transit/DefaultAccessEgressTest.java | 2 +- .../cost/PatternCostCalculatorTest.java | 4 +- .../cost/RaptorCostLinearFunctionTest.java | 2 +- .../cost/WheelchairCostCalculatorTest.java | 2 +- .../GeneralizedCostParametersMapperTest.java | 2 +- .../mappers/LookupStopIndexCallbackTest.java | 2 +- .../mappers/RaptorRequestMapperTest.java | 2 +- .../mappers/TestLookupStopIndexCallback.java | 2 +- .../DefaultTransitDataProviderFilterTest.java | 4 +- ...rRoutingRequestTransitDataCreatorTest.java | 2 +- .../transit/request/TestRouteData.java | 2 +- .../api/DefaultRoutingServiceTest.java | 2 +- .../routing/api/request/TripLocationTest.java | 2 +- .../api/request/TripOnDateReferenceTest.java | 2 +- .../framework/CostLinearFunctionTest.java | 2 +- .../framework/TimeAndCostPenaltyTest.java | 2 +- .../preference/CarPreferencesTest.java | 2 +- .../DirectTransitPreferencesTest.java | 2 +- .../preference/TransitPreferencesTest.java | 2 +- .../VehicleParkingPreferencesTest.java | 2 +- .../VehicleRentalPreferencesTest.java | 2 +- .../VehicleWalkingPreferencesTest.java | 2 +- .../request/request/JourneyRequestTest.java | 2 +- .../request/request/TransitRequestTest.java | 2 +- .../filter/TransitGroupSelectTest.java | 2 +- .../via/PassThroughViaLocationTest.java | 2 +- .../api/request/via/VisitViaLocationTest.java | 2 +- .../routing/core/DistanceTest.java | 2 +- .../routing/core/RatioTest.java | 2 +- .../routing/core/RouteRequestTest.java | 2 +- .../routing/graph/GraphSerializationTest.java | 2 +- ...DelegatingTransitAlertServiceImplTest.java | 2 +- .../impl/TransitAlertServiceImplTest.java | 2 +- .../linking/LinkingContextFactoryTest.java | 2 +- .../stoptimes/AlternativeLegsTest.java | 4 +- .../trippattern/FrequencyEntryTest.java | 2 +- .../DefaultRealtimeVehicleRepositoryTest.java | 2 +- .../VehicleParkingTestUtil.java | 4 +- .../TestFreeFloatingRentalVehicleBuilder.java | 10 +- .../TestVehicleRentalStationBuilder.java | 6 +- .../config/framework/json/EnumMapperTest.java | 2 +- .../framework/json/NodeAdapterTest.java | 2 +- .../standalone/server/AlertMetricsTest.java | 2 +- .../street/integration/EdgeSplittingTest.java | 2 +- .../StreetSearchRequestMapperTest.java | 6 +- .../ConstrainedBoardingSearchTest.java | 2 +- .../TransferIndexGeneratorTest.java | 2 +- .../index/RaptorTransferIndexTest.java | 2 +- .../TripTimeOnDateRequestBuilderTest.java | 4 +- .../transit/model/_data/PatternTestModel.java | 2 +- .../model/_data/TransitRepositoryForTest.java | 6 +- .../RegularStopMatcherFactoryTest.java | 2 +- .../transit/RouteMatcherFactoryTest.java | 4 +- .../StopLocationMatcherFactoryTest.java | 4 +- .../TransitAlertMatcherFactoryTest.java | 4 +- .../transit/TripMatcherFactoryTest.java | 2 +- .../TripOnServiceDateMatcherFactoryTest.java | 4 +- .../TripTimeOnDateMatcherFactoryTest.java | 2 +- .../model/framework/EntityByIdTest.java | 2 +- .../EntityNotFoundExceptionTest.java | 2 +- .../transit/model/network/RouteTest.java | 4 +- .../network/grouppriority/MatchersTest.java | 2 +- .../transit/model/site/AreaStopTest.java | 4 +- .../transit/model/site/BoardingAreaTest.java | 4 +- .../transit/model/site/EntranceTest.java | 6 +- .../model/site/GroupOfStationsTest.java | 4 +- .../transit/model/site/GroupStopTest.java | 4 +- .../model/site/MultiModalStationTest.java | 4 +- .../transit/model/site/PathwayNodeTest.java | 6 +- .../transit/model/site/RegularStopTest.java | 8 +- .../transit/model/site/StationTest.java | 4 +- .../timetable/RealTimeTripTimesTest.java | 6 +- .../timetable/ScheduledTripTimesTest.java | 4 +- .../transit/model/timetable/TripTest.java | 6 +- .../DefaultTimetableRepositoryTest.java | 2 +- .../service/DefaultTransitServiceTest.java | 6 +- .../PatternByServiceDatesFilterTest.java | 2 +- .../transit/service/SiteRepositoryTest.java | 4 +- .../transit/service/StopTimesHelperTest.java | 2 +- .../service/TransitRepositoryTest.java | 2 +- .../transit/speed_test/SpeedTest.java | 4 +- .../io/TestCaseDefinitionCsvFile.java | 2 +- .../alert/gtfs/AlertsUpdateHandlerTest.java | 2 +- .../siri/SiriAlertsUpdateHandlerTest.java | 4 +- .../updater/spi/UpdateErrorTest.java | 2 +- ...acyTimetableRepositoryIntegrationTest.java | 2 +- .../trip/gtfs/TripTimesUpdaterTest.java | 4 +- ...ataBackwardsEarlinessInterpolatorTest.java | 2 +- .../gtfs/moduletests/addition/AddedTest.java | 2 +- .../moduletests/addition/ReplacementTest.java | 2 +- .../trip/siri/AddedTripBuilderTest.java | 2 +- .../updater/trip/siri/EntityResolverTest.java | 2 +- .../trip/siri/ModifiedTripBuilderTest.java | 2 +- .../trip/siri/TimetableHelperTest.java | 4 +- .../extrajourney/ExtraJourneyTest.java | 2 +- .../replacement/PartialReplacementTest.java | 2 +- ...VehicleParkingAvailabilityUpdaterTest.java | 4 +- .../RealtimeVehicleMatcherTest.java | 2 +- .../transaction/configure/StreetDomain.java | 4 +- .../transaction/configure/TransitDomain.java | 4 +- .../internal/DefaultRepositoryHandle.java | 4 +- .../internal/DefaultRepositoryRegistry.java | 10 +- .../internal/DefaultTransactionScope.java | 4 +- .../internal/DefaultUpdateManager.java | 10 +- .../internal/DefaultWriteContext.java | 6 +- .../transaction/internal/HandlerEntry.java | 6 +- .../transaction/internal/Transaction.java | 4 +- .../internal/TransactionFactory.java | 4 +- .../internal/TransactionalRepository.java | 2 +- .../moduletest/TransactionFrameworkTest.java | 10 +- .../internal/CustomerRepositoryLifecycle.java | 2 +- .../candyshop/event/CustomerEventHandler.java | 2 +- .../event/CustomerOrderDomainEvent.java | 2 +- .../candyshop/event/OrderEventHandler.java | 2 +- .../internal/OrderRepositoryLifecycle.java | 2 +- .../model/accessibility/Accessibility.java | 2 +- .../core/{domain => }/model/basic/Cost.java | 2 +- .../{domain => }/model/basic/Distance.java | 2 +- .../model/basic/NormalizedCost.java | 2 +- .../core/{domain => }/model/basic/Ratio.java | 2 +- .../deduplicator/DeduplicatorNoop.java | 2 +- .../deduplicator/DeduplicatorService.java | 2 +- .../di/TransitServicePeriod.java | 2 +- .../model/doc/DocumentedEnum.java | 2 +- .../core/model/event/DomainEvent.java | 2 +- .../core/model/event/EventHandler.java | 4 +- .../{domain => }/model/i18n/I18NString.java | 2 +- .../model/i18n/I18NStringMapper.java | 2 +- .../core/model/i18n/LocalizedString.java | 4 +- .../model/i18n/LocalizedStringFormat.java | 2 +- .../model/i18n/NonLocalizedString.java | 2 +- .../model/i18n/TranslatedString.java | 2 +- .../{domain => }/model/id/FeedScopedId.java | 2 +- .../resources/ResourceBundleAdaptor.java | 2 +- .../resources/ResourceBundleSingleton.java | 2 +- .../model/time/LocalDateRange.java | 2 +- .../{domain => }/model/time/TimePeriod.java | 2 +- .../model/transaction/RepositoryHandle.java | 4 +- .../transaction/RepositoryLifecycle.java | 2 +- .../model/transaction/RepositoryRegistry.java | 5 +- .../model/transaction/TransactionScope.java | 4 +- .../core/model/transaction/UpdateManager.java | 8 +- .../core/model/transaction/WriteContext.java | 7 +- .../core/model/i18n/I18NStringTest.java | 2 +- .../core/model/i18n/LocalizedStringTest.java | 2 +- .../core/model/i18n/TranslatedStringTest.java | 2 +- .../core/model/id/FeedScopedIdTest.java | 2 +- .../core/model/time/LocalDateRangeTest.java | 2 +- .../core/model/time/TimePeriodTest.java | 2 +- .../vehicleparking/model/VehicleParking.java | 4 +- .../model/VehicleParkingEntrance.java | 4 +- .../model/VehicleParkingGroup.java | 4 +- .../model/VehicleParkingGroupBuilder.java | 4 +- .../VehicleRentalRepository.java | 2 +- .../vehiclerental/VehicleRentalService.java | 2 +- .../DefaultVehicleRentalRepository.java | 2 +- .../internal/DefaultVehicleRentalService.java | 2 +- .../vehiclerental/model/GeofencingZone.java | 4 +- .../model/RentalVehicleFuel.java | 4 +- .../model/RentalVehicleType.java | 4 +- .../model/VehicleRentalPlace.java | 4 +- .../model/VehicleRentalStation.java | 4 +- .../model/VehicleRentalStationBuilder.java | 4 +- .../model/VehicleRentalSystem.java | 2 +- .../model/VehicleRentalVehicle.java | 4 +- .../street/StreetVehicleRentalLink.java | 2 +- .../street/VehicleRentalEdge.java | 2 +- .../street/VehicleRentalPlaceVertex.java | 2 +- .../opentripplanner/street/graph/Graph.java | 2 +- .../street/graph/StreetIndex.java | 2 +- .../graph/summary/StreetSummarizer.java | 2 +- .../street/linking/AreaEdgeProperties.java | 2 +- .../street/model/StreetMode.java | 2 +- .../street/model/edge/Area.java | 2 +- .../street/model/edge/Edge.java | 2 +- .../street/model/edge/ElevatorAlightEdge.java | 4 +- .../street/model/edge/ElevatorBoardEdge.java | 4 +- .../street/model/edge/ElevatorHopEdge.java | 4 +- .../street/model/edge/EscalatorEdge.java | 4 +- .../street/model/edge/FreeEdge.java | 2 +- .../street/model/edge/PathwayEdge.java | 4 +- .../street/model/edge/StreetEdge.java | 2 +- .../street/model/edge/StreetEdgeBuilder.java | 4 +- .../model/edge/StreetTransitEntityLink.java | 4 +- .../model/edge/StreetTransitEntranceLink.java | 2 +- .../model/edge/StreetVehicleParkingLink.java | 2 +- .../street/model/edge/VehicleParkingEdge.java | 4 +- .../model/openinghours/OHCalendarBuilder.java | 2 +- .../OpeningHoursCalendarService.java | 6 +- .../street/model/vertex/BarrierVertex.java | 2 +- .../model/vertex/ElevatorHopVertex.java | 2 +- .../vertex/LabelledIntersectionVertex.java | 2 +- .../vertex/OsmBoardingLocationVertex.java | 2 +- .../street/model/vertex/OsmVertex.java | 2 +- .../street/model/vertex/SplitterVertex.java | 2 +- .../model/vertex/StationCentroidVertex.java | 4 +- .../model/vertex/StationElementVertex.java | 4 +- .../model/vertex/StationEntranceVertex.java | 4 +- .../street/model/vertex/StreetLocation.java | 2 +- .../street/model/vertex/StreetVertex.java | 6 +- .../street/model/vertex/SubsidiaryVertex.java | 2 +- .../model/vertex/TemporaryStreetLocation.java | 2 +- .../vertex/TransitBoardingAreaVertex.java | 4 +- .../model/vertex/TransitEntranceVertex.java | 6 +- .../vertex/TransitPathwayNodeVertex.java | 4 +- .../model/vertex/TransitStopVertex.java | 6 +- .../vertex/TransitStopVertexBuilder.java | 4 +- .../vertex/VehicleParkingEntranceVertex.java | 2 +- .../street/model/vertex/Vertex.java | 4 +- .../street/model/vertex/VertexLabel.java | 2 +- .../search/request/AccessibilityRequest.java | 2 +- .../street/search/request/CarRequest.java | 2 +- .../search/request/ElevatorRequest.java | 2 +- .../street/search/request/ParkingRequest.java | 2 +- .../street/search/request/RentalRequest.java | 2 +- .../search/request/VehicleWalkingRequest.java | 2 +- .../core/model/id/FeedScopedIdFactory.java | 2 - .../TestFreeFloatingRentalVehicleBuilder.java | 10 +- .../model/TestGeofencingZoneBuilder.java | 4 +- .../TestVehicleRentalStationBuilder.java | 6 +- .../street/linking/LinkingEnvironment.java | 2 +- .../street/model/StreetModelFactory.java | 4 +- .../street/model/edge/SimpleConcreteEdge.java | 2 +- .../model/edge/TestAreaGroupBuilder.java | 2 +- .../street/model/edge/TestEdge.java | 2 +- .../street/model/vertex/SimpleVertex.java | 2 +- .../street/search/state/TestStateBuilder.java | 4 +- .../geofencing/PreResolveVertexZonesTest.java | 4 +- .../street/graph/StreetIndexTest.java | 4 +- .../street/integration/BikeRentalTest.java | 2 +- .../street/integration/BikeWalkingTest.java | 2 +- .../street/integration/GraphRoutingTest.java | 8 +- .../street/integration/ParkAndRideTest.java | 2 +- .../ScooterRentalGeofencingTest.java | 6 +- .../linking/AreaEdgePropertiesTest.java | 2 +- .../street/linking/FlexLinkingTest.java | 2 +- .../street/linking/PlatformLinkingTest.java | 4 +- .../street/linking/PreparedAreaGroupTest.java | 2 +- .../TemporaryVerticesContainerTest.java | 2 +- .../linking/VehicleParkingHelperTest.java | 4 +- .../linking/VertexLinkerGeofencingTest.java | 2 +- .../model/edge/AreaEdgeBuilderTest.java | 2 +- .../model/edge/ElevatorHopEdgeTest.java | 2 +- .../street/model/edge/PathwayEdgeTest.java | 4 +- .../model/edge/StreetEdgeBuilderTest.java | 2 +- .../model/edge/StreetEdgeSplittingTest.java | 2 +- .../street/model/edge/StreetEdgeTest.java | 4 +- .../edge/StreetTransitEntityLinkTest.java | 8 +- .../edge/StreetVehicleParkingLinkTest.java | 4 +- ...TemporaryPartialStreetEdgeBuilderTest.java | 2 +- .../edge/TemporaryPartialStreetEdgeTest.java | 2 +- .../model/edge/VehicleParkingEdgeTest.java | 2 +- .../edge/VehicleParkingPreferredTagsTest.java | 4 +- .../model/openinghours/OHCalendarTest.java | 2 +- .../model/vertex/BarrierVertexTest.java | 2 +- .../street/model/vertex/OsmVertexTest.java | 2 +- .../vertex/TemporaryVertexDisposeTest.java | 2 +- ...leIntersectionTraversalCalculatorTest.java | 2 +- .../search/request/BikeRequestTest.java | 2 +- .../street/search/request/CarRequestTest.java | 2 +- .../search/request/ParkingRequestTest.java | 4 +- .../search/request/RentalRequestTest.java | 4 +- .../request/VehicleWalkingRequestTest.java | 2 +- 1000 files changed, 1426 insertions(+), 1464 deletions(-) rename core/model/src/main/java/org/opentripplanner/core/{domain => }/model/accessibility/Accessibility.java (85%) rename core/model/src/main/java/org/opentripplanner/core/{domain => }/model/basic/Cost.java (98%) rename core/model/src/main/java/org/opentripplanner/core/{domain => }/model/basic/Distance.java (98%) rename core/model/src/main/java/org/opentripplanner/core/{domain => }/model/basic/NormalizedCost.java (92%) rename core/model/src/main/java/org/opentripplanner/core/{domain => }/model/basic/Ratio.java (97%) rename core/model/src/main/java/org/opentripplanner/core/{domain/framework => model}/deduplicator/DeduplicatorNoop.java (94%) rename core/model/src/main/java/org/opentripplanner/core/{domain/framework => model}/deduplicator/DeduplicatorService.java (95%) rename core/model/src/main/java/org/opentripplanner/core/{domain/framework => model}/di/TransitServicePeriod.java (84%) rename core/model/src/main/java/org/opentripplanner/core/{domain => }/model/doc/DocumentedEnum.java (93%) rename core/model/src/main/java/org/opentripplanner/core/{domain => }/model/i18n/I18NString.java (96%) rename core/model/src/main/java/org/opentripplanner/core/{domain => }/model/i18n/I18NStringMapper.java (91%) rename core/model/src/main/java/org/opentripplanner/core/{domain => }/model/i18n/LocalizedStringFormat.java (95%) rename core/model/src/main/java/org/opentripplanner/core/{domain => }/model/i18n/NonLocalizedString.java (98%) rename core/model/src/main/java/org/opentripplanner/core/{domain => }/model/i18n/TranslatedString.java (99%) rename core/model/src/main/java/org/opentripplanner/core/{domain => }/model/id/FeedScopedId.java (99%) rename core/model/src/main/java/org/opentripplanner/core/{domain/framework => model}/resources/ResourceBundleAdaptor.java (95%) rename core/model/src/main/java/org/opentripplanner/core/{domain/framework => model}/resources/ResourceBundleSingleton.java (95%) rename core/model/src/main/java/org/opentripplanner/core/{domain => }/model/time/LocalDateRange.java (99%) rename core/model/src/main/java/org/opentripplanner/core/{domain => }/model/time/TimePeriod.java (98%) diff --git a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/CarpoolTripTestData.java b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/CarpoolTripTestData.java index bc5b9261c4b..03c7229777d 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/CarpoolTripTestData.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/CarpoolTripTestData.java @@ -4,7 +4,7 @@ import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.List; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.model.CarpoolStop; import org.opentripplanner.ext.carpooling.model.CarpoolTrip; import org.opentripplanner.ext.carpooling.model.CarpoolTripBuilder; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/constraints/PassengerDelayConstraintsTest.java b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/constraints/PassengerDelayConstraintsTest.java index 9b7c58e7590..a29b8b62686 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/constraints/PassengerDelayConstraintsTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/constraints/PassengerDelayConstraintsTest.java @@ -9,7 +9,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.Test; import org.opentripplanner.astar.model.GraphPath; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.CarpoolGraphPathBuilder; import org.opentripplanner.ext.carpooling.model.CarpoolStop; import org.opentripplanner.street.model.edge.Edge; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/internal/DefaultCarpoolingRepositoryTest.java b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/internal/DefaultCarpoolingRepositoryTest.java index 832e0efe7cb..049ecfa766f 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/internal/DefaultCarpoolingRepositoryTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/internal/DefaultCarpoolingRepositoryTest.java @@ -10,7 +10,7 @@ import java.time.ZonedDateTime; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.CarpoolTripTestData; import org.opentripplanner.ext.carpooling.model.CarpoolStop; import org.opentripplanner.ext.carpooling.model.CarpoolTrip; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/model/CarpoolStopBuilderTest.java b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/model/CarpoolStopBuilderTest.java index ec703f5cc34..a468587379c 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/model/CarpoolStopBuilderTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/model/CarpoolStopBuilderTest.java @@ -7,7 +7,7 @@ import java.time.ZoneId; import java.time.ZonedDateTime; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; public class CarpoolStopBuilderTest { diff --git a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/model/CarpoolTripBuilderTest.java b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/model/CarpoolTripBuilderTest.java index cfc14dc8a11..5f9242b4eb5 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/model/CarpoolTripBuilderTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/model/CarpoolTripBuilderTest.java @@ -12,7 +12,7 @@ import java.time.ZonedDateTime; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.organization.ContactInfo; public class CarpoolTripBuilderTest { diff --git a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/routing/CarpoolAccessEgressTest.java b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/routing/CarpoolAccessEgressTest.java index 4e8310a2ae5..78b91cb8c24 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/routing/CarpoolAccessEgressTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/routing/CarpoolAccessEgressTest.java @@ -13,7 +13,7 @@ import javax.annotation.Nullable; import org.junit.jupiter.api.Test; import org.opentripplanner.astar.model.GraphPath; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.raptor.spi.RaptorConstants; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingServiceCrossLegInsertionTest.java b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingServiceCrossLegInsertionTest.java index ac63809ff94..97525e44c2f 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingServiceCrossLegInsertionTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingServiceCrossLegInsertionTest.java @@ -10,7 +10,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.model.CarpoolStop; import org.opentripplanner.ext.carpooling.model.CarpoolTrip; import org.opentripplanner.ext.carpooling.model.CarpoolTripBuilder; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingServiceTreeLimitTest.java b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingServiceTreeLimitTest.java index 1cf520fe65f..0ccdf86bedd 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingServiceTreeLimitTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingServiceTreeLimitTest.java @@ -10,7 +10,7 @@ import java.time.ZonedDateTime; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.model.CarpoolStop; import org.opentripplanner.ext.carpooling.model.CarpoolTrip; import org.opentripplanner.ext.carpooling.model.CarpoolTripBuilder; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/updater/MultiFeedSiriETCarpoolingUpdaterTest.java b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/updater/MultiFeedSiriETCarpoolingUpdaterTest.java index 0596a880b90..92a88a6d603 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/updater/MultiFeedSiriETCarpoolingUpdaterTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/updater/MultiFeedSiriETCarpoolingUpdaterTest.java @@ -14,7 +14,7 @@ import java.util.stream.Collectors; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.CarpoolTripWithVerticesTestData; import org.opentripplanner.ext.carpooling.internal.DefaultCarpoolingRepository; import org.opentripplanner.ext.carpooling.routing.CarpoolTripVertexResolver; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/updater/SiriETCarpoolingUpdaterTest.java b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/updater/SiriETCarpoolingUpdaterTest.java index 6baa27c8bf7..0d00219f153 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/carpooling/updater/SiriETCarpoolingUpdaterTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/carpooling/updater/SiriETCarpoolingUpdaterTest.java @@ -22,7 +22,7 @@ import java.time.Duration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.CarpoolTripWithVerticesTestData; import org.opentripplanner.ext.carpooling.internal.DefaultCarpoolingRepository; import org.opentripplanner.ext.carpooling.routing.CarpoolTripVertexResolver; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/edgenaming/CrosswalkNamerTest.java b/application/src/ext-test/java/org/opentripplanner/ext/edgenaming/CrosswalkNamerTest.java index 025cdecd7b3..055cc752bea 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/edgenaming/CrosswalkNamerTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/edgenaming/CrosswalkNamerTest.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.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.module.osm.EdgeNamer; import org.opentripplanner.graph_builder.module.osm.model.StreetEdgePair; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/edgenaming/SidewalkNamerTest.java b/application/src/ext-test/java/org/opentripplanner/ext/edgenaming/SidewalkNamerTest.java index 4087d4fb888..db739aa7fe2 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/edgenaming/SidewalkNamerTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/edgenaming/SidewalkNamerTest.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.module.osm.EdgeNamer; import org.opentripplanner.graph_builder.module.osm.model.StreetEdgePair; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/emission/EmissionTestData.java b/application/src/ext-test/java/org/opentripplanner/ext/emission/EmissionTestData.java index 5da82b2000d..ffd097170b5 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/emission/EmissionTestData.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/emission/EmissionTestData.java @@ -2,7 +2,7 @@ import java.io.File; import org.opentripplanner.ConstantsForTests; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.datastore.api.CompositeDataSource; import org.opentripplanner.datastore.api.DataSource; import org.opentripplanner.datastore.api.DataSourceTestFactory; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/EmissionDataReaderTest.java b/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/EmissionDataReaderTest.java index 451582b83f3..9378bab5389 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/EmissionDataReaderTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/EmissionDataReaderTest.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.emission.EmissionRepository; import org.opentripplanner.ext.emission.EmissionTestData; import org.opentripplanner.ext.emission.internal.DefaultEmissionRepository; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/route/RouteDataReaderTest.java b/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/route/RouteDataReaderTest.java index c8c653855b2..e7dc0a659a3 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/route/RouteDataReaderTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/route/RouteDataReaderTest.java @@ -8,7 +8,7 @@ import java.io.FileNotFoundException; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.emission.EmissionTestData; import org.opentripplanner.framework.csv.HeadersDoNotMatch; import org.opentripplanner.graph_builder.issue.service.DefaultDataImportIssueStore; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/trip/EmissionAggregatorTest.java b/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/trip/EmissionAggregatorTest.java index f8f51cb0152..b00bf854bfc 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/trip/EmissionAggregatorTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/trip/EmissionAggregatorTest.java @@ -5,7 +5,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.model.Gram; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.site.StopLocation; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/trip/TripHopMapperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/trip/TripHopMapperTest.java index 8fb7a038b53..b9a3d96ea2b 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/trip/TripHopMapperTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/trip/TripHopMapperTest.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.model.Gram; import org.opentripplanner.graph_builder.issue.api.DataImportIssue; import org.opentripplanner.graph_builder.issue.service.DefaultDataImportIssueStore; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/itinerary/EmissionItineraryDecoratorTest.java b/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/itinerary/EmissionItineraryDecoratorTest.java index 013d1c42c68..fe7ece6f3cc 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/itinerary/EmissionItineraryDecoratorTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/emission/internal/itinerary/EmissionItineraryDecoratorTest.java @@ -10,7 +10,7 @@ import java.util.Map; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.emission.EmissionService; import org.opentripplanner.ext.emission.internal.DefaultEmissionRepository; import org.opentripplanner.ext.emission.internal.DefaultEmissionService; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayRepositoryTest.java b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayRepositoryTest.java index 42f50f69ba4..8932c4c951f 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayRepositoryTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayRepositoryTest.java @@ -21,7 +21,7 @@ import java.util.Optional; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.internal.DefaultEmpiricalDelayRepository; import org.opentripplanner.ext.empiricaldelay.model.TripDelays; import org.opentripplanner.ext.empiricaldelay.model.calendar.EmpiricalDelayCalendar; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayServiceTest.java index d8b094af3ee..50db5abde37 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayServiceTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayServiceTest.java @@ -16,7 +16,7 @@ import java.util.Optional; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.internal.DefaultEmpiricalDelayRepository; import org.opentripplanner.ext.empiricaldelay.internal.DefaultEmpiricalDelayService; import org.opentripplanner.ext.empiricaldelay.model.TripDelays; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayTestData.java b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayTestData.java index a0662fd72dd..4ac43a233b4 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayTestData.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayTestData.java @@ -3,7 +3,7 @@ import java.time.DayOfWeek; import java.time.LocalDate; import java.util.Arrays; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.model.EmpiricalDelay; import org.opentripplanner.ext.empiricaldelay.model.calendar.EmpiricalDelayCalendar; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/EmpiricalDelayCsvDataReaderTest.java b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/EmpiricalDelayCsvDataReaderTest.java index c2869c5a9bf..974b73bfc73 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/EmpiricalDelayCsvDataReaderTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/EmpiricalDelayCsvDataReaderTest.java @@ -8,7 +8,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.datastore.api.DataSourceTestFactory; import org.opentripplanner.datastore.api.ListCompositeDataSource; import org.opentripplanner.ext.empiricaldelay.internal.model.DelayAtStopDto; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/delay/TripTimeDelayCsvParserTest.java b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/delay/TripTimeDelayCsvParserTest.java index b16e8959a1a..54d350109af 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/delay/TripTimeDelayCsvParserTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/delay/TripTimeDelayCsvParserTest.java @@ -6,7 +6,7 @@ import com.csvreader.CsvReader; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; class TripTimeDelayCsvParserTest { diff --git a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/graphbuilder/TripDelaysMapperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/graphbuilder/TripDelaysMapperTest.java index a1ada3ba032..d7d7d010553 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/graphbuilder/TripDelaysMapperTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/graphbuilder/TripDelaysMapperTest.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.internal.model.TripDelaysAgregator; import org.opentripplanner.ext.empiricaldelay.model.EmpiricalDelay; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/model/DelayAtStopDtoTest.java b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/model/DelayAtStopDtoTest.java index 531a37b4359..097e7b1c60f 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/model/DelayAtStopDtoTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/model/DelayAtStopDtoTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.model.EmpiricalDelay; class DelayAtStopDtoTest { diff --git a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/model/EmpiricalDelaySummaryTest.java b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/model/EmpiricalDelaySummaryTest.java index 96d0cb96ed5..2ccc606536a 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/model/EmpiricalDelaySummaryTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/model/EmpiricalDelaySummaryTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; class EmpiricalDelaySummaryTest { diff --git a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/model/TripDelaysDtoTest.java b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/model/TripDelaysDtoTest.java index 8cceca6504a..fda97e6e7fb 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/model/TripDelaysDtoTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/model/TripDelaysDtoTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.model.EmpiricalDelay; class TripDelaysDtoTest { diff --git a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/model/TripDelaysTest.java b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/model/TripDelaysTest.java index c98f10a824a..8b55b45adce 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/model/TripDelaysTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/model/TripDelaysTest.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Optional; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; class TripDelaysTest { diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/FareRuleSetTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/FareRuleSetTest.java index 6601f1cafd0..910c0dfcb27 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/FareRuleSetTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/FareRuleSetTest.java @@ -10,7 +10,7 @@ import java.util.Set; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareAttribute; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.transit.model.basic.Money; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/model/FareProductTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/model/FareProductTest.java index e1bfb0a5b0c..3487bf0a251 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/model/FareProductTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/model/FareProductTest.java @@ -12,7 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.fare.FareMedium; import org.opentripplanner.model.fare.FareProduct; import org.opentripplanner.model.fare.RiderCategory; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareServiceTest.java index 6e1f19ddbaa..28c944e0b2c 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareServiceTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareServiceTest.java @@ -18,8 +18,8 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareModelForTest; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.model.plan.Itinerary; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HSLFareServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HSLFareServiceTest.java index 7b7ddab33d1..7d3c6285ff6 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HSLFareServiceTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HSLFareServiceTest.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.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareAttribute; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.model.plan.Itinerary; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HighestFareInFreeTransferWindowFareServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HighestFareInFreeTransferWindowFareServiceTest.java index a8b854d608a..4d644c5ec83 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HighestFareInFreeTransferWindowFareServiceTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HighestFareInFreeTransferWindowFareServiceTest.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.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareAttribute; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.model.fare.FareProduct; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java index 1c7b70594ed..bd3c6425b0a 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java @@ -38,9 +38,9 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.domain.model.basic.Cost; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareModelForTest; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.model.fare.FareOffer; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/AreasTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/AreasTest.java index dca824b8c60..4784c5326ff 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/AreasTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/AreasTest.java @@ -8,7 +8,7 @@ import java.util.Map; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.model.fare.FareOffer; import org.opentripplanner.model.fare.FareProduct; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/CostedTransferInNetworkTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/CostedTransferInNetworkTest.java index 995a5e76dca..5085a4ad230 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/CostedTransferInNetworkTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/CostedTransferInNetworkTest.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTestConstants; import org.opentripplanner.ext.fares.model.FareTransferRule; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/DepartureToArrivalTimeLimitTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/DepartureToArrivalTimeLimitTest.java index 8425e839715..da80500a699 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/DepartureToArrivalTimeLimitTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/DepartureToArrivalTimeLimitTest.java @@ -8,7 +8,7 @@ import java.time.Duration; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTestConstants; import org.opentripplanner.ext.fares.model.FareTransferRule; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/DepartureToDepartureTimeLimitTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/DepartureToDepartureTimeLimitTest.java index 6000c586d48..56e8d3df822 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/DepartureToDepartureTimeLimitTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/DepartureToDepartureTimeLimitTest.java @@ -8,7 +8,7 @@ import java.time.Duration; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTestConstants; import org.opentripplanner.ext.fares.model.FareTransferRule; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FlexLegTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FlexLegTest.java index eaa6a066848..5c9927b93a8 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FlexLegTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FlexLegTest.java @@ -7,7 +7,7 @@ import com.google.common.collect.ImmutableMultimap; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTestConstants; import org.opentripplanner.model.fare.FareOffer; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FreeTransferInNetworkTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FreeTransferInNetworkTest.java index 264cdf5b959..7b3a9eb2c41 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FreeTransferInNetworkTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FreeTransferInNetworkTest.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTransferRule; import org.opentripplanner.model.fare.FareOffer; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FreeTransferTimeLimitTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FreeTransferTimeLimitTest.java index 80fb27eecc4..671b2b77356 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FreeTransferTimeLimitTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FreeTransferTimeLimitTest.java @@ -8,7 +8,7 @@ import java.time.Duration; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTestConstants; import org.opentripplanner.ext.fares.model.FareTransferRule; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2ServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2ServiceTest.java index f17187bbfc5..d138b1370b1 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2ServiceTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2ServiceTest.java @@ -8,7 +8,7 @@ import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.model.fare.FareOffer; import org.opentripplanner.model.fare.FareProduct; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/OnlyFromTimeframeMatcherTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/OnlyFromTimeframeMatcherTest.java index 15b939721a0..2bd9c448731 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/OnlyFromTimeframeMatcherTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/OnlyFromTimeframeMatcherTest.java @@ -10,7 +10,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTestConstants; import org.opentripplanner.ext.fares.model.Timeframe; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/SameGroupIdPriorityTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/SameGroupIdPriorityTest.java index bddbe4a8e18..9388b7e26c9 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/SameGroupIdPriorityTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/SameGroupIdPriorityTest.java @@ -13,7 +13,7 @@ import org.junit.jupiter.api.Named; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareLegRuleBuilder; import org.opentripplanner.ext.fares.model.FareTestConstants; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/StopCountTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/StopCountTest.java index 524a0350cb1..ecfc7008210 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/StopCountTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/StopCountTest.java @@ -4,7 +4,7 @@ import static org.opentripplanner.core.model.id.FeedScopedIdForTestFactory.id; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareDistance; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTestConstants; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/TimeframeMatcherTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/TimeframeMatcherTest.java index 4ee14d42f8b..b412286e6c4 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/TimeframeMatcherTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/TimeframeMatcherTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTestConstants; import org.opentripplanner.model.plan.TestTransitLeg; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/custom/OregonHopFareFactoryTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/custom/OregonHopFareFactoryTest.java index 699a4ccc349..282b2893012 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/custom/OregonHopFareFactoryTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/custom/OregonHopFareFactoryTest.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareRulesData; import org.opentripplanner.ext.fares.model.FareTestConstants; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapperTest.java index 15701a8303f..259cb7fb134 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapperTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapperTest.java @@ -16,7 +16,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.locationtech.jts.geom.Coordinate; import org.opentripplanner._support.geometry.Polygons; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.graph.Graph; import org.opentripplanner.street.model.StreetModelForTest; import org.opentripplanner.street.model.StreetTraversalPermission; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIndexTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIndexTest.java index 4d3ea1af575..44c196c5a68 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIndexTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIndexTest.java @@ -12,7 +12,7 @@ import java.util.Collection; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.UnscheduledTrip; import org.opentripplanner.model.calendar.CalendarServiceData; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java index 16814f1fe1f..9cb705147d7 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java @@ -17,8 +17,8 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.opentripplanner.TestOtpModel; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.LocalDateRange; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.module.TestStreetLinkerModule; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java index 760ef8f128e..5b1dc81ef1d 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java @@ -8,7 +8,7 @@ import java.util.Map; import org.opentripplanner.ConstantsForTests; import org.opentripplanner.TestOtpModel; -import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.model.time.LocalDateRange; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.gtfs.graphbuilder.GtfsBundle; import org.opentripplanner.gtfs.graphbuilder.GtfsBundleTestFactory; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexRouterTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexRouterTest.java index 3e091552854..331e98f69e6 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexRouterTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexRouterTest.java @@ -12,7 +12,7 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.template.FlexServiceDate; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.framework.application.OTPFeature; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexibleTransitLegTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexibleTransitLegTest.java index 5f88a7aab46..c72e1842089 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexibleTransitLegTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/flex/FlexibleTransitLegTest.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.ext.flex.edgetype.FlexTripEdge; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPath; import org.opentripplanner.model.plan.Emission; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java index fe6815b2418..0ebb198c816 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.opentripplanner.TestOtpModel; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.ext.flex.trip.UnscheduledTrip; import org.opentripplanner.transit.service.TransitRepository; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/filter/FilterMapperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/filter/FilterMapperTest.java index 096bb9c3405..6836a2ce493 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/flex/filter/FilterMapperTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/flex/filter/FilterMapperTest.java @@ -5,7 +5,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.request.filter.AllowAllTransitFilter; import org.opentripplanner.routing.api.request.request.filter.SelectRequest; import org.opentripplanner.routing.api.request.request.filter.TransitFilterRequest; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/template/ClosestTripTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/template/ClosestTripTest.java index 235ee69dab6..03256e61ff7 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/flex/template/ClosestTripTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/flex/template/ClosestTripTest.java @@ -13,7 +13,7 @@ import java.util.Set; import org.junit.jupiter.api.Test; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.ext.flex.trip.UnscheduledTrip; import org.opentripplanner.place.api.NearbyStop; 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 939b46bb961..141d0c359bb 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 @@ -18,7 +18,7 @@ import java.util.Set; import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.ScheduledFlexPathCalculator; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripIntegrationTest.java b/application/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripIntegrationTest.java index e9e3e05ebed..83ef8051177 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripIntegrationTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripIntegrationTest.java @@ -17,7 +17,7 @@ import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.api.model.geometry.EncodedPolyline; import org.opentripplanner.apis.transmodel.model.TripTimeOnDateHelper; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.FlexIntegrationTestData; import org.opentripplanner.graph_builder.module.ValidateAndInterpolateStopTimesForEachTrip; import org.opentripplanner.model.GenericLocation; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java b/application/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java index 83fcb321451..d9ae14058df 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java @@ -19,7 +19,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.opentripplanner._support.geometry.Polygons; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.stopconsolidation.internal.DefaultStopConsolidationRepository; import org.opentripplanner.ext.stopconsolidation.internal.DefaultStopConsolidationService; import org.opentripplanner.model.FeedInfo; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/geocoder/StopClusterMapperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/geocoder/StopClusterMapperTest.java index f985409239e..5c6cd1b3d06 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/geocoder/StopClusterMapperTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/geocoder/StopClusterMapperTest.java @@ -7,7 +7,7 @@ import com.google.common.collect.Iterables; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.stopconsolidation.internal.DefaultStopConsolidationRepository; import org.opentripplanner.ext.stopconsolidation.internal.DefaultStopConsolidationService; import org.opentripplanner.ext.stopconsolidation.model.ConsolidatedStopGroup; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/ojp/service/CallAtStopServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/ojp/service/CallAtStopServiceTest.java index 0c6318ad01e..98175775630 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/ojp/service/CallAtStopServiceTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/ojp/service/CallAtStopServiceTest.java @@ -13,7 +13,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.place.NearbyStopFinder; import org.opentripplanner.place.api.NearbyStop; import org.opentripplanner.place.nearbystopfinder.StraightLineNearbyStopFinder; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/ojp/service/StopEventParamsMapperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/ojp/service/StopEventParamsMapperTest.java index ef89dd77cb4..fc9d47aae5a 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/ojp/service/StopEventParamsMapperTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/ojp/service/StopEventParamsMapperTest.java @@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test; import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.api.model.transit.DefaultFeedIdMapper; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.ojp.mapping.StopEventParamsMapper; import org.opentripplanner.ojp.time.XmlDateTime; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationParserTest.java b/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationParserTest.java index f01e8b86268..fe2bf810820 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationParserTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationParserTest.java @@ -5,7 +5,7 @@ import java.io.IOException; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.test.support.ResourceLoader; class StopConsolidationParserTest { diff --git a/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/TestStopConsolidationModel.java b/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/TestStopConsolidationModel.java index 025b8049b1e..705162dd018 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/TestStopConsolidationModel.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/TestStopConsolidationModel.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.stopconsolidation; import java.util.List; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.network.StopPattern; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLegBuilderTest.java b/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLegBuilderTest.java index 2a712cdff43..7846f98eded 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLegBuilderTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLegBuilderTest.java @@ -9,7 +9,7 @@ import java.util.Set; import org.junit.jupiter.api.Test; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.model.fare.FareOffer; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.model.plan.leg.ScheduledTransitLeg; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java index d0686ac3f3d..7881ea2f564 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java @@ -7,8 +7,8 @@ import java.util.Locale; import org.junit.jupiter.api.Test; import org.opentripplanner._support.geometry.Polygons; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.vectortiles.VectorTilesResource; import org.opentripplanner.inspector.vector.LayerParameters; import org.opentripplanner.standalone.config.routerconfig.VectorTileConfig; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapperTest.java index 2eb980fd520..c3b9b177b5d 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapperTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapperTest.java @@ -7,7 +7,7 @@ import java.util.Locale; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.ext.vectortiles.layers.TestTransitService; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.site.Station; 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 da7117ce8ab..8ef204e72bf 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 @@ -13,8 +13,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.ext.realtimeresolver.RealtimeResolver; import org.opentripplanner.model.plan.Place; import org.opentripplanner.routing.alertpatch.AlertCalendar; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java index 2fd6a1a18fe..5f41ddcc78a 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java @@ -7,9 +7,9 @@ import java.util.Locale; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.TranslatedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.TranslatedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.vectortiles.layers.TestTransitService; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.site.RegularStop; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java index 5986ba75573..b821852c558 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java @@ -13,9 +13,9 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.i18n.TranslatedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.TranslatedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.ext.vectortiles.VectorTilesResource; import org.opentripplanner.inspector.vector.KeyValue; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerTest.java index 84ccfacc02f..d3b5a28ce16 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerTest.java @@ -20,8 +20,8 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.domain.model.i18n.TranslatedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.TranslatedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingRepository; import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingService; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRentalVehiclePropertyMapperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRentalVehiclePropertyMapperTest.java index a86d05da051..9272dda9675 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRentalVehiclePropertyMapperTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRentalVehiclePropertyMapperTest.java @@ -7,9 +7,9 @@ import java.util.HashMap; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Ratio; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.basic.Ratio; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.RentalVehicleFuel; import org.opentripplanner.service.vehiclerental.model.RentalVehicleTypeFactory; import org.opentripplanner.service.vehiclerental.model.VehicleRentalVehicle; diff --git a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalStationPropertyMapperTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalStationPropertyMapperTest.java index 50bf5998772..83669a40da3 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalStationPropertyMapperTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalStationPropertyMapperTest.java @@ -9,9 +9,9 @@ import java.util.Locale; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.i18n.TranslatedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.TranslatedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation; class DigitransitVehicleRentalStationPropertyMapperTest { diff --git a/application/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterTest.java b/application/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterTest.java index 92f61cfcaaf..824e8924b73 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterTest.java @@ -7,7 +7,7 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.io.HttpHeaders; import org.opentripplanner.service.vehicleparking.model.VehicleParkingState; import org.opentripplanner.test.support.ResourceLoader; diff --git a/application/src/ext/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScore.java b/application/src/ext/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScore.java index 79312a831e8..aad1959a745 100644 --- a/application/src/ext/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScore.java +++ b/application/src/ext/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScore.java @@ -3,7 +3,7 @@ import java.util.Comparator; import java.util.List; import java.util.Objects; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.model.accessibility.Accessibility; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.model.plan.leg.ScheduledTransitLeg; diff --git a/application/src/ext/java/org/opentripplanner/ext/carpooling/CarpoolingRepository.java b/application/src/ext/java/org/opentripplanner/ext/carpooling/CarpoolingRepository.java index 6be508e01d8..b84ee1282f1 100644 --- a/application/src/ext/java/org/opentripplanner/ext/carpooling/CarpoolingRepository.java +++ b/application/src/ext/java/org/opentripplanner/ext/carpooling/CarpoolingRepository.java @@ -4,7 +4,7 @@ import java.time.Instant; import java.util.Collection; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.model.CarpoolTrip; import org.opentripplanner.ext.carpooling.routing.CarpoolTripWithVertices; diff --git a/application/src/ext/java/org/opentripplanner/ext/carpooling/internal/CarpoolItineraryMapper.java b/application/src/ext/java/org/opentripplanner/ext/carpooling/internal/CarpoolItineraryMapper.java index 6da511cec94..195142ded22 100644 --- a/application/src/ext/java/org/opentripplanner/ext/carpooling/internal/CarpoolItineraryMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/carpooling/internal/CarpoolItineraryMapper.java @@ -8,10 +8,10 @@ import javax.annotation.Nullable; import org.locationtech.jts.geom.LineString; import org.opentripplanner.astar.model.GraphPath; -import org.opentripplanner.core.domain.model.basic.Cost; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.LocalizedString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.LocalizedString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.ext.carpooling.model.CarpoolLeg; import org.opentripplanner.ext.carpooling.routing.CarpoolAccessEgress; import org.opentripplanner.ext.carpooling.routing.EndpointLabel; diff --git a/application/src/ext/java/org/opentripplanner/ext/carpooling/internal/DefaultCarpoolingRepository.java b/application/src/ext/java/org/opentripplanner/ext/carpooling/internal/DefaultCarpoolingRepository.java index a4b88604223..0287aaa965a 100644 --- a/application/src/ext/java/org/opentripplanner/ext/carpooling/internal/DefaultCarpoolingRepository.java +++ b/application/src/ext/java/org/opentripplanner/ext/carpooling/internal/DefaultCarpoolingRepository.java @@ -8,7 +8,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.CarpoolingRepository; import org.opentripplanner.ext.carpooling.model.CarpoolTrip; import org.opentripplanner.ext.carpooling.routing.CarpoolTripWithVertices; diff --git a/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolLeg.java b/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolLeg.java index 0c7372c0914..aeddbf24b91 100644 --- a/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolLeg.java +++ b/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolLeg.java @@ -8,8 +8,8 @@ import java.util.Set; import javax.annotation.Nullable; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.fare.FareOffer; import org.opentripplanner.model.plan.Emission; diff --git a/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolStop.java b/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolStop.java index 8c3b3416d72..e555fa505ba 100644 --- a/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolStop.java +++ b/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolStop.java @@ -4,7 +4,7 @@ import java.time.ZonedDateTime; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolStopBuilder.java b/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolStopBuilder.java index 8e4cdd0bbd7..c8b496f88a4 100755 --- a/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolStopBuilder.java +++ b/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolStopBuilder.java @@ -3,7 +3,7 @@ import java.time.Duration; import java.time.ZonedDateTime; import java.util.Objects; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; diff --git a/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolTripBuilder.java b/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolTripBuilder.java index 647bf3ddcdc..10e64a98bc8 100644 --- a/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolTripBuilder.java +++ b/application/src/ext/java/org/opentripplanner/ext/carpooling/model/CarpoolTripBuilder.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; import org.opentripplanner.transit.model.organization.ContactInfo; diff --git a/application/src/ext/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingService.java b/application/src/ext/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingService.java index e25dfb808ef..0eee4a174b7 100644 --- a/application/src/ext/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingService.java +++ b/application/src/ext/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingService.java @@ -10,7 +10,7 @@ import java.util.Objects; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.CarpoolingRepository; import org.opentripplanner.ext.carpooling.CarpoolingService; import org.opentripplanner.ext.carpooling.filter.CarpoolingRequest; diff --git a/application/src/ext/java/org/opentripplanner/ext/carpooling/updater/CarpoolSiriMapper.java b/application/src/ext/java/org/opentripplanner/ext/carpooling/updater/CarpoolSiriMapper.java index 88ea6dd6925..abff17b4399 100644 --- a/application/src/ext/java/org/opentripplanner/ext/carpooling/updater/CarpoolSiriMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/carpooling/updater/CarpoolSiriMapper.java @@ -15,7 +15,7 @@ import org.locationtech.jts.geom.GeometryFactory; import org.locationtech.jts.geom.LinearRing; import org.locationtech.jts.geom.Polygon; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.model.CarpoolStop; import org.opentripplanner.ext.carpooling.model.CarpoolTrip; import org.opentripplanner.ext.carpooling.model.CarpoolTripBuilder; diff --git a/application/src/ext/java/org/opentripplanner/ext/carpooling/updater/SiriETCarpoolingUpdater.java b/application/src/ext/java/org/opentripplanner/ext/carpooling/updater/SiriETCarpoolingUpdater.java index 6dadd07d410..5822e46064c 100644 --- a/application/src/ext/java/org/opentripplanner/ext/carpooling/updater/SiriETCarpoolingUpdater.java +++ b/application/src/ext/java/org/opentripplanner/ext/carpooling/updater/SiriETCarpoolingUpdater.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.CarpoolingRepository; import org.opentripplanner.ext.carpooling.model.CarpoolTrip; import org.opentripplanner.ext.carpooling.routing.CarpoolTripVertexResolver; diff --git a/application/src/ext/java/org/opentripplanner/ext/edgenaming/CrosswalkNamer.java b/application/src/ext/java/org/opentripplanner/ext/edgenaming/CrosswalkNamer.java index 7a50245fe6d..5f505007238 100644 --- a/application/src/ext/java/org/opentripplanner/ext/edgenaming/CrosswalkNamer.java +++ b/application/src/ext/java/org/opentripplanner/ext/edgenaming/CrosswalkNamer.java @@ -8,8 +8,8 @@ import java.util.Optional; import java.util.Set; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.LocalizedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.LocalizedString; import org.opentripplanner.graph_builder.module.osm.EdgeNamer; import org.opentripplanner.graph_builder.module.osm.model.StreetEdgePair; import org.opentripplanner.graph_builder.module.osm.storage.OsmDatabase; diff --git a/application/src/ext/java/org/opentripplanner/ext/edgenaming/PortlandCustomNamer.java b/application/src/ext/java/org/opentripplanner/ext/edgenaming/PortlandCustomNamer.java index 979e3779c08..47ea131328f 100644 --- a/application/src/ext/java/org/opentripplanner/ext/edgenaming/PortlandCustomNamer.java +++ b/application/src/ext/java/org/opentripplanner/ext/edgenaming/PortlandCustomNamer.java @@ -1,8 +1,8 @@ package org.opentripplanner.ext.edgenaming; import java.util.HashSet; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.graph_builder.module.osm.EdgeNamer; import org.opentripplanner.graph_builder.module.osm.model.StreetEdgePair; import org.opentripplanner.graph_builder.module.osm.storage.OsmDatabase; diff --git a/application/src/ext/java/org/opentripplanner/ext/edgenaming/SidewalkCrosswalkNamer.java b/application/src/ext/java/org/opentripplanner/ext/edgenaming/SidewalkCrosswalkNamer.java index 444b11b3bb7..71e9b45b511 100644 --- a/application/src/ext/java/org/opentripplanner/ext/edgenaming/SidewalkCrosswalkNamer.java +++ b/application/src/ext/java/org/opentripplanner/ext/edgenaming/SidewalkCrosswalkNamer.java @@ -1,6 +1,6 @@ package org.opentripplanner.ext.edgenaming; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.graph_builder.module.osm.EdgeNamer; import org.opentripplanner.graph_builder.module.osm.model.StreetEdgePair; import org.opentripplanner.graph_builder.module.osm.storage.OsmDatabase; diff --git a/application/src/ext/java/org/opentripplanner/ext/edgenaming/SidewalkNamer.java b/application/src/ext/java/org/opentripplanner/ext/edgenaming/SidewalkNamer.java index 5bb4ee5a8f1..b85a074201c 100644 --- a/application/src/ext/java/org/opentripplanner/ext/edgenaming/SidewalkNamer.java +++ b/application/src/ext/java/org/opentripplanner/ext/edgenaming/SidewalkNamer.java @@ -13,7 +13,7 @@ import org.locationtech.jts.geom.LineString; import org.locationtech.jts.geom.MultiLineString; import org.locationtech.jts.geom.Point; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.graph_builder.module.osm.EdgeNamer; import org.opentripplanner.graph_builder.module.osm.model.StreetEdgePair; import org.opentripplanner.graph_builder.module.osm.storage.OsmDatabase; diff --git a/application/src/ext/java/org/opentripplanner/ext/emission/EmissionRepository.java b/application/src/ext/java/org/opentripplanner/ext/emission/EmissionRepository.java index e08cd43d6b2..3ad23a66d8e 100644 --- a/application/src/ext/java/org/opentripplanner/ext/emission/EmissionRepository.java +++ b/application/src/ext/java/org/opentripplanner/ext/emission/EmissionRepository.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.Map; import java.util.Optional; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.emission.model.EmissionSummary; import org.opentripplanner.ext.emission.model.TripPatternEmission; import org.opentripplanner.framework.model.Gram; diff --git a/application/src/ext/java/org/opentripplanner/ext/emission/internal/DefaultEmissionRepository.java b/application/src/ext/java/org/opentripplanner/ext/emission/internal/DefaultEmissionRepository.java index e8faf2501fa..0e01a2fe9c9 100644 --- a/application/src/ext/java/org/opentripplanner/ext/emission/internal/DefaultEmissionRepository.java +++ b/application/src/ext/java/org/opentripplanner/ext/emission/internal/DefaultEmissionRepository.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.emission.EmissionRepository; import org.opentripplanner.ext.emission.model.EmissionSummary; import org.opentripplanner.ext.emission.model.TripPatternEmission; diff --git a/application/src/ext/java/org/opentripplanner/ext/emission/internal/csvdata/route/RouteDataReader.java b/application/src/ext/java/org/opentripplanner/ext/emission/internal/csvdata/route/RouteDataReader.java index a46e3b1d539..d0587c0e9c1 100644 --- a/application/src/ext/java/org/opentripplanner/ext/emission/internal/csvdata/route/RouteDataReader.java +++ b/application/src/ext/java/org/opentripplanner/ext/emission/internal/csvdata/route/RouteDataReader.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.function.Consumer; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.datastore.api.DataSource; import org.opentripplanner.framework.csv.HeadersDoNotMatch; import org.opentripplanner.framework.csv.OtpCsvReader; diff --git a/application/src/ext/java/org/opentripplanner/ext/emission/internal/csvdata/trip/EmissionAggregator.java b/application/src/ext/java/org/opentripplanner/ext/emission/internal/csvdata/trip/EmissionAggregator.java index e826cb7c980..c8ea3129e99 100644 --- a/application/src/ext/java/org/opentripplanner/ext/emission/internal/csvdata/trip/EmissionAggregator.java +++ b/application/src/ext/java/org/opentripplanner/ext/emission/internal/csvdata/trip/EmissionAggregator.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.emission.model.TripPatternEmission; import org.opentripplanner.framework.error.OtpError; import org.opentripplanner.framework.error.WordList; diff --git a/application/src/ext/java/org/opentripplanner/ext/emission/internal/csvdata/trip/TripHopMapper.java b/application/src/ext/java/org/opentripplanner/ext/emission/internal/csvdata/trip/TripHopMapper.java index c087db7f4f7..19827005890 100644 --- a/application/src/ext/java/org/opentripplanner/ext/emission/internal/csvdata/trip/TripHopMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/emission/internal/csvdata/trip/TripHopMapper.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.emission.model.TripPatternEmission; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.transit.model.site.StopLocation; diff --git a/application/src/ext/java/org/opentripplanner/ext/emission/internal/graphbuilder/EmissionGraphBuilder.java b/application/src/ext/java/org/opentripplanner/ext/emission/internal/graphbuilder/EmissionGraphBuilder.java index 0329cc2895c..5b534bd5fdf 100644 --- a/application/src/ext/java/org/opentripplanner/ext/emission/internal/graphbuilder/EmissionGraphBuilder.java +++ b/application/src/ext/java/org/opentripplanner/ext/emission/internal/graphbuilder/EmissionGraphBuilder.java @@ -3,7 +3,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.emission.EmissionRepository; import org.opentripplanner.ext.emission.internal.csvdata.EmissionDataReader; import org.opentripplanner.ext.emission.internal.csvdata.trip.TripHopMapper; diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayRepository.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayRepository.java index 20fb02ec48c..1fe84b49e4f 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayRepository.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayRepository.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.time.LocalDate; import java.util.Optional; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.model.EmpiricalDelay; import org.opentripplanner.ext.empiricaldelay.model.TripDelays; import org.opentripplanner.ext.empiricaldelay.model.calendar.EmpiricalDelayCalendar; diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayService.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayService.java index e187fe930c3..a7de9a3f35e 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayService.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/EmpiricalDelayService.java @@ -2,7 +2,7 @@ import java.time.LocalDate; import java.util.Optional; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.model.EmpiricalDelay; import org.opentripplanner.utils.lang.Sandbox; diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/configure/EmpiricalDelayGraphBuilderModule.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/configure/EmpiricalDelayGraphBuilderModule.java index 572942529ef..2dfc277d141 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/configure/EmpiricalDelayGraphBuilderModule.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/configure/EmpiricalDelayGraphBuilderModule.java @@ -4,7 +4,7 @@ import dagger.Provides; import jakarta.inject.Singleton; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; import org.opentripplanner.ext.empiricaldelay.EmpiricalDelayRepository; import org.opentripplanner.ext.empiricaldelay.internal.graphbuilder.EmpiricalDelayGraphBuilder; import org.opentripplanner.framework.application.OTPFeature; diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/DefaultEmpiricalDelayRepository.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/DefaultEmpiricalDelayRepository.java index e1a242a3e24..70f714aa3b5 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/DefaultEmpiricalDelayRepository.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/DefaultEmpiricalDelayRepository.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.EmpiricalDelayRepository; import org.opentripplanner.ext.empiricaldelay.internal.model.EmpiricalDelaySummary; import org.opentripplanner.ext.empiricaldelay.model.EmpiricalDelay; diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/DefaultEmpiricalDelayService.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/DefaultEmpiricalDelayService.java index 951e55087f9..d052ce65a97 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/DefaultEmpiricalDelayService.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/DefaultEmpiricalDelayService.java @@ -3,7 +3,7 @@ import java.time.LocalDate; import java.util.Objects; import java.util.Optional; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.EmpiricalDelayRepository; import org.opentripplanner.ext.empiricaldelay.EmpiricalDelayService; import org.opentripplanner.ext.empiricaldelay.model.EmpiricalDelay; diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/EmpiricalDelayCsvDataReader.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/EmpiricalDelayCsvDataReader.java index 7c670ad0d5c..2df29246943 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/EmpiricalDelayCsvDataReader.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/EmpiricalDelayCsvDataReader.java @@ -5,7 +5,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.datastore.api.CompositeDataSource; import org.opentripplanner.datastore.api.DataSource; import org.opentripplanner.ext.empiricaldelay.internal.csvinput.calendar.CalendarCsvParser; diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/delay/TripTimeDelayCsvParser.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/delay/TripTimeDelayCsvParser.java index 7a38ad24282..cf09f0487e9 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/delay/TripTimeDelayCsvParser.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/delay/TripTimeDelayCsvParser.java @@ -4,7 +4,7 @@ import java.time.Duration; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.csv.parser.AbstractCsvParser; import org.opentripplanner.framework.csv.parser.HandledCsvParseException; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/delay/TripTimeDelayRow.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/delay/TripTimeDelayRow.java index cb1be9c6da7..2e12291285e 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/delay/TripTimeDelayRow.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/delay/TripTimeDelayRow.java @@ -1,6 +1,6 @@ package org.opentripplanner.ext.empiricaldelay.internal.csvinput.delay; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** * An empirical dealy trip time csv file row. diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/graphbuilder/EmpiricalDelayGraphBuilder.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/graphbuilder/EmpiricalDelayGraphBuilder.java index d4ac9ddbc47..f340463fa92 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/graphbuilder/EmpiricalDelayGraphBuilder.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/graphbuilder/EmpiricalDelayGraphBuilder.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.EmpiricalDelayRepository; import org.opentripplanner.ext.empiricaldelay.internal.csvinput.EmpiricalDelayCsvDataReader; import org.opentripplanner.ext.empiricaldelay.internal.model.TripDelaysAgregator; diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/graphbuilder/TripDelaysMapper.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/graphbuilder/TripDelaysMapper.java index e81e22b5880..3588a9db260 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/graphbuilder/TripDelaysMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/graphbuilder/TripDelaysMapper.java @@ -6,8 +6,8 @@ import java.util.Map; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.internal.model.DelayAtStopDto; import org.opentripplanner.ext.empiricaldelay.internal.model.TripDelaysAgregator; import org.opentripplanner.ext.empiricaldelay.model.EmpiricalDelay; diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/model/DelayAtStopDto.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/model/DelayAtStopDto.java index 36059c4d245..cf1dc65a4c1 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/model/DelayAtStopDto.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/model/DelayAtStopDto.java @@ -1,6 +1,6 @@ package org.opentripplanner.ext.empiricaldelay.internal.model; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.model.EmpiricalDelay; public record DelayAtStopDto(int sequence, FeedScopedId stopId, EmpiricalDelay empiricalDelay) {} diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/model/EmpiricalDelaySummary.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/model/EmpiricalDelaySummary.java index c9415f03439..f32c507d37f 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/model/EmpiricalDelaySummary.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/model/EmpiricalDelaySummary.java @@ -4,7 +4,7 @@ import java.util.Locale; import java.util.Map; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** * Produce a report of imported emissions. diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/model/TripDelaysAgregator.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/model/TripDelaysAgregator.java index e622654172b..19c0874903f 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/model/TripDelaysAgregator.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/internal/model/TripDelaysAgregator.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.empiricaldelay.model.EmpiricalDelay; public class TripDelaysAgregator { diff --git a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/model/TripDelays.java b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/model/TripDelays.java index 791d6292187..f2c648fa6bb 100644 --- a/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/model/TripDelays.java +++ b/application/src/ext/java/org/opentripplanner/ext/empiricaldelay/model/TripDelays.java @@ -9,7 +9,7 @@ import java.util.Objects; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.utils.tostring.ToStringBuilder; /** Utility class to store trip-time delays for a given service id. */ diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareAttribute.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareAttribute.java index 953dbb0fc09..7e932add56a 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareAttribute.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareAttribute.java @@ -2,7 +2,7 @@ package org.opentripplanner.ext.fares.model; import java.util.Objects; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.Money; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareAttributeBuilder.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareAttributeBuilder.java index c61c95db3f5..ed215b2f447 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareAttributeBuilder.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareAttributeBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.ext.fares.model; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.Money; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareLegRule.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareLegRule.java index 0b408c99f37..6a41333227e 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareLegRule.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareLegRule.java @@ -9,7 +9,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.fare.FareProduct; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareLegRuleBuilder.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareLegRuleBuilder.java index 31c4e1b9c76..cab80662310 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareLegRuleBuilder.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareLegRuleBuilder.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.fare.FareProduct; /** diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareRuleSet.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareRuleSet.java index 1ada1f0654f..29742e98e7c 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareRuleSet.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareRuleSet.java @@ -4,7 +4,7 @@ import java.time.Duration; import java.util.HashSet; import java.util.Set; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; public class FareRuleSet implements Serializable { diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareRulesData.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareRulesData.java index 6cb41f45569..49d70a55904 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareRulesData.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareRulesData.java @@ -7,7 +7,7 @@ import java.time.LocalDate; import java.util.ArrayList; import java.util.List; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; public final class FareRulesData { diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareTransferRule.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareTransferRule.java index 17268fbac18..1ce5295ad97 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareTransferRule.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareTransferRule.java @@ -6,7 +6,7 @@ import java.util.Objects; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.fare.FareProduct; import org.opentripplanner.utils.lang.IntUtils; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareTransferRuleBuilder.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareTransferRuleBuilder.java index 095edf9b266..9b219477485 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/model/FareTransferRuleBuilder.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/model/FareTransferRuleBuilder.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.fare.FareProduct; public class FareTransferRuleBuilder { diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/model/Timeframe.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/Timeframe.java index 8948cfcdf73..e53619f6c4e 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/model/Timeframe.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/model/Timeframe.java @@ -4,7 +4,7 @@ import java.io.Serializable; import java.time.LocalTime; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.utils.tostring.ValueObjectToStringBuilder; /** diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/model/TimeframeBuilder.java b/application/src/ext/java/org/opentripplanner/ext/fares/model/TimeframeBuilder.java index 349fc7b3647..e5cc6494e2a 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/model/TimeframeBuilder.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/model/TimeframeBuilder.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.fares.model; import java.time.LocalTime; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; public class TimeframeBuilder { diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/DefaultFareService.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/DefaultFareService.java index db3b086af16..e6d7e788c70 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/DefaultFareService.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/DefaultFareService.java @@ -16,7 +16,7 @@ import java.util.Set; import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareAttribute; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.ext.fares.service.gtfs.v1.custom.CombinedInterlinedTransitLeg; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/FareAndId.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/FareAndId.java index 689a4517f6e..49fa5bf239e 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/FareAndId.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/FareAndId.java @@ -1,6 +1,6 @@ package org.opentripplanner.ext.fares.service.gtfs.v1; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.Money; /** Holds fare and corresponding fareId */ diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/GtfsFareServiceFactory.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/GtfsFareServiceFactory.java index 60aff8bd837..4334a2104bd 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/GtfsFareServiceFactory.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/GtfsFareServiceFactory.java @@ -9,7 +9,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareAttribute; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareRule; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareService.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareService.java index 917a359409d..7b25d4be4ae 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareService.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareService.java @@ -15,7 +15,7 @@ import java.util.Set; import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.ext.fares.service.gtfs.v1.DefaultFareService; import org.opentripplanner.model.fare.FareProduct; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareServiceFactory.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareServiceFactory.java index 4a42e9250f6..35983699092 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareServiceFactory.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareServiceFactory.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.databind.JsonNode; import java.util.HashMap; import java.util.Map; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.ext.fares.model.FareRulesData; import org.opentripplanner.ext.fares.service.gtfs.v1.GtfsFareServiceFactory; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HSLFareServiceFactory.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HSLFareServiceFactory.java index d18cd456608..7572ad3f6b4 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HSLFareServiceFactory.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HSLFareServiceFactory.java @@ -2,7 +2,7 @@ import java.util.Collection; import java.util.Map; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareAttribute; import org.opentripplanner.ext.fares.model.FareRule; import org.opentripplanner.ext.fares.model.FareRuleSet; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HighestFareInFreeTransferWindowFareService.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HighestFareInFreeTransferWindowFareService.java index 434f5440bc4..a1fb923722a 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HighestFareInFreeTransferWindowFareService.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HighestFareInFreeTransferWindowFareService.java @@ -5,7 +5,7 @@ import java.util.Currency; import java.util.List; import java.util.Optional; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.ext.fares.service.gtfs.v1.DefaultFareService; import org.opentripplanner.model.fare.FareProduct; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HighestFareInFreeTransferWindowFareServiceFactory.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HighestFareInFreeTransferWindowFareServiceFactory.java index 54e6f94681b..61eb89dd3d0 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HighestFareInFreeTransferWindowFareServiceFactory.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HighestFareInFreeTransferWindowFareServiceFactory.java @@ -6,7 +6,7 @@ import java.time.Duration; import java.util.HashMap; import java.util.Map; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.ext.fares.model.FareRulesData; import org.opentripplanner.ext.fares.service.gtfs.v1.GtfsFareServiceFactory; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareFactory.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareFactory.java index 7e58ac26611..988297745ce 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareFactory.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareFactory.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.databind.JsonNode; import java.util.HashMap; import java.util.Map; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.ext.fares.model.FareRulesData; import org.opentripplanner.ext.fares.service.gtfs.v1.GtfsFareServiceFactory; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java index 40d662faa34..df5f6433594 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java @@ -14,8 +14,8 @@ import java.util.Set; import java.util.UUID; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.ext.fares.service.gtfs.v1.DefaultFareService; import org.opentripplanner.model.fare.FareMedium; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/AreaMatcher.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/AreaMatcher.java index 568bef8e229..a6b60cda5b8 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/AreaMatcher.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/AreaMatcher.java @@ -10,7 +10,7 @@ import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.transit.model.site.StopLocation; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/FareLookupService.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/FareLookupService.java index 81418257eb5..33d14d9e430 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/FareLookupService.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/FareLookupService.java @@ -12,7 +12,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTransferRule; import org.opentripplanner.model.fare.FareOffer; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2Service.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2Service.java index 7785bbc05c8..9f9b20625cf 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2Service.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2Service.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTransferRule; import org.opentripplanner.model.fare.FareOffer; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2ServiceBuilder.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2ServiceBuilder.java index 98b74719a9a..13f61cb84ef 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2ServiceBuilder.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/GtfsFaresV2ServiceBuilder.java @@ -8,7 +8,7 @@ import java.time.LocalDate; import java.util.Arrays; import java.util.List; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTransferRule; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/NetworkMatcher.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/NetworkMatcher.java index 519eba569bc..29822bbc891 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/NetworkMatcher.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/NetworkMatcher.java @@ -5,7 +5,7 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.model.plan.TransitLeg; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/TimeframeMatcher.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/TimeframeMatcher.java index ba22f850b9a..357aa270c4c 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/TimeframeMatcher.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/TimeframeMatcher.java @@ -5,7 +5,7 @@ import java.time.LocalDate; import java.time.ZonedDateTime; import java.util.Collection; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.Timeframe; import org.opentripplanner.model.plan.TransitLeg; diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/custom/OregonHopFareFactory.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/custom/OregonHopFareFactory.java index 0bff4d84dda..9e248512713 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/custom/OregonHopFareFactory.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v2/custom/OregonHopFareFactory.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Optional; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.FareTransferRule; import org.opentripplanner.ext.fares.model.FareTransferRuleBuilder; 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 f2a37337dd8..94ffafdf714 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapper.java @@ -6,7 +6,7 @@ import java.util.stream.Stream; import org.locationtech.jts.geom.Point; import org.locationtech.jts.geom.prep.PreparedGeometryFactory; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.model.GraphBuilderModule; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.graph.Graph; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/FlexIndex.java b/application/src/ext/java/org/opentripplanner/ext/flex/FlexIndex.java index f1c50fea7cf..c8d4a7c6e0f 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/FlexIndex.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/FlexIndex.java @@ -9,7 +9,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.site.GroupStop; 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 0092f28c3dd..ef2f7ac2e0a 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Map; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.flexpathcalculator.DirectFlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.StreetFlexPathCalculator; 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 dc9398034bb..0e7371215a7 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java @@ -8,8 +8,8 @@ import java.util.Set; import javax.annotation.Nullable; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.ext.flex.edgetype.FlexTripEdge; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.fare.FareOffer; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java b/application/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java index a58e17eff94..52d40bc0ccc 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java @@ -3,8 +3,8 @@ import java.time.LocalDate; import java.util.Objects; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPath; import org.opentripplanner.ext.flex.trip.FlexTrip; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/filter/FilterMapper.java b/application/src/ext/java/org/opentripplanner/ext/flex/filter/FilterMapper.java index 35f2bdb06af..68c7e52ba5b 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/filter/FilterMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/filter/FilterMapper.java @@ -2,7 +2,7 @@ import java.util.ArrayList; import java.util.List; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.modes.ExcludeAllTransitFilter; import org.opentripplanner.routing.api.request.request.filter.AllowAllTransitFilter; import org.opentripplanner.routing.api.request.request.filter.TransitFilter; 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 ce40eb85ec4..3fd7b93473f 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 @@ -7,7 +7,7 @@ import java.util.Objects; import java.util.stream.Stream; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.FlexAccessEgress; import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.ext.flex.FlexPathDurations; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackAdapter.java b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackAdapter.java index c14e730edf1..4c47b920907 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackAdapter.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackAdapter.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.flex.template; import java.util.Collection; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.street.model.vertex.TransitStopVertex; import org.opentripplanner.transfer.regular.model.PathTransfer; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java index 43857641a8e..29ad26bf544 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java @@ -2,7 +2,7 @@ import java.util.Collection; import java.util.List; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.ext.flex.FlexPathDurations; import org.opentripplanner.ext.flex.edgetype.FlexTripEdge; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java index 595b86bafbd..b719567b303 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java @@ -8,7 +8,7 @@ import java.util.Collection; import java.util.List; import java.util.Optional; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.place.api.NearbyStop; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java index caa3999b18b..78adc0696e5 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java @@ -2,7 +2,7 @@ import java.util.Collection; import java.util.List; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.ext.flex.FlexPathDurations; import org.opentripplanner.ext.flex.edgetype.FlexTripEdge; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java b/application/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java index 07956e14544..0bbcaccab3e 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Objects; import java.util.Set; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTripBuilder.java b/application/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTripBuilder.java index 3468151868f..5dd1e447bcb 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTripBuilder.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTripBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.ext.flex.trip; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; import org.opentripplanner.transit.model.timetable.Trip; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java b/application/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java index 7ec27df09fa..25fef4bc52b 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.ScheduledFlexPathCalculator; import org.opentripplanner.model.PickDrop; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripBuilder.java b/application/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripBuilder.java index f81a342d6f2..ce7a4aca14f 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripBuilder.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripBuilder.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.flex.trip; import java.util.List; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.StopTime; public class ScheduledDeviatedTripBuilder 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 218dfbed20b..410effd8397 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 @@ -9,7 +9,7 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.TimePenaltyCalculator; import org.opentripplanner.model.PickDrop; diff --git a/application/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java b/application/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java index 87124d32970..2a2405afa6d 100644 --- a/application/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java +++ b/application/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.flex.trip; import java.util.List; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.StopTime; import org.opentripplanner.routing.api.request.framework.TimePenalty; 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 ee7bf6e7dc9..5b4f752f6af 100644 --- a/application/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java +++ b/application/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java @@ -44,8 +44,8 @@ import org.apache.lucene.search.suggest.document.ContextSuggestField; import org.apache.lucene.search.suggest.document.SuggestIndexSearcher; import org.apache.lucene.store.ByteBuffersDirectory; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.stopconsolidation.StopConsolidationService; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.site.StopType; diff --git a/application/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java b/application/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java index 8208f9eab0e..60b4677a8dc 100644 --- a/application/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java +++ b/application/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.geocoder; import java.util.Collection; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; /** * A package-private helper type for transporting data before serializing. diff --git a/application/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java b/application/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java index 413ae8af308..1e8faf1cd9a 100644 --- a/application/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java +++ b/application/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** * A result of a fuzzy stop cluster geocoding search. A cluster is defined as a group of stops that 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 7ac32fe75b8..871cdf556e3 100644 --- a/application/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java @@ -11,8 +11,8 @@ import java.util.Optional; import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.stopconsolidation.StopConsolidationService; import org.opentripplanner.ext.stopconsolidation.model.StopReplacement; import org.opentripplanner.model.FeedInfo; diff --git a/application/src/ext/java/org/opentripplanner/ext/ojp/mapping/FilterMapper.java b/application/src/ext/java/org/opentripplanner/ext/ojp/mapping/FilterMapper.java index c4a5f5987f3..27c29ec3044 100644 --- a/application/src/ext/java/org/opentripplanner/ext/ojp/mapping/FilterMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/ojp/mapping/FilterMapper.java @@ -14,7 +14,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import org.opentripplanner.api.model.transit.FeedScopedIdMapper; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; class FilterMapper { diff --git a/application/src/ext/java/org/opentripplanner/ext/ojp/mapping/StopEventParamsMapper.java b/application/src/ext/java/org/opentripplanner/ext/ojp/mapping/StopEventParamsMapper.java index 433ffcade77..ac62322332d 100644 --- a/application/src/ext/java/org/opentripplanner/ext/ojp/mapping/StopEventParamsMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/ojp/mapping/StopEventParamsMapper.java @@ -20,7 +20,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import org.opentripplanner.api.model.transit.FeedScopedIdMapper; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.ojp.service.CallAtStopService; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.service.ArrivalDeparture; diff --git a/application/src/ext/java/org/opentripplanner/ext/ojp/mapping/TextMapper.java b/application/src/ext/java/org/opentripplanner/ext/ojp/mapping/TextMapper.java index 2baf268c182..7f1334b60a9 100644 --- a/application/src/ext/java/org/opentripplanner/ext/ojp/mapping/TextMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/ojp/mapping/TextMapper.java @@ -3,7 +3,7 @@ import de.vdv.ojp20.InternationalTextStructure; import de.vdv.ojp20.siri.DefaultedTextStructure; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; class TextMapper { diff --git a/application/src/ext/java/org/opentripplanner/ext/ojp/service/CallAtStopService.java b/application/src/ext/java/org/opentripplanner/ext/ojp/service/CallAtStopService.java index 77a08380dae..611aa88c289 100644 --- a/application/src/ext/java/org/opentripplanner/ext/ojp/service/CallAtStopService.java +++ b/application/src/ext/java/org/opentripplanner/ext/ojp/service/CallAtStopService.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Optional; import java.util.Set; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.FeedInfo; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.place.NearbyStopFinder; diff --git a/application/src/ext/java/org/opentripplanner/ext/ojp/service/OjpService.java b/application/src/ext/java/org/opentripplanner/ext/ojp/service/OjpService.java index b6766ab6b8a..64f4794c2f8 100644 --- a/application/src/ext/java/org/opentripplanner/ext/ojp/service/OjpService.java +++ b/application/src/ext/java/org/opentripplanner/ext/ojp/service/OjpService.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Optional; import org.opentripplanner.api.model.transit.FeedScopedIdMapper; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.ojp.mapping.RouteRequestMapper; import org.opentripplanner.ext.ojp.mapping.StopEventParamsMapper; import org.opentripplanner.ext.ojp.mapping.StopEventResponseMapper; diff --git a/application/src/ext/java/org/opentripplanner/ext/parkAndRideApi/ParkAndRideResource.java b/application/src/ext/java/org/opentripplanner/ext/parkAndRideApi/ParkAndRideResource.java index 1369b95792a..f95bd6fd8c2 100644 --- a/application/src/ext/java/org/opentripplanner/ext/parkAndRideApi/ParkAndRideResource.java +++ b/application/src/ext/java/org/opentripplanner/ext/parkAndRideApi/ParkAndRideResource.java @@ -11,7 +11,7 @@ import jakarta.ws.rs.core.Response.Status; import java.util.Optional; import org.locationtech.jts.geom.Envelope; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.place.NearbyStopFinder; import org.opentripplanner.place.nearbystopfinder.StraightLineNearbyStopFinder; import org.opentripplanner.service.vehicleparking.VehicleParkingService; 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 a035b4d8602..a886ebf4401 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 @@ -4,7 +4,7 @@ import java.util.List; import java.util.Optional; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.street.geometry.SphericalDistanceLibrary; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transfer.constrained.model.ConstrainedTransfer; diff --git a/application/src/ext/java/org/opentripplanner/ext/sorlandsbanen/SorlandsbanenNorwayService.java b/application/src/ext/java/org/opentripplanner/ext/sorlandsbanen/SorlandsbanenNorwayService.java index 1871b6657b0..a9abf3f017a 100644 --- a/application/src/ext/java/org/opentripplanner/ext/sorlandsbanen/SorlandsbanenNorwayService.java +++ b/application/src/ext/java/org/opentripplanner/ext/sorlandsbanen/SorlandsbanenNorwayService.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.function.BiFunction; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.raptor.api.path.RaptorPath; import org.opentripplanner.raptor.extensions.extrasearch.ExtraMcRouterSearch; diff --git a/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationParser.java b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationParser.java index 17badfeb583..2adddd62128 100644 --- a/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationParser.java +++ b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationParser.java @@ -10,7 +10,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.commons.lang3.BooleanUtils; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.stopconsolidation.model.ConsolidatedStopGroup; public class StopConsolidationParser { diff --git a/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java index 4c63671572e..d294b0f5772 100644 --- a/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java +++ b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.stopconsolidation.model.StopReplacement; import org.opentripplanner.transit.model.organization.Agency; import org.opentripplanner.transit.model.site.StopLocation; diff --git a/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java index d1c7763d1b0..706e60caf82 100644 --- a/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java +++ b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java @@ -5,7 +5,7 @@ import java.util.Optional; import java.util.stream.Stream; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.stopconsolidation.StopConsolidationRepository; import org.opentripplanner.ext.stopconsolidation.StopConsolidationService; import org.opentripplanner.ext.stopconsolidation.model.ConsolidatedStopGroup; diff --git a/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopGroup.java b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopGroup.java index 0c5f2f6eaa4..6303db70dcf 100644 --- a/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopGroup.java +++ b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopGroup.java @@ -1,6 +1,6 @@ package org.opentripplanner.ext.stopconsolidation.model; import java.util.Collection; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; public record ConsolidatedStopGroup(FeedScopedId primary, Collection secondaries) {} diff --git a/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/StopReplacement.java b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/StopReplacement.java index 6fc2f20ea15..1fa46d707f7 100644 --- a/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/StopReplacement.java +++ b/application/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/StopReplacement.java @@ -1,6 +1,6 @@ package org.opentripplanner.ext.stopconsolidation.model; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.site.StopLocation; public record StopReplacement(StopLocation primary, FeedScopedId secondary) {} diff --git a/application/src/ext/java/org/opentripplanner/ext/transferanalyzer/DirectTransferAnalyzer.java b/application/src/ext/java/org/opentripplanner/ext/transferanalyzer/DirectTransferAnalyzer.java index 2675a96a901..51b0a8b7818 100644 --- a/application/src/ext/java/org/opentripplanner/ext/transferanalyzer/DirectTransferAnalyzer.java +++ b/application/src/ext/java/org/opentripplanner/ext/transferanalyzer/DirectTransferAnalyzer.java @@ -9,7 +9,7 @@ import java.util.Objects; import java.util.stream.Collectors; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.transferanalyzer.annotations.TransferCouldNotBeRouted; import org.opentripplanner.ext.transferanalyzer.annotations.TransferRoutingDistanceTooLong; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; diff --git a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/LayerFilters.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/LayerFilters.java index 7fe5eaf8c15..9a1509db7b5 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/LayerFilters.java +++ b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/LayerFilters.java @@ -8,7 +8,7 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; -import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.model.time.LocalDateRange; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.timetable.Trip; diff --git a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapper.java index 18044e13346..7aa99cccab7 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapper.java @@ -7,7 +7,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; +import org.opentripplanner.core.model.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.site.AreaStop; diff --git a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapper.java index 061143408d2..91630f2436b 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapper.java @@ -9,8 +9,8 @@ import java.util.Locale; import java.util.stream.Collectors; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NStringMapper; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.json.ObjectMappers; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.transit.model.site.Station; 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 5b90bd98b97..c60123e0ad5 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 @@ -10,7 +10,7 @@ import java.util.List; import java.util.Locale; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; +import org.opentripplanner.core.model.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.routing.alertpatch.AlertEffect; import org.opentripplanner.routing.alertpatch.TransitAlert; diff --git a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java index 567df688dae..fa1bb3a0a26 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java @@ -11,7 +11,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; +import org.opentripplanner.core.model.i18n.I18NStringMapper; import org.opentripplanner.framework.json.ObjectMappers; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.transit.model.network.TripPattern; diff --git a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingGroupPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingGroupPropertyMapper.java index c026fb6b8ed..93835c4bad0 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingGroupPropertyMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingGroupPropertyMapper.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Locale; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; +import org.opentripplanner.core.model.i18n.I18NStringMapper; import org.opentripplanner.framework.json.ObjectMappers; import org.opentripplanner.inspector.vector.KeyValue; diff --git a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingPropertyMapper.java index cc1eb92a2c5..2c31e5291c7 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingPropertyMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingPropertyMapper.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Locale; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; +import org.opentripplanner.core.model.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.service.vehicleparking.model.VehicleParking; diff --git a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/StadtnaviVehicleParkingPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/StadtnaviVehicleParkingPropertyMapper.java index 42437cfe39a..772dd13c98f 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/StadtnaviVehicleParkingPropertyMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/StadtnaviVehicleParkingPropertyMapper.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Locale; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; +import org.opentripplanner.core.model.i18n.I18NStringMapper; import org.opentripplanner.framework.json.ObjectMappers; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.service.vehicleparking.model.VehicleParking; diff --git a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRealtimeVehicleRentalStationPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRealtimeVehicleRentalStationPropertyMapper.java index 26232c6a88f..d513797122f 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRealtimeVehicleRentalStationPropertyMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRealtimeVehicleRentalStationPropertyMapper.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Locale; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; +import org.opentripplanner.core.model.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation; diff --git a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalPropertyMapper.java index 297aa1b3f41..b1e4b3b15c5 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalPropertyMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalPropertyMapper.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Locale; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; +import org.opentripplanner.core.model.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; diff --git a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalStationPropertyMapper.java b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalStationPropertyMapper.java index 3512e9dfcc0..be4d13d2927 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalStationPropertyMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalStationPropertyMapper.java @@ -6,7 +6,7 @@ import java.util.Locale; import java.util.stream.Collectors; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; +import org.opentripplanner.core.model.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation; 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 290bd33026d..4d4c4ec4952 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 @@ -4,8 +4,8 @@ import com.fasterxml.jackson.databind.ObjectReader; import java.io.IOException; import java.util.List; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.json.ObjectMappers; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehicleparking.model.VehicleParkingSpaces; diff --git a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java index a9ec17f629f..201eda154c3 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java +++ b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java @@ -13,9 +13,9 @@ import java.util.Objects; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.LocalizedString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.LocalizedString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.io.OtpHttpClient; import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.framework.json.ObjectMappers; diff --git a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiFacilitiesDownloader.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiFacilitiesDownloader.java index 5552f96bb5f..764fa0314be 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiFacilitiesDownloader.java +++ b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiFacilitiesDownloader.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Map; import java.util.function.BiFunction; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.io.HttpHeaders; import org.opentripplanner.framework.io.OtpHttpClient; import org.opentripplanner.framework.io.OtpHttpClientException; diff --git a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiHubToVehicleParkingGroupMapper.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiHubToVehicleParkingGroupMapper.java index f4e5d4d3438..86fdc8af4ee 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiHubToVehicleParkingGroupMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiHubToVehicleParkingGroupMapper.java @@ -8,10 +8,10 @@ import java.util.List; import java.util.Map; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.i18n.TranslatedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.TranslatedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehicleparking.model.VehicleParkingGroup; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiHubsDownloader.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiHubsDownloader.java index 84083a06a75..6507500c63f 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiHubsDownloader.java +++ b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiHubsDownloader.java @@ -9,7 +9,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.io.HttpHeaders; import org.opentripplanner.framework.io.OtpHttpClient; import org.opentripplanner.framework.io.OtpHttpClientException; diff --git a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiParkPatch.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiParkPatch.java index 98d404ad6d4..d4acc13c4be 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiParkPatch.java +++ b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiParkPatch.java @@ -1,6 +1,6 @@ package org.opentripplanner.ext.vehicleparking.liipi; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** * Contains updates to a {@link LiipiParkUpdater} park. diff --git a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiParkToVehicleParkingMapper.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiParkToVehicleParkingMapper.java index f512eda5196..e818e4b58a0 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiParkToVehicleParkingMapper.java +++ b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiParkToVehicleParkingMapper.java @@ -12,10 +12,10 @@ import java.util.Map; import java.util.Optional; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.i18n.TranslatedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.TranslatedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehicleparking.model.VehicleParkingGroup; import org.opentripplanner.service.vehicleparking.model.VehicleParkingSpaces; diff --git a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiParkUpdater.java b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiParkUpdater.java index d042091f4ce..0525ab9e8c3 100644 --- a/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiParkUpdater.java +++ b/application/src/ext/java/org/opentripplanner/ext/vehicleparking/liipi/LiipiParkUpdater.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.io.HttpHeaders; import org.opentripplanner.framework.io.JsonDataListDownloader; import org.opentripplanner.framework.io.OtpHttpClientFactory; 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 ac6c29bcf75..8aaf6e286ad 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 @@ -8,10 +8,10 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.i18n.TranslatedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.TranslatedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.osm.OsmOpeningHoursParser; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehicleparking.model.VehicleParkingSpaces; 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 fbfa3e14b28..b0257510d1d 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 @@ -5,7 +5,7 @@ import java.util.List; import java.util.stream.Stream; import org.entur.siri21.util.SiriXml; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.io.HttpHeaders; import org.opentripplanner.framework.io.OtpHttpClient; import org.opentripplanner.framework.io.OtpHttpClientFactory; diff --git a/application/src/main/java/org/opentripplanner/api/common/LocationStringParser.java b/application/src/main/java/org/opentripplanner/api/common/LocationStringParser.java index 44c37d61617..54d6b5c5a86 100644 --- a/application/src/main/java/org/opentripplanner/api/common/LocationStringParser.java +++ b/application/src/main/java/org/opentripplanner/api/common/LocationStringParser.java @@ -3,7 +3,7 @@ import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.GenericLocation; /** diff --git a/application/src/main/java/org/opentripplanner/api/common/Message.java b/application/src/main/java/org/opentripplanner/api/common/Message.java index 24dfaf87bca..c257f85d045 100644 --- a/application/src/main/java/org/opentripplanner/api/common/Message.java +++ b/application/src/main/java/org/opentripplanner/api/common/Message.java @@ -1,7 +1,7 @@ package org.opentripplanner.api.common; import java.util.Locale; -import org.opentripplanner.core.domain.framework.resources.ResourceBundleAdaptor; +import org.opentripplanner.core.model.resources.ResourceBundleAdaptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/application/src/main/java/org/opentripplanner/api/model/transit/DefaultFeedIdMapper.java b/application/src/main/java/org/opentripplanner/api/model/transit/DefaultFeedIdMapper.java index ca6876f0141..0d8efbb1cd0 100644 --- a/application/src/main/java/org/opentripplanner/api/model/transit/DefaultFeedIdMapper.java +++ b/application/src/main/java/org/opentripplanner/api/model/transit/DefaultFeedIdMapper.java @@ -1,7 +1,7 @@ package org.opentripplanner.api.model.transit; import java.util.Optional; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** * An id mapper that passes input and output ids through with the feed id. diff --git a/application/src/main/java/org/opentripplanner/api/model/transit/FeedScopedIdMapper.java b/application/src/main/java/org/opentripplanner/api/model/transit/FeedScopedIdMapper.java index 5afe31bd5fc..b39a01b603b 100644 --- a/application/src/main/java/org/opentripplanner/api/model/transit/FeedScopedIdMapper.java +++ b/application/src/main/java/org/opentripplanner/api/model/transit/FeedScopedIdMapper.java @@ -6,7 +6,7 @@ import java.util.Optional; import javax.annotation.Nullable; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** * Handles mapping from external IDs into feed-scoped ones. diff --git a/application/src/main/java/org/opentripplanner/api/model/transit/HideFeedIdMapper.java b/application/src/main/java/org/opentripplanner/api/model/transit/HideFeedIdMapper.java index 1be59a5ce60..3d55ffd2b57 100644 --- a/application/src/main/java/org/opentripplanner/api/model/transit/HideFeedIdMapper.java +++ b/application/src/main/java/org/opentripplanner/api/model/transit/HideFeedIdMapper.java @@ -2,7 +2,7 @@ import java.util.Objects; import java.util.Optional; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** * An id mapper that appends a configured feed id to all input ids and strips the 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 04444ffae9b..623aeaeb94b 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java @@ -17,7 +17,7 @@ import java.time.format.DateTimeFormatter; import java.util.Optional; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.framework.graphql.scalar.DateScalarFactory; import org.opentripplanner.framework.graphql.scalar.DurationScalarFactory; import org.opentripplanner.framework.json.ObjectMappers; diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/GraphQLUtils.java b/application/src/main/java/org/opentripplanner/apis/gtfs/GraphQLUtils.java index af57d61c8ea..653959c6aa9 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/GraphQLUtils.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/GraphQLUtils.java @@ -8,8 +8,8 @@ import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLInputField; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLRoutingErrorCode; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLWheelchairBoarding; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.model.StopTime; import org.opentripplanner.place.api.PlaceType; import org.opentripplanner.routing.api.response.InputField; diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/AlertImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/AlertImpl.java index 5006baf2edb..592dd299685 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/AlertImpl.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/AlertImpl.java @@ -25,9 +25,9 @@ import org.opentripplanner.apis.gtfs.model.StopOnRouteModel; import org.opentripplanner.apis.gtfs.model.StopOnTripModel; import org.opentripplanner.apis.gtfs.model.UnknownModel; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.TranslatedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.TranslatedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.graphql.GraphQLUtils; import org.opentripplanner.routing.alertpatch.EntitySelector; import org.opentripplanner.routing.alertpatch.EntitySelector.DirectionAndRoute; 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 b8dc727db6d..86a8efb2599 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,7 @@ import org.opentripplanner.apis.gtfs.support.filter.PatternByDateFilterUtil; import org.opentripplanner.apis.gtfs.support.sort.AlertsConnectionOrdering; import org.opentripplanner.apis.gtfs.support.time.LocalDateRangeUtil; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.ext.fares.service.gtfs.GtfsFaresService; import org.opentripplanner.ext.fares.service.gtfs.v1.DefaultFareService; 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 21bce808b6f..0779a308ef6 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 @@ -24,8 +24,8 @@ import org.opentripplanner.apis.gtfs.support.filter.PatternByDateFilterUtil; import org.opentripplanner.apis.gtfs.support.time.LocalDateRangeUtil; import org.opentripplanner.apis.gtfs.support.time.OffsetDateTimeRangeUtil; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.LocalDateRange; import org.opentripplanner.model.StopTimesInPattern; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.place.api.NearbyStop; 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 e2a39f33be4..366dde6f059 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 @@ -26,7 +26,7 @@ import org.opentripplanner.apis.gtfs.model.TripOccupancy; import org.opentripplanner.apis.gtfs.service.ApiTransitService; import org.opentripplanner.apis.support.SemanticHash; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.routing.alertpatch.EntitySelector; import org.opentripplanner.routing.alertpatch.TransitAlert; diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripOnServiceDateImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripOnServiceDateImpl.java index 73b736d3b72..b8b8825f6f3 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripOnServiceDateImpl.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripOnServiceDateImpl.java @@ -10,7 +10,7 @@ import org.opentripplanner.apis.gtfs.GtfsGraphQLRequestContext; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; import org.opentripplanner.apis.gtfs.model.RealTimeTripStateModel; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.transit.model.network.ReplacedByRelation; import org.opentripplanner.transit.model.network.ReplacementForRelation; diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java b/application/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java index cb491dc028e..078d7d9e4c7 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.opentripplanner.core.model.basic.Cost; public class GraphQLTypes { @@ -338,7 +339,7 @@ public static class GraphQLBicycleParkingPreferencesInput { private List filters; private List preferred; - private org.opentripplanner.core.domain.model.basic.Cost unpreferredCost; + private Cost unpreferredCost; public GraphQLBicycleParkingPreferencesInput(Map args) { if (args != null) { @@ -354,9 +355,7 @@ public GraphQLBicycleParkingPreferencesInput(Map args) { .map(o -> o == null ? null : new GraphQLParkingFilterInput(o)) .collect(Collectors.toList()); } - this.unpreferredCost = (org.opentripplanner.core.domain.model.basic.Cost) args.get( - "unpreferredCost" - ); + this.unpreferredCost = (Cost) args.get("unpreferredCost"); } } @@ -368,7 +367,7 @@ public List getGraphQLPreferred() { return this.preferred; } - public org.opentripplanner.core.domain.model.basic.Cost getGraphQLUnpreferredCost() { + public Cost getGraphQLUnpreferredCost() { return this.unpreferredCost; } @@ -380,16 +379,14 @@ public void setGraphQLPreferred(List preferred) { this.preferred = preferred; } - public void setGraphQLUnpreferredCost( - org.opentripplanner.core.domain.model.basic.Cost unpreferredCost - ) { + public void setGraphQLUnpreferredCost(Cost unpreferredCost) { this.unpreferredCost = unpreferredCost; } } public static class GraphQLBicyclePreferencesInput { - private org.opentripplanner.core.domain.model.basic.Cost boardCost; + private Cost boardCost; private GraphQLCyclingOptimizationInput optimization; private GraphQLBicycleParkingPreferencesInput parking; private Double reluctance; @@ -399,7 +396,7 @@ public static class GraphQLBicyclePreferencesInput { public GraphQLBicyclePreferencesInput(Map args) { if (args != null) { - this.boardCost = (org.opentripplanner.core.domain.model.basic.Cost) args.get("boardCost"); + this.boardCost = (Cost) args.get("boardCost"); this.optimization = new GraphQLCyclingOptimizationInput( (Map) args.get("optimization") ); @@ -415,7 +412,7 @@ public GraphQLBicyclePreferencesInput(Map args) { } } - public org.opentripplanner.core.domain.model.basic.Cost getGraphQLBoardCost() { + public Cost getGraphQLBoardCost() { return this.boardCost; } @@ -443,7 +440,7 @@ public GraphQLBicycleWalkPreferencesInput getGraphQLWalk() { return this.walk; } - public void setGraphQLBoardCost(org.opentripplanner.core.domain.model.basic.Cost boardCost) { + public void setGraphQLBoardCost(Cost boardCost) { this.boardCost = boardCost; } @@ -517,19 +514,17 @@ public void setGraphQLDestinationBicyclePolicy( public static class GraphQLBicycleWalkPreferencesCostInput { - private org.opentripplanner.core.domain.model.basic.Cost mountDismountCost; + private Cost mountDismountCost; private Double reluctance; public GraphQLBicycleWalkPreferencesCostInput(Map args) { if (args != null) { - this.mountDismountCost = (org.opentripplanner.core.domain.model.basic.Cost) args.get( - "mountDismountCost" - ); + this.mountDismountCost = (Cost) args.get("mountDismountCost"); this.reluctance = (Double) args.get("reluctance"); } } - public org.opentripplanner.core.domain.model.basic.Cost getGraphQLMountDismountCost() { + public Cost getGraphQLMountDismountCost() { return this.mountDismountCost; } @@ -537,9 +532,7 @@ public Double getGraphQLReluctance() { return this.reluctance; } - public void setGraphQLMountDismountCost( - org.opentripplanner.core.domain.model.basic.Cost mountDismountCost - ) { + public void setGraphQLMountDismountCost(Cost mountDismountCost) { this.mountDismountCost = mountDismountCost; } @@ -862,7 +855,7 @@ public static class GraphQLCarParkingPreferencesInput { private List filters; private List preferred; - private org.opentripplanner.core.domain.model.basic.Cost unpreferredCost; + private Cost unpreferredCost; public GraphQLCarParkingPreferencesInput(Map args) { if (args != null) { @@ -878,9 +871,7 @@ public GraphQLCarParkingPreferencesInput(Map args) { .map(o -> o == null ? null : new GraphQLParkingFilterInput(o)) .collect(Collectors.toList()); } - this.unpreferredCost = (org.opentripplanner.core.domain.model.basic.Cost) args.get( - "unpreferredCost" - ); + this.unpreferredCost = (Cost) args.get("unpreferredCost"); } } @@ -892,7 +883,7 @@ public List getGraphQLPreferred() { return this.preferred; } - public org.opentripplanner.core.domain.model.basic.Cost getGraphQLUnpreferredCost() { + public Cost getGraphQLUnpreferredCost() { return this.unpreferredCost; } @@ -904,23 +895,21 @@ public void setGraphQLPreferred(List preferred) { this.preferred = preferred; } - public void setGraphQLUnpreferredCost( - org.opentripplanner.core.domain.model.basic.Cost unpreferredCost - ) { + public void setGraphQLUnpreferredCost(Cost unpreferredCost) { this.unpreferredCost = unpreferredCost; } } public static class GraphQLCarPreferencesInput { - private org.opentripplanner.core.domain.model.basic.Cost boardCost; + private Cost boardCost; private GraphQLCarParkingPreferencesInput parking; private Double reluctance; private GraphQLCarRentalPreferencesInput rental; public GraphQLCarPreferencesInput(Map args) { if (args != null) { - this.boardCost = (org.opentripplanner.core.domain.model.basic.Cost) args.get("boardCost"); + this.boardCost = (Cost) args.get("boardCost"); this.parking = new GraphQLCarParkingPreferencesInput( (Map) args.get("parking") ); @@ -931,7 +920,7 @@ public GraphQLCarPreferencesInput(Map args) { } } - public org.opentripplanner.core.domain.model.basic.Cost getGraphQLBoardCost() { + public Cost getGraphQLBoardCost() { return this.boardCost; } @@ -947,7 +936,7 @@ public GraphQLCarRentalPreferencesInput getGraphQLRental() { return this.rental; } - public void setGraphQLBoardCost(org.opentripplanner.core.domain.model.basic.Cost boardCost) { + public void setGraphQLBoardCost(Cost boardCost) { this.boardCost = boardCost; } @@ -1154,14 +1143,12 @@ public enum GraphQLDependentFareProductFilter { public static class GraphQLDestinationBicyclePolicyInput { private Boolean allowKeeping; - private org.opentripplanner.core.domain.model.basic.Cost keepingCost; + private Cost keepingCost; public GraphQLDestinationBicyclePolicyInput(Map args) { if (args != null) { this.allowKeeping = (Boolean) args.get("allowKeeping"); - this.keepingCost = (org.opentripplanner.core.domain.model.basic.Cost) args.get( - "keepingCost" - ); + this.keepingCost = (Cost) args.get("keepingCost"); } } @@ -1169,7 +1156,7 @@ public Boolean getGraphQLAllowKeeping() { return this.allowKeeping; } - public org.opentripplanner.core.domain.model.basic.Cost getGraphQLKeepingCost() { + public Cost getGraphQLKeepingCost() { return this.keepingCost; } @@ -1177,9 +1164,7 @@ public void setGraphQLAllowKeeping(Boolean allowKeeping) { this.allowKeeping = allowKeeping; } - public void setGraphQLKeepingCost( - org.opentripplanner.core.domain.model.basic.Cost keepingCost - ) { + public void setGraphQLKeepingCost(Cost keepingCost) { this.keepingCost = keepingCost; } } @@ -1187,14 +1172,12 @@ public void setGraphQLKeepingCost( public static class GraphQLDestinationScooterPolicyInput { private Boolean allowKeeping; - private org.opentripplanner.core.domain.model.basic.Cost keepingCost; + private Cost keepingCost; public GraphQLDestinationScooterPolicyInput(Map args) { if (args != null) { this.allowKeeping = (Boolean) args.get("allowKeeping"); - this.keepingCost = (org.opentripplanner.core.domain.model.basic.Cost) args.get( - "keepingCost" - ); + this.keepingCost = (Cost) args.get("keepingCost"); } } @@ -1202,7 +1185,7 @@ public Boolean getGraphQLAllowKeeping() { return this.allowKeeping; } - public org.opentripplanner.core.domain.model.basic.Cost getGraphQLKeepingCost() { + public Cost getGraphQLKeepingCost() { return this.keepingCost; } @@ -1210,9 +1193,7 @@ public void setGraphQLAllowKeeping(Boolean allowKeeping) { this.allowKeeping = allowKeeping; } - public void setGraphQLKeepingCost( - org.opentripplanner.core.domain.model.basic.Cost keepingCost - ) { + public void setGraphQLKeepingCost(Cost keepingCost) { this.keepingCost = keepingCost; } } @@ -1921,12 +1902,12 @@ public void setGraphQLOriginModesWithParentStation( public static class GraphQLLinearCostFunctionInput { private Double coefficient; - private org.opentripplanner.core.domain.model.basic.Cost constant; + private Cost constant; public GraphQLLinearCostFunctionInput(Map args) { if (args != null) { this.coefficient = (Double) args.get("coefficient"); - this.constant = (org.opentripplanner.core.domain.model.basic.Cost) args.get("constant"); + this.constant = (Cost) args.get("constant"); } } @@ -1934,7 +1915,7 @@ public Double getGraphQLCoefficient() { return this.coefficient; } - public org.opentripplanner.core.domain.model.basic.Cost getGraphQLConstant() { + public Cost getGraphQLConstant() { return this.constant; } @@ -1942,7 +1923,7 @@ public void setGraphQLCoefficient(Double coefficient) { this.coefficient = coefficient; } - public void setGraphQLConstant(org.opentripplanner.core.domain.model.basic.Cost constant) { + public void setGraphQLConstant(Cost constant) { this.constant = constant; } } @@ -5895,21 +5876,21 @@ public void setGraphQLIncludeRealTimeCancellations(Boolean includeRealTimeCancel public static class GraphQLTransferPreferencesInput { - private org.opentripplanner.core.domain.model.basic.Cost cost; + private Cost cost; private Integer maximumAdditionalTransfers; private Integer maximumTransfers; private java.time.Duration slack; public GraphQLTransferPreferencesInput(Map args) { if (args != null) { - this.cost = (org.opentripplanner.core.domain.model.basic.Cost) args.get("cost"); + this.cost = (Cost) args.get("cost"); this.maximumAdditionalTransfers = (Integer) args.get("maximumAdditionalTransfers"); this.maximumTransfers = (Integer) args.get("maximumTransfers"); this.slack = (java.time.Duration) args.get("slack"); } } - public org.opentripplanner.core.domain.model.basic.Cost getGraphQLCost() { + public Cost getGraphQLCost() { return this.cost; } @@ -5925,7 +5906,7 @@ public java.time.Duration getGraphQLSlack() { return this.slack; } - public void setGraphQLCost(org.opentripplanner.core.domain.model.basic.Cost cost) { + public void setGraphQLCost(Cost cost) { this.cost = cost; } @@ -6510,21 +6491,21 @@ public enum GraphQLViaLocationType { public static class GraphQLWalkPreferencesInput { - private org.opentripplanner.core.domain.model.basic.Cost boardCost; + private Cost boardCost; private Double reluctance; private Double safetyFactor; private Double speed; public GraphQLWalkPreferencesInput(Map args) { if (args != null) { - this.boardCost = (org.opentripplanner.core.domain.model.basic.Cost) args.get("boardCost"); + this.boardCost = (Cost) args.get("boardCost"); this.reluctance = (Double) args.get("reluctance"); this.safetyFactor = (Double) args.get("safetyFactor"); this.speed = (Double) args.get("speed"); } } - public org.opentripplanner.core.domain.model.basic.Cost getGraphQLBoardCost() { + public Cost getGraphQLBoardCost() { return this.boardCost; } @@ -6540,7 +6521,7 @@ public Double getGraphQLSpeed() { return this.speed; } - public void setGraphQLBoardCost(org.opentripplanner.core.domain.model.basic.Cost boardCost) { + public void setGraphQLBoardCost(Cost boardCost) { this.boardCost = boardCost; } diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/AlertsConnectionFilterMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/AlertsConnectionFilterMapper.java index 8e0deec6321..cdd5874b8e4 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/AlertsConnectionFilterMapper.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/AlertsConnectionFilterMapper.java @@ -9,7 +9,7 @@ import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLAlertsFilterSelectInput; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLOffsetDateTimeRangeInput; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.routing.alertpatch.AlertCause; import org.opentripplanner.routing.alertpatch.AlertEffect; import org.opentripplanner.routing.alertpatch.AlertSeverity; diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/CanceledTripsFilterMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/CanceledTripsFilterMapper.java index 2c830fa3436..de36481b97f 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/CanceledTripsFilterMapper.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/CanceledTripsFilterMapper.java @@ -14,8 +14,8 @@ import javax.annotation.Nullable; import org.opentripplanner.apis.gtfs.support.time.OffsetDateTimeRangeUtil; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.domain.model.time.LocalDateRange; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.transit.api.request.TripOnServiceDateRequest; import org.opentripplanner.transit.model.basic.MainAndSubMode; import org.opentripplanner.transit.model.basic.TransitMode; diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapper.java index 96e35b6ada1..106a7d93c19 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapper.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapper.java @@ -17,7 +17,7 @@ import org.opentripplanner.api.parameter.QualifiedModeSet; import org.opentripplanner.apis.gtfs.GtfsGraphQLRequestContext; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.graphql.GraphQLUtils; import org.opentripplanner.framework.time.ZoneIdFallback; import org.opentripplanner.model.GenericLocation; 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 4e83b734539..cbdaf55e52f 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 @@ -14,7 +14,7 @@ import javax.annotation.Nullable; import org.opentripplanner.apis.gtfs.GtfsGraphQLRequestContext; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.graphql.GraphQLUtils; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.routing.api.request.RouteRequest; diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/SelectRequestMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/SelectRequestMapper.java index e5edce76e10..6d75c7950bc 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/SelectRequestMapper.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/SelectRequestMapper.java @@ -5,7 +5,7 @@ import org.opentripplanner.apis.gtfs.GraphQLUtils; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLTransitFilterSelectInput; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.request.filter.SelectRequest; import org.opentripplanner.utils.collection.CollectionUtils; 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 2aaba9c9a17..2bb878cbb32 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 @@ -8,7 +8,7 @@ import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.apis.gtfs.mapping.TransitModeMapper; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.routing.api.request.preference.TransferPreferences; import org.opentripplanner.routing.api.request.preference.TransitPreferences; diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ViaLocationMapper.java b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ViaLocationMapper.java index 2f91630e0c4..6a0b5c8e9e7 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ViaLocationMapper.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ViaLocationMapper.java @@ -7,7 +7,7 @@ import javax.annotation.Nullable; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.via.PassThroughViaLocation; import org.opentripplanner.routing.api.request.via.ViaLocation; import org.opentripplanner.routing.api.request.via.VisitViaLocation; diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/model/OffsetDateTimeRange.java b/application/src/main/java/org/opentripplanner/apis/gtfs/model/OffsetDateTimeRange.java index 4bd37c00c9a..4ed7ced4007 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/model/OffsetDateTimeRange.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/model/OffsetDateTimeRange.java @@ -4,7 +4,7 @@ import java.time.ZoneId; import java.util.Comparator; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.time.TimePeriod; /** * A range of time with inclusive start and exclusive end {@code [start, end)}. Both bounds are diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/service/ApiTransitService.java b/application/src/main/java/org/opentripplanner/apis/gtfs/service/ApiTransitService.java index 92c8a8649da..9e8ef83ed42 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/service/ApiTransitService.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/service/ApiTransitService.java @@ -10,9 +10,9 @@ import java.util.stream.Stream; import javax.annotation.Nullable; import org.opentripplanner.apis.gtfs.model.StopCallOnTripOnServiceDate; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.LocalDateRange; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.transit.api.request.CancellationPolicy; diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/support/filter/PatternByDateFilterUtil.java b/application/src/main/java/org/opentripplanner/apis/gtfs/support/filter/PatternByDateFilterUtil.java index 6ec5f416c52..0c3039084bd 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/support/filter/PatternByDateFilterUtil.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/support/filter/PatternByDateFilterUtil.java @@ -1,7 +1,7 @@ package org.opentripplanner.apis.gtfs.support.filter; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; -import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.model.time.LocalDateRange; import org.opentripplanner.transit.service.PatternByServiceDatesFilter; import org.opentripplanner.transit.service.TransitService; diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/support/time/LocalDateRangeUtil.java b/application/src/main/java/org/opentripplanner/apis/gtfs/support/time/LocalDateRangeUtil.java index 6affe0575e2..ba68cda983a 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/support/time/LocalDateRangeUtil.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/support/time/LocalDateRangeUtil.java @@ -4,7 +4,7 @@ import javax.annotation.Nullable; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.model.time.LocalDateRange; public class LocalDateRangeUtil { diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/support/time/OffsetDateTimeRangeUtil.java b/application/src/main/java/org/opentripplanner/apis/gtfs/support/time/OffsetDateTimeRangeUtil.java index 5704fd3b473..ac586f70f72 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/support/time/OffsetDateTimeRangeUtil.java +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/support/time/OffsetDateTimeRangeUtil.java @@ -5,7 +5,7 @@ import javax.annotation.Nullable; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.time.TimePeriod; /** * Utilities for mapping the GraphQL {@code OffsetDateTimeRangeInput} to the domain type diff --git a/application/src/main/java/org/opentripplanner/apis/support/graphql/injectdoc/ApiDocumentationProfile.java b/application/src/main/java/org/opentripplanner/apis/support/graphql/injectdoc/ApiDocumentationProfile.java index 4c476045b31..b4160555927 100644 --- a/application/src/main/java/org/opentripplanner/apis/support/graphql/injectdoc/ApiDocumentationProfile.java +++ b/application/src/main/java/org/opentripplanner/apis/support/graphql/injectdoc/ApiDocumentationProfile.java @@ -1,6 +1,6 @@ package org.opentripplanner.apis.support.graphql.injectdoc; -import org.opentripplanner.core.domain.model.doc.DocumentedEnum; +import org.opentripplanner.core.model.doc.DocumentedEnum; public enum ApiDocumentationProfile implements DocumentedEnum { DEFAULT, diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchemaFactory.java b/application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchemaFactory.java index cd1ca999730..5ecc6c4269f 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchemaFactory.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchemaFactory.java @@ -118,7 +118,7 @@ import org.opentripplanner.apis.transmodel.model.timetable.TimetabledPassingTimeType; import org.opentripplanner.apis.transmodel.model.timetable.TripMetadataType; import org.opentripplanner.apis.transmodel.support.GqlUtil; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.plan.legreference.LegReference; import org.opentripplanner.model.plan.legreference.LegReferenceSerializer; import org.opentripplanner.place.api.NearbyStop; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/GenericLocationMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/GenericLocationMapper.java index 3bdb183f1f5..a5999355289 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/GenericLocationMapper.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/GenericLocationMapper.java @@ -8,7 +8,7 @@ import org.opentripplanner.apis.transmodel.model.framework.DatedServiceJourneyReferenceInputType; import org.opentripplanner.apis.transmodel.model.framework.PointInJourneyPatternReferenceInputType; import org.opentripplanner.apis.transmodel.support.OneOfInputValidator; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.routing.api.request.TripLocation; import org.opentripplanner.routing.api.request.TripOnDateReference; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TransitFilterOldWayMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TransitFilterOldWayMapper.java index 7443ef9d344..51908daab97 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TransitFilterOldWayMapper.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TransitFilterOldWayMapper.java @@ -9,7 +9,7 @@ import org.opentripplanner.apis.transmodel.model.TransmodelTransportSubmode; import org.opentripplanner.apis.transmodel.support.DataFetcherDecorator; import org.opentripplanner.apis.transmodel.support.GqlUtil; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.request.TransitRequestBuilder; import org.opentripplanner.routing.api.request.request.filter.SelectRequest; import org.opentripplanner.transit.model.basic.MainAndSubMode; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TripViaLocationMapper.java b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TripViaLocationMapper.java index fa158a50e38..77e87016b5c 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TripViaLocationMapper.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/mapping/TripViaLocationMapper.java @@ -14,7 +14,7 @@ import org.opentripplanner.apis.transmodel.model.plan.TripQuery; import org.opentripplanner.apis.transmodel.model.plan.ViaLocationInputType; import org.opentripplanner.apis.transmodel.support.OneOfInputValidator; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.via.PassThroughViaLocation; import org.opentripplanner.routing.api.request.via.ViaLocation; import org.opentripplanner.routing.api.request.via.VisitViaLocation; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java index b7882fcb2c7..9387fe803b0 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java @@ -6,8 +6,8 @@ import java.util.EnumSet; import java.util.List; import java.util.function.Function; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.doc.DocumentedEnum; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.doc.DocumentedEnum; import org.opentripplanner.model.plan.VertexType; import org.opentripplanner.model.plan.leg.ViaLocationType; import org.opentripplanner.model.plan.walkstep.AbsoluteDirection; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/JourneyWhiteListed.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/JourneyWhiteListed.java index a7ad911dc16..870bb1a6f51 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/JourneyWhiteListed.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/model/plan/JourneyWhiteListed.java @@ -9,7 +9,7 @@ import java.util.Set; import org.opentripplanner.api.model.transit.FeedScopedIdMapper; import org.opentripplanner.apis.transmodel.support.GqlUtil; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; public class JourneyWhiteListed { 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 be1f97b6b8e..0bce7108bdf 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 @@ -8,7 +8,7 @@ import graphql.schema.GraphQLInputObjectField; import graphql.schema.GraphQLInputObjectType; import java.util.Map; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.framework.graphql.scalar.CostScalarFactory; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.utils.time.DurationUtils; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/et/EstimatedCallType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/et/EstimatedCallType.java index 7944e3c08ef..c1f6d4db96b 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/et/EstimatedCallType.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/et/EstimatedCallType.java @@ -26,8 +26,8 @@ import org.opentripplanner.apis.transmodel.model.framework.TransmodelScalars; import org.opentripplanner.apis.transmodel.model.timetable.EmpiricalDelayType; import org.opentripplanner.apis.transmodel.support.GqlUtil; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.routing.alertpatch.StopCondition; import org.opentripplanner.routing.alertpatch.TransitAlert; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/AffectsType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/AffectsType.java index 1ea062a6250..8d14ab2580b 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/AffectsType.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/AffectsType.java @@ -11,7 +11,7 @@ import org.opentripplanner.apis.transmodel.model.framework.TransmodelScalars; import org.opentripplanner.apis.transmodel.model.stop.StopPlaceType; import org.opentripplanner.apis.transmodel.support.GqlUtil; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.alertpatch.EntitySelector; import org.opentripplanner.transit.model.timetable.TripIdAndServiceDate; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/PtSituationElementType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/PtSituationElementType.java index 5aa2ca22339..9a85ce38c7b 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/PtSituationElementType.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/model/siri/sx/PtSituationElementType.java @@ -21,8 +21,8 @@ import org.opentripplanner.apis.transmodel.model.EnumTypes; import org.opentripplanner.apis.transmodel.model.stop.MonoOrMultiModalStation; import org.opentripplanner.apis.transmodel.support.GqlUtil; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.TranslatedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.TranslatedString; import org.opentripplanner.routing.alertpatch.AlertUrl; import org.opentripplanner.routing.alertpatch.EntitySelector; import org.opentripplanner.routing.alertpatch.TransitAlert; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/MonoOrMultiModalStation.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/MonoOrMultiModalStation.java index 4cffb8c7586..d1c0bebe867 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/MonoOrMultiModalStation.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/MonoOrMultiModalStation.java @@ -2,9 +2,9 @@ import java.time.ZoneId; import java.util.Collection; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.site.MultiModalStation; import org.opentripplanner.transit.model.site.Station; import org.opentripplanner.transit.model.site.StopLocation; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java index 1f5d8147b45..fa65d6c6a7f 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java @@ -28,7 +28,7 @@ import org.opentripplanner.apis.transmodel.model.plan.JourneyWhiteListed; import org.opentripplanner.apis.transmodel.model.scalars.GeoJSONCoordinatesScalar; import org.opentripplanner.apis.transmodel.support.GqlUtil; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.model.accessibility.Accessibility; import org.opentripplanner.framework.graphql.GraphQLUtils; import org.opentripplanner.transit.api.request.CancellationPolicy; import org.opentripplanner.transit.api.request.TripTimeOnDateRequest; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java index 420e15def95..7ec6c241169 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java @@ -36,7 +36,7 @@ import org.opentripplanner.apis.transmodel.model.framework.TransmodelDirectives; import org.opentripplanner.apis.transmodel.model.plan.JourneyWhiteListed; import org.opentripplanner.apis.transmodel.support.GqlUtil; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.graphql.GraphQLUtils; import org.opentripplanner.transit.api.request.CancellationPolicy; import org.opentripplanner.transit.api.request.TripTimeOnDateRequest; diff --git a/application/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/DatedServiceJourneyQuery.java b/application/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/DatedServiceJourneyQuery.java index a2b907926de..3049d330458 100644 --- a/application/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/DatedServiceJourneyQuery.java +++ b/application/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/DatedServiceJourneyQuery.java @@ -12,7 +12,7 @@ import org.opentripplanner.apis.transmodel.model.EnumTypes; import org.opentripplanner.apis.transmodel.model.framework.TransmodelScalars; import org.opentripplanner.apis.transmodel.support.GqlUtil; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.api.model.FilterValues; import org.opentripplanner.transit.api.request.TripOnServiceDateRequest; import org.opentripplanner.transit.api.request.TripOnServiceDateRequestBuilder; diff --git a/application/src/main/java/org/opentripplanner/framework/graphql/GraphQLUtils.java b/application/src/main/java/org/opentripplanner/framework/graphql/GraphQLUtils.java index c6ee8f12128..0bbad7cea9c 100644 --- a/application/src/main/java/org/opentripplanner/framework/graphql/GraphQLUtils.java +++ b/application/src/main/java/org/opentripplanner/framework/graphql/GraphQLUtils.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; /** * This class should always be used when translating fields or handling locales in GraphQL queries. 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 f824b67b1c4..4363e6d9a15 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 graphql.schema.GraphQLScalarType; import java.util.Locale; import java.util.NoSuchElementException; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.utils.time.DurationUtils; public class CostScalarFactory { 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 bd2ae1339cb..8001fd12150 100644 --- a/application/src/main/java/org/opentripplanner/framework/model/TimeAndCost.java +++ b/application/src/main/java/org/opentripplanner/framework/model/TimeAndCost.java @@ -2,7 +2,7 @@ import java.time.Duration; import java.time.temporal.ChronoUnit; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.utils.time.DurationUtils; /** diff --git a/application/src/main/java/org/opentripplanner/framework/transaction/configure/TransactionModule.java b/application/src/main/java/org/opentripplanner/framework/transaction/configure/TransactionModule.java index 51f70ad622f..68f2beebb16 100644 --- a/application/src/main/java/org/opentripplanner/framework/transaction/configure/TransactionModule.java +++ b/application/src/main/java/org/opentripplanner/framework/transaction/configure/TransactionModule.java @@ -3,11 +3,11 @@ import dagger.Module; import dagger.Provides; import jakarta.inject.Singleton; -import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; -import org.opentripplanner.core.domain.framework.transaction.UpdateManager; import org.opentripplanner.core.framework.transaction.configure.StreetDomain; import org.opentripplanner.core.framework.transaction.configure.TransitDomain; import org.opentripplanner.core.framework.transaction.internal.TransactionFactory; +import org.opentripplanner.core.model.transaction.RepositoryRegistry; +import org.opentripplanner.core.model.transaction.UpdateManager; import org.opentripplanner.framework.transaction.TimetableSnapshotParameters; /** diff --git a/application/src/main/java/org/opentripplanner/gbfs/GbfsGeofencingZoneMapper.java b/application/src/main/java/org/opentripplanner/gbfs/GbfsGeofencingZoneMapper.java index e2cbeba3967..39416a50ebe 100644 --- a/application/src/main/java/org/opentripplanner/gbfs/GbfsGeofencingZoneMapper.java +++ b/application/src/main/java/org/opentripplanner/gbfs/GbfsGeofencingZoneMapper.java @@ -13,8 +13,8 @@ import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.operation.valid.IsValidOp; import org.locationtech.jts.operation.valid.TopologyValidationError; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.geometry.UnsupportedGeometryException; diff --git a/application/src/main/java/org/opentripplanner/gbfs/network/GeofencingZoneOtpPhase.java b/application/src/main/java/org/opentripplanner/gbfs/network/GeofencingZoneOtpPhase.java index 2834074e640..b67a237acc5 100644 --- a/application/src/main/java/org/opentripplanner/gbfs/network/GeofencingZoneOtpPhase.java +++ b/application/src/main/java/org/opentripplanner/gbfs/network/GeofencingZoneOtpPhase.java @@ -1,6 +1,6 @@ package org.opentripplanner.gbfs.network; -import org.opentripplanner.core.domain.model.doc.DocumentedEnum; +import org.opentripplanner.core.model.doc.DocumentedEnum; /** * The OTP phase that computes and applies a network's geofencing zones. Configured per network as diff --git a/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsFreeVehicleStatusMapper.java b/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsFreeVehicleStatusMapper.java index 120eb0f947b..7c92c5d84a0 100644 --- a/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsFreeVehicleStatusMapper.java +++ b/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsFreeVehicleStatusMapper.java @@ -8,10 +8,10 @@ import javax.annotation.Nullable; import org.mobilitydata.gbfs.v2_3.free_bike_status.GBFSBike; import org.mobilitydata.gbfs.v2_3.free_bike_status.GBFSRentalUris; -import org.opentripplanner.core.domain.model.basic.Distance; -import org.opentripplanner.core.domain.model.basic.Ratio; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.basic.Distance; +import org.opentripplanner.core.model.basic.Ratio; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.RentalVehicleFuel; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStationUris; diff --git a/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsGeofencingZoneMapper.java b/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsGeofencingZoneMapper.java index df5e82487ea..6424b4fdc8e 100644 --- a/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsGeofencingZoneMapper.java +++ b/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsGeofencingZoneMapper.java @@ -7,8 +7,8 @@ import org.mobilitydata.gbfs.v2_3.geofencing_zones.GBFSFeature; import org.mobilitydata.gbfs.v2_3.geofencing_zones.GBFSGeofencingZones; import org.mobilitydata.gbfs.v2_3.geofencing_zones.GBFSRule; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; /** diff --git a/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsStationInformationMapper.java b/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsStationInformationMapper.java index a3435a096f5..646745a8392 100644 --- a/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsStationInformationMapper.java +++ b/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsStationInformationMapper.java @@ -4,8 +4,8 @@ import java.util.stream.Collectors; import org.mobilitydata.gbfs.v2_3.station_information.GBFSRentalUris; import org.mobilitydata.gbfs.v2_3.station_information.GBFSStation; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.gbfs.support.UnknownVehicleTypeFilter; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation; diff --git a/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsSystemInformationMapper.java b/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsSystemInformationMapper.java index 85367026d50..749fe94ef36 100644 --- a/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsSystemInformationMapper.java +++ b/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsSystemInformationMapper.java @@ -1,8 +1,8 @@ package org.opentripplanner.gbfs.v2; import org.mobilitydata.gbfs.v2_3.system_information.GBFSData; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem; class GbfsSystemInformationMapper { diff --git a/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsVehicleTypeMapper.java b/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsVehicleTypeMapper.java index f74b45f9063..ac9c381adeb 100644 --- a/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsVehicleTypeMapper.java +++ b/application/src/main/java/org/opentripplanner/gbfs/v2/GbfsVehicleTypeMapper.java @@ -2,8 +2,8 @@ import javax.annotation.Nullable; import org.mobilitydata.gbfs.v2_3.vehicle_types.GBFSVehicleType; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.street.model.RentalFormFactor; import org.opentripplanner.utils.logging.Throttle; diff --git a/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsFeedMapper.java b/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsFeedMapper.java index 8f10c7ede2c..80a275d3d29 100644 --- a/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsFeedMapper.java +++ b/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsFeedMapper.java @@ -17,8 +17,8 @@ import org.mobilitydata.gbfs.v3_0.vehicle_status.GBFSVehicleStatus; import org.mobilitydata.gbfs.v3_0.vehicle_types.GBFSVehicleType; import org.mobilitydata.gbfs.v3_0.vehicle_types.GBFSVehicleTypes; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.TranslatedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.TranslatedString; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.gbfs.GbfsDataSourceParameters; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; diff --git a/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsGeofencingZoneMapper.java b/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsGeofencingZoneMapper.java index cae0f296f5a..22fe61bb4af 100644 --- a/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsGeofencingZoneMapper.java +++ b/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsGeofencingZoneMapper.java @@ -10,7 +10,7 @@ import org.mobilitydata.gbfs.v3_0.geofencing_zones.GBFSGeofencingZones; import org.mobilitydata.gbfs.v3_0.geofencing_zones.GBFSName; import org.mobilitydata.gbfs.v3_0.geofencing_zones.GBFSRule; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; /** diff --git a/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsStationInformationMapper.java b/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsStationInformationMapper.java index 49fdb6db3fb..3e08385c8dc 100644 --- a/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsStationInformationMapper.java +++ b/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsStationInformationMapper.java @@ -10,7 +10,7 @@ import org.mobilitydata.gbfs.v3_0.station_information.GBFSRentalUris; import org.mobilitydata.gbfs.v3_0.station_information.GBFSShortName; import org.mobilitydata.gbfs.v3_0.station_information.GBFSStation; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.gbfs.support.UnknownVehicleTypeFilter; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation; diff --git a/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsVehicleStatusMapper.java b/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsVehicleStatusMapper.java index 320d8c064c0..87f7db8449d 100644 --- a/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsVehicleStatusMapper.java +++ b/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsVehicleStatusMapper.java @@ -6,10 +6,10 @@ import java.util.Map; import javax.annotation.Nullable; import org.mobilitydata.gbfs.v3_0.vehicle_status.GBFSVehicle; -import org.opentripplanner.core.domain.model.basic.Distance; -import org.opentripplanner.core.domain.model.basic.Ratio; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.basic.Distance; +import org.opentripplanner.core.model.basic.Ratio; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.RentalVehicleFuel; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem; diff --git a/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsVehicleTypeMapper.java b/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsVehicleTypeMapper.java index d9a5a6fc156..07dd408c80d 100644 --- a/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsVehicleTypeMapper.java +++ b/application/src/main/java/org/opentripplanner/gbfs/v3/GbfsVehicleTypeMapper.java @@ -5,7 +5,7 @@ import javax.annotation.Nullable; import org.mobilitydata.gbfs.v3_0.vehicle_types.GBFSName; import org.mobilitydata.gbfs.v3_0.vehicle_types.GBFSVehicleType; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.street.model.RentalFormFactor; import org.opentripplanner.utils.logging.Throttle; 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 882db1ba107..6cbd7f4c202 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java @@ -7,7 +7,7 @@ import java.util.Objects; import java.util.Queue; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; import org.opentripplanner.ext.emission.EmissionRepository; import org.opentripplanner.ext.empiricaldelay.EmpiricalDelayRepository; import org.opentripplanner.ext.stopconsolidation.StopConsolidationRepository; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/configure/GraphBuilderModule.java b/application/src/main/java/org/opentripplanner/graph_builder/configure/GraphBuilderModule.java index 0f57485d5ea..2b8f864a044 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/configure/GraphBuilderModule.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/configure/GraphBuilderModule.java @@ -3,7 +3,7 @@ import dagger.Module; import dagger.Provides; import jakarta.inject.Singleton; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; import org.opentripplanner.graph_builder.GraphBuilder; import org.opentripplanner.graph_builder.GraphBuilderDataSources; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeGeometry.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeGeometry.java index 800830f8a4d..4588e7776fc 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeGeometry.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeGeometry.java @@ -1,6 +1,6 @@ package org.opentripplanner.graph_builder.issues; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssue; public record BogusShapeGeometry(FeedScopedId shapeId) implements DataImportIssue { diff --git a/application/src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeGeometryCaught.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeGeometryCaught.java index 11caafd4b24..686d5737e59 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeGeometryCaught.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/issues/BogusShapeGeometryCaught.java @@ -1,6 +1,6 @@ package org.opentripplanner.graph_builder.issues; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssue; import org.opentripplanner.model.StopTime; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/issues/ShapeGeometryTooFar.java b/application/src/main/java/org/opentripplanner/graph_builder/issues/ShapeGeometryTooFar.java index 4fb20b2488b..db10bdc62ae 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/issues/ShapeGeometryTooFar.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/issues/ShapeGeometryTooFar.java @@ -1,6 +1,6 @@ package org.opentripplanner.graph_builder.issues; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssue; public record ShapeGeometryTooFar( diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/AddTransitEntitiesToGraph.java b/application/src/main/java/org/opentripplanner/graph_builder/module/AddTransitEntitiesToGraph.java index 1a4969dcce3..a318f6a4db0 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/AddTransitEntitiesToGraph.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/AddTransitEntitiesToGraph.java @@ -10,8 +10,8 @@ import java.util.Optional; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.model.TransitDataImport; import org.opentripplanner.service.streetdetails.StreetDetailsRepository; import org.opentripplanner.service.streetdetails.model.Level; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/AddTransitEntitiesToTimetable.java b/application/src/main/java/org/opentripplanner/graph_builder/module/AddTransitEntitiesToTimetable.java index 9516e8ccc1b..27c23db83d8 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/AddTransitEntitiesToTimetable.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/AddTransitEntitiesToTimetable.java @@ -1,7 +1,7 @@ package org.opentripplanner.graph_builder.module; import java.util.Collection; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.model.FeedInfo; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModule.java b/application/src/main/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModule.java index 04d7068a611..7fb9ed27697 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModule.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModule.java @@ -13,8 +13,8 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Point; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.LocalizedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.LocalizedString; import org.opentripplanner.graph_builder.model.GraphBuilderModule; import org.opentripplanner.service.osminfo.OsmInfoGraphBuildService; import org.opentripplanner.service.osminfo.model.Platform; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/RouteToCentroidStationIdsValidator.java b/application/src/main/java/org/opentripplanner/graph_builder/module/RouteToCentroidStationIdsValidator.java index b02418ef988..fd84cee950a 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/RouteToCentroidStationIdsValidator.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/RouteToCentroidStationIdsValidator.java @@ -2,7 +2,7 @@ import java.util.Collection; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.model.GraphBuilderModule; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/TransitWithFutureDateValidator.java b/application/src/main/java/org/opentripplanner/graph_builder/module/TransitWithFutureDateValidator.java index a51c81eaaea..3d860d55aae 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/TransitWithFutureDateValidator.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/TransitWithFutureDateValidator.java @@ -4,7 +4,7 @@ import java.time.LocalDate; import java.time.ZoneId; import java.util.HashSet; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issues.NoFutureDates; import org.opentripplanner.model.calendar.CalendarServiceData; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/cache/CacheTask.java b/application/src/main/java/org/opentripplanner/graph_builder/module/cache/CacheTask.java index 02abe61856b..d8b693d2a2a 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/cache/CacheTask.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/cache/CacheTask.java @@ -1,6 +1,6 @@ package org.opentripplanner.graph_builder.module.cache; -import org.opentripplanner.core.domain.model.doc.DocumentedEnum; +import org.opentripplanner.core.model.doc.DocumentedEnum; /** * Identifies a graph-build computation that can be persisted to a file cache between builds. diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java b/application/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java index 292eb41c9d6..bfa9e3ed96f 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; import org.opentripplanner.datastore.api.CompositeDataSource; import org.opentripplanner.datastore.api.DataSource; import org.opentripplanner.ext.dataoverlay.EdgeUpdaterModule; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/geometry/GeometryProcessor.java b/application/src/main/java/org/opentripplanner/graph_builder/module/geometry/GeometryProcessor.java index d3dc9ae55bc..e57b6c13059 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/geometry/GeometryProcessor.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/geometry/GeometryProcessor.java @@ -16,7 +16,7 @@ import org.locationtech.jts.geom.impl.PackedCoordinateSequence; import org.locationtech.jts.linearref.LinearLocation; import org.locationtech.jts.linearref.LocationIndexedLine; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issues.BogusShapeDistanceTraveled; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/geometry/ShapeSegmentKey.java b/application/src/main/java/org/opentripplanner/graph_builder/module/geometry/ShapeSegmentKey.java index 51f2d13f531..7e2e06c62d9 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/geometry/ShapeSegmentKey.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/geometry/ShapeSegmentKey.java @@ -1,6 +1,6 @@ package org.opentripplanner.graph_builder.module.geometry; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; class ShapeSegmentKey { diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/BarrierEdgeBuilder.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/BarrierEdgeBuilder.java index d3e4f99fc8e..2aa1b66c452 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/BarrierEdgeBuilder.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/BarrierEdgeBuilder.java @@ -5,7 +5,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.osm.model.OsmNode; import org.opentripplanner.osm.model.OsmWay; import org.opentripplanner.street.geometry.GeometryUtils; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/EdgeNamer.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/EdgeNamer.java index f471554885a..7e38785de43 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/EdgeNamer.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/EdgeNamer.java @@ -1,7 +1,7 @@ package org.opentripplanner.graph_builder.module.osm; import java.util.Optional; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.graph_builder.module.osm.model.StreetEdgePair; import org.opentripplanner.graph_builder.module.osm.storage.OsmDatabase; import org.opentripplanner.osm.model.OsmEntity; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/ElevatorProcessor.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/ElevatorProcessor.java index acce2640aa9..7043d42cd98 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/ElevatorProcessor.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/ElevatorProcessor.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; import java.util.function.Consumer; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.model.accessibility.Accessibility; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issue.api.Issue; import org.opentripplanner.graph_builder.issues.AllWaysOfElevatorNodeOnSameLevel; 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 e8819f2c187..aecc3038444 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 @@ -21,7 +21,7 @@ import javax.annotation.Nullable; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.model.GraphBuilderModule; import org.opentripplanner.graph_builder.module.cache.CacheTask; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/ParkingProcessor.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/ParkingProcessor.java index 014041a7349..72db1657c80 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/ParkingProcessor.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/ParkingProcessor.java @@ -13,10 +13,10 @@ import java.util.function.Predicate; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Envelope; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.LocalizedStringFormat; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.LocalizedStringFormat; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issues.InvalidVehicleParkingCapacity; import org.opentripplanner.graph_builder.issues.IsolatedParkAndRide; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/internal/naming/DefaultNamer.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/internal/naming/DefaultNamer.java index c4c7c5c3f76..944802ed428 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/internal/naming/DefaultNamer.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/internal/naming/DefaultNamer.java @@ -1,6 +1,6 @@ package org.opentripplanner.graph_builder.module.osm.internal.naming; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.graph_builder.module.osm.EdgeNamer; import org.opentripplanner.graph_builder.module.osm.model.StreetEdgePair; import org.opentripplanner.graph_builder.module.osm.storage.OsmDatabase; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/internal/walkablearea/WalkableAreaBuilder.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/internal/walkablearea/WalkableAreaBuilder.java index 3c3e543e5ef..bb6231596e7 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/internal/walkablearea/WalkableAreaBuilder.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/internal/walkablearea/WalkableAreaBuilder.java @@ -18,7 +18,7 @@ import org.opentripplanner.astar.model.GraphPath; import org.opentripplanner.astar.model.ShortestPathTree; import org.opentripplanner.astar.spi.SkipEdgeStrategy; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.framework.application.OTPRequestTimeoutException; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.module.cache.KeyValueCache; diff --git a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/storage/VertexGenerator.java b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/storage/VertexGenerator.java index a1a64a1e775..58489bf78f7 100644 --- a/application/src/main/java/org/opentripplanner/graph_builder/module/osm/storage/VertexGenerator.java +++ b/application/src/main/java/org/opentripplanner/graph_builder/module/osm/storage/VertexGenerator.java @@ -18,8 +18,8 @@ import java.util.Objects; import java.util.Set; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issues.BarrierIntersectingHighway; import org.opentripplanner.graph_builder.issues.DifferentLevelsSharingBarrier; diff --git a/application/src/main/java/org/opentripplanner/gtfs/GenerateTripPatternsOperation.java b/application/src/main/java/org/opentripplanner/gtfs/GenerateTripPatternsOperation.java index 73a51dd1f3c..05fe037fe4f 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/GenerateTripPatternsOperation.java +++ b/application/src/main/java/org/opentripplanner/gtfs/GenerateTripPatternsOperation.java @@ -9,8 +9,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issues.TripDegenerate; diff --git a/application/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsModule.java b/application/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsModule.java index b9484e298d0..126a3e7a3a4 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsModule.java +++ b/application/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsModule.java @@ -5,9 +5,9 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.LocalDateRange; import org.opentripplanner.ext.fares.service.gtfs.v1.GtfsFareServiceFactory; import org.opentripplanner.ext.flex.FlexTripsMapper; import org.opentripplanner.framework.application.OTPFeature; 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 0e0ce8e7cf9..c6312101fdd 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/interlining/InterlineProcessor.java +++ b/application/src/main/java/org/opentripplanner/gtfs/interlining/InterlineProcessor.java @@ -11,7 +11,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issues.InterliningTeleport; import org.opentripplanner.gtfs.mapping.StaySeatedNotAllowed; 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 9f2e20c8784..daa07616afd 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/BoardingAreaMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/BoardingAreaMapper.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.Optional; import java.util.function.Function; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.site.BoardingArea; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.utils.collection.MapUtils; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/DirectionMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/DirectionMapper.java index 41418ce0958..731af06ded7 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/DirectionMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/DirectionMapper.java @@ -1,6 +1,6 @@ package org.opentripplanner.gtfs.mapping; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.transit.model.timetable.Direction; 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 a01ef12121d..ac06e8e6223 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/EntranceMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/EntranceMapper.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.site.Entrance; import org.opentripplanner.transit.model.site.Station; import org.opentripplanner.utils.collection.MapUtils; 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 7c4b9785859..583a83dc7d0 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/FareAttributeMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/FareAttributeMapper.java @@ -4,7 +4,7 @@ import java.util.Currency; import java.util.HashMap; import java.util.Map; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareAttribute; import org.opentripplanner.ext.fares.model.FareAttributeBuilder; import org.opentripplanner.transit.model.basic.Money; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/FareLegRuleMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/FareLegRuleMapper.java index 9e9164e4363..ce0d3a8d9f6 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/FareLegRuleMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/FareLegRuleMapper.java @@ -7,7 +7,7 @@ import javax.annotation.Nullable; import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.Area; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareDistance; import org.opentripplanner.ext.fares.model.FareLegRule; import org.opentripplanner.ext.fares.model.Timeframe; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/FareProductMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/FareProductMapper.java index 481a60a1fd5..386e646410d 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/FareProductMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/FareProductMapper.java @@ -5,7 +5,7 @@ import java.util.HashSet; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.fare.FareMedium; import org.opentripplanner.model.fare.FareProduct; import org.opentripplanner.model.fare.RiderCategory; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/FareTransferRuleMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/FareTransferRuleMapper.java index d760be0fc3a..f4ac90d7925 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/FareTransferRuleMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/FareTransferRuleMapper.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareTransferRule; import org.opentripplanner.ext.fares.model.TimeLimitType; import org.opentripplanner.model.fare.FareProduct; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToTransitDataImportMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToTransitDataImportMapper.java index 6b53d92ab7c..52052d0df7a 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToTransitDataImportMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToTransitDataImportMapper.java @@ -11,7 +11,7 @@ import org.onebusaway.gtfs.model.Stop; import org.onebusaway.gtfs.services.GtfsDao; import org.onebusaway.gtfs.services.GtfsRelationalDao; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.FareRulesData; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/IdFactory.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/IdFactory.java index 4645f68da8d..76281ddbe9d 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/IdFactory.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/IdFactory.java @@ -3,7 +3,7 @@ import java.util.Objects; import javax.annotation.Nullable; import org.onebusaway.gtfs.model.AgencyAndId; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.utils.lang.StringUtils; /** 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 a3d37926902..5494b930ff6 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/LocationGroupMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/LocationGroupMapper.java @@ -8,8 +8,8 @@ import org.onebusaway.gtfs.model.Location; import org.onebusaway.gtfs.model.LocationGroup; import org.onebusaway.gtfs.model.Stop; -import org.opentripplanner.core.domain.model.i18n.LocalizedString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.LocalizedString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.transit.model.site.GroupStop; import org.opentripplanner.transit.service.SiteRepositoryBuilder; import org.opentripplanner.utils.collection.MapUtils; 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 e5d3f823f75..8b8a401a377 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/LocationMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/LocationMapper.java @@ -6,7 +6,7 @@ import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.operation.valid.IsValidOp; import org.onebusaway.gtfs.model.Location; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issue.api.Issue; import org.opentripplanner.street.geometry.GeometryUtils; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/NoticeAssignmentMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/NoticeAssignmentMapper.java index faaaca30380..5f39ffa22dd 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/NoticeAssignmentMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/NoticeAssignmentMapper.java @@ -9,7 +9,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.onebusaway.gtfs.model.NoticeAssignment; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.transit.model.basic.Notice; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/NoticeMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/NoticeMapper.java index 66018afc75a..7047680cef2 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/NoticeMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/NoticeMapper.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.Notice; /** 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 275135cfb4c..0b4ebd47067 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/PathwayNodeMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/PathwayNodeMapper.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Optional; import java.util.function.Function; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.site.PathwayNode; import org.opentripplanner.transit.model.site.Station; import org.opentripplanner.utils.collection.MapUtils; 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 078e47533a7..1f2dd858499 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/RouteMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/RouteMapper.java @@ -6,8 +6,8 @@ import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.network.GroupOfRoutes; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/RouteNetworkAssignmentMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/RouteNetworkAssignmentMapper.java index 5c38740450f..c7344b2b548 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/RouteNetworkAssignmentMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/RouteNetworkAssignmentMapper.java @@ -4,7 +4,7 @@ import com.google.common.collect.Multimap; import java.util.Collection; import org.onebusaway.gtfs.model.RouteNetworkAssignment; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** * Keeps the mapping between GTFS route and their network IDs. These assignments don't result diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/ServiceDateMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/ServiceDateMapper.java index cfef318606b..1dac67deac8 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/ServiceDateMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/ServiceDateMapper.java @@ -1,7 +1,7 @@ package org.opentripplanner.gtfs.mapping; import java.time.LocalDate; -import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.model.time.LocalDateRange; /** Responsible for mapping GTFS ServiceDate into the OTP model. */ class ServiceDateMapper { 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 a34adee4c1f..6c466dd7741 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/ShapePointMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/ShapePointMapper.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** Responsible for mapping GTFS ShapePoint into the OTP model. */ class ShapePointMapper { diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/StopAreaMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/StopAreaMapper.java index e9dda237e40..940c68d1530 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/StopAreaMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/StopAreaMapper.java @@ -4,7 +4,7 @@ import com.google.common.collect.Multimap; import java.util.Collection; import org.onebusaway.gtfs.model.StopAreaElement; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; class StopAreaMapper { 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 e506f78d752..d2881e94fb8 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/StopMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/StopMapper.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.function.Function; import org.onebusaway.gtfs.model.Stop; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.site.FareZone; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/StopMappingWrapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/StopMappingWrapper.java index f442bd0aafa..16fada4f9c4 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/StopMappingWrapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/StopMappingWrapper.java @@ -1,8 +1,8 @@ package org.opentripplanner.gtfs.mapping; import org.onebusaway.gtfs.model.Stop; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.site.StationElement; import org.opentripplanner.transit.model.site.StopLevel; 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 4eb263f5445..c097b2fb2d0 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java @@ -7,7 +7,7 @@ import org.onebusaway.gtfs.model.Location; import org.onebusaway.gtfs.model.LocationGroup; import org.onebusaway.gtfs.model.Stop; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.model.StopTime; import org.opentripplanner.utils.collection.MapUtils; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/TimeframeMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/TimeframeMapper.java index 319e3a62d60..fcb09433f64 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/TimeframeMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/TimeframeMapper.java @@ -5,7 +5,7 @@ import java.time.LocalTime; import java.util.Collection; import java.util.Objects; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.model.Timeframe; class TimeframeMapper { diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/TranslationHelper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/TranslationHelper.java index b6e5a4c702d..4c32ec46809 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/TranslationHelper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/TranslationHelper.java @@ -13,9 +13,9 @@ import org.onebusaway.csv_entities.schema.annotations.CsvFields; import org.onebusaway.gtfs.model.FeedInfo; import org.onebusaway.gtfs.model.Translation; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.i18n.TranslatedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.TranslatedString; /** * This helper is util for translating wanted text found in GTFS's translation.txt -file. 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 fd3ff98b10c..4ae0ad44eec 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.routing.api.request.framework.TimePenalty; import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.utils.collection.MapUtils; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/TripSegmentMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/TripSegmentMapper.java index 5eb162b20f3..50ac16a6ddc 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/TripSegmentMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/TripSegmentMapper.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; import org.onebusaway.gtfs.model.TripSegment; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.TripStopTimes; import org.opentripplanner.transit.model.timetable.StopTimeKey; diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/WheelchairAccessibilityMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/WheelchairAccessibilityMapper.java index e5f042aa9e1..5a18ec3b65d 100644 --- a/application/src/main/java/org/opentripplanner/gtfs/mapping/WheelchairAccessibilityMapper.java +++ b/application/src/main/java/org/opentripplanner/gtfs/mapping/WheelchairAccessibilityMapper.java @@ -1,6 +1,6 @@ package org.opentripplanner.gtfs.mapping; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.model.accessibility.Accessibility; class WheelchairAccessibilityMapper { diff --git a/application/src/main/java/org/opentripplanner/inspector/vector/KeyValue.java b/application/src/main/java/org/opentripplanner/inspector/vector/KeyValue.java index 3671b6a9112..9c1f1d97e5b 100644 --- a/application/src/main/java/org/opentripplanner/inspector/vector/KeyValue.java +++ b/application/src/main/java/org/opentripplanner/inspector/vector/KeyValue.java @@ -3,8 +3,8 @@ import java.util.Collection; import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; /** * A key value pair that represents data being sent to the vector tile library for visualisation diff --git a/application/src/main/java/org/opentripplanner/inspector/vector/stop/StopLocationPropertyMapper.java b/application/src/main/java/org/opentripplanner/inspector/vector/stop/StopLocationPropertyMapper.java index 1bd5d78db76..0fe458c6523 100644 --- a/application/src/main/java/org/opentripplanner/inspector/vector/stop/StopLocationPropertyMapper.java +++ b/application/src/main/java/org/opentripplanner/inspector/vector/stop/StopLocationPropertyMapper.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Locale; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; +import org.opentripplanner.core.model.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.transit.model.site.StopLocation; diff --git a/application/src/main/java/org/opentripplanner/model/GenericLocation.java b/application/src/main/java/org/opentripplanner/model/GenericLocation.java index fc0ec9943fc..6f5f06b7b46 100644 --- a/application/src/main/java/org/opentripplanner/model/GenericLocation.java +++ b/application/src/main/java/org/opentripplanner/model/GenericLocation.java @@ -3,7 +3,7 @@ import java.util.Objects; import javax.annotation.Nullable; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.TripLocation; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.utils.lang.StringUtils; diff --git a/application/src/main/java/org/opentripplanner/model/StopTime.java b/application/src/main/java/org/opentripplanner/model/StopTime.java index d688ecc5f94..e2c4dd53bcf 100644 --- a/application/src/main/java/org/opentripplanner/model/StopTime.java +++ b/application/src/main/java/org/opentripplanner/model/StopTime.java @@ -4,7 +4,7 @@ import static org.opentripplanner.model.PickDrop.NONE; import java.util.List; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.transit.model.site.AreaStop; import org.opentripplanner.transit.model.site.GroupStop; import org.opentripplanner.transit.model.site.StopLocation; diff --git a/application/src/main/java/org/opentripplanner/model/TransitDataImport.java b/application/src/main/java/org/opentripplanner/model/TransitDataImport.java index 4c1bab6e1f9..f928419e69a 100644 --- a/application/src/main/java/org/opentripplanner/model/TransitDataImport.java +++ b/application/src/main/java/org/opentripplanner/model/TransitDataImport.java @@ -3,7 +3,7 @@ import com.google.common.collect.Multimap; import java.util.Collection; import java.util.Map; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.transfer.constrained.model.ConstrainedTransfer; import org.opentripplanner.transit.model.basic.Notice; diff --git a/application/src/main/java/org/opentripplanner/model/TripTimeOnDate.java b/application/src/main/java/org/opentripplanner/model/TripTimeOnDate.java index 436a71d52d9..5a87f5dc995 100644 --- a/application/src/main/java/org/opentripplanner/model/TripTimeOnDate.java +++ b/application/src/main/java/org/opentripplanner/model/TripTimeOnDate.java @@ -9,7 +9,7 @@ import java.util.Optional; import java.util.stream.IntStream; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.transit.model.network.ReplacedByRelation; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.site.StopLocation; diff --git a/application/src/main/java/org/opentripplanner/model/calendar/CalendarService.java b/application/src/main/java/org/opentripplanner/model/calendar/CalendarService.java index 630786ea43a..d6b6aa8f649 100644 --- a/application/src/main/java/org/opentripplanner/model/calendar/CalendarService.java +++ b/application/src/main/java/org/opentripplanner/model/calendar/CalendarService.java @@ -2,7 +2,7 @@ import java.time.LocalDate; import java.util.Set; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; public interface CalendarService { /** 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 aabbbc16bc5..7e93e718613 100644 --- a/application/src/main/java/org/opentripplanner/model/calendar/CalendarServiceData.java +++ b/application/src/main/java/org/opentripplanner/model/calendar/CalendarServiceData.java @@ -11,7 +11,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.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/ServiceCalendar.java b/application/src/main/java/org/opentripplanner/model/calendar/ServiceCalendar.java index 09706759eda..e0889519e05 100644 --- a/application/src/main/java/org/opentripplanner/model/calendar/ServiceCalendar.java +++ b/application/src/main/java/org/opentripplanner/model/calendar/ServiceCalendar.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.util.Objects; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.LocalDateRange; /** * Note that I decided to call this class ServiceCalendar instead of Calendar, so as to avoid 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 8f20eb1c72f..16190521468 100644 --- a/application/src/main/java/org/opentripplanner/model/calendar/ServiceCalendarDate.java +++ b/application/src/main/java/org/opentripplanner/model/calendar/ServiceCalendarDate.java @@ -4,7 +4,7 @@ import java.io.Serializable; import java.time.LocalDate; import java.util.Objects; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.utils.tostring.ToStringBuilder; /** diff --git a/application/src/main/java/org/opentripplanner/model/calendar/impl/CalendarServiceDataFactoryImpl.java b/application/src/main/java/org/opentripplanner/model/calendar/impl/CalendarServiceDataFactoryImpl.java index 713181c979a..bbb4c7d0735 100644 --- a/application/src/main/java/org/opentripplanner/model/calendar/impl/CalendarServiceDataFactoryImpl.java +++ b/application/src/main/java/org/opentripplanner/model/calendar/impl/CalendarServiceDataFactoryImpl.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.calendar.CalendarServiceData; import org.opentripplanner.model.calendar.ServiceCalendar; import org.opentripplanner.model.calendar.ServiceCalendarDate; diff --git a/application/src/main/java/org/opentripplanner/model/calendar/impl/CalendarServiceImpl.java b/application/src/main/java/org/opentripplanner/model/calendar/impl/CalendarServiceImpl.java index 13a27965199..613b7882d7f 100644 --- a/application/src/main/java/org/opentripplanner/model/calendar/impl/CalendarServiceImpl.java +++ b/application/src/main/java/org/opentripplanner/model/calendar/impl/CalendarServiceImpl.java @@ -5,7 +5,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.calendar.CalendarService; import org.opentripplanner.model.calendar.CalendarServiceData; diff --git a/application/src/main/java/org/opentripplanner/model/calendar/impl/MultipleCalendarsForServiceIdException.java b/application/src/main/java/org/opentripplanner/model/calendar/impl/MultipleCalendarsForServiceIdException.java index f21ddfa13be..29b5b28efb4 100644 --- a/application/src/main/java/org/opentripplanner/model/calendar/impl/MultipleCalendarsForServiceIdException.java +++ b/application/src/main/java/org/opentripplanner/model/calendar/impl/MultipleCalendarsForServiceIdException.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.model.calendar.impl; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; class MultipleCalendarsForServiceIdException extends RuntimeException { 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 e6169e8e888..7ff26a989fd 100644 --- a/application/src/main/java/org/opentripplanner/model/fare/FareMedium.java +++ b/application/src/main/java/org/opentripplanner/model/fare/FareMedium.java @@ -1,7 +1,7 @@ package org.opentripplanner.model.fare; import java.util.Objects; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.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 9c2769eebc0..393a22685fa 100644 --- a/application/src/main/java/org/opentripplanner/model/fare/FareProduct.java +++ b/application/src/main/java/org/opentripplanner/model/fare/FareProduct.java @@ -6,7 +6,7 @@ import java.util.Objects; import java.util.UUID; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.Money; import org.opentripplanner.utils.lang.Sandbox; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/main/java/org/opentripplanner/model/fare/FareProductBuilder.java b/application/src/main/java/org/opentripplanner/model/fare/FareProductBuilder.java index c3bb897a0a6..3a58ef315d2 100644 --- a/application/src/main/java/org/opentripplanner/model/fare/FareProductBuilder.java +++ b/application/src/main/java/org/opentripplanner/model/fare/FareProductBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.model.fare; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.Money; /** 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 00344a45c03..9f8428218a5 100644 --- a/application/src/main/java/org/opentripplanner/model/fare/RiderCategory.java +++ b/application/src/main/java/org/opentripplanner/model/fare/RiderCategory.java @@ -2,7 +2,7 @@ import java.io.Serializable; import java.util.Objects; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.utils.lang.Sandbox; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/main/java/org/opentripplanner/model/fare/RiderCategoryBuilder.java b/application/src/main/java/org/opentripplanner/model/fare/RiderCategoryBuilder.java index 9e9fb29def2..ce0d66d9546 100644 --- a/application/src/main/java/org/opentripplanner/model/fare/RiderCategoryBuilder.java +++ b/application/src/main/java/org/opentripplanner/model/fare/RiderCategoryBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.model.fare; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; public class RiderCategoryBuilder { diff --git a/application/src/main/java/org/opentripplanner/model/impl/DefaultTransitDataImport.java b/application/src/main/java/org/opentripplanner/model/impl/DefaultTransitDataImport.java index 39c78418d29..1807729a4d2 100644 --- a/application/src/main/java/org/opentripplanner/model/impl/DefaultTransitDataImport.java +++ b/application/src/main/java/org/opentripplanner/model/impl/DefaultTransitDataImport.java @@ -8,7 +8,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.model.FeedInfo; import org.opentripplanner.model.TransitDataImport; diff --git a/application/src/main/java/org/opentripplanner/model/impl/TransitDataImportBuilder.java b/application/src/main/java/org/opentripplanner/model/impl/TransitDataImportBuilder.java index 01560414521..c24a0cbe148 100644 --- a/application/src/main/java/org/opentripplanner/model/impl/TransitDataImportBuilder.java +++ b/application/src/main/java/org/opentripplanner/model/impl/TransitDataImportBuilder.java @@ -9,8 +9,8 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.LocalDateRange; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.gtfs.mapping.StaySeatedNotAllowed; 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 d853e1eb882..12cf6fafd2b 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/Itinerary.java +++ b/application/src/main/java/org/opentripplanner/model/plan/Itinerary.java @@ -9,7 +9,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.basic.NormalizedCost; +import org.opentripplanner.core.model.basic.NormalizedCost; import org.opentripplanner.ext.flex.FlexibleTransitLeg; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.model.SystemNotice; diff --git a/application/src/main/java/org/opentripplanner/model/plan/ItineraryBuilder.java b/application/src/main/java/org/opentripplanner/model/plan/ItineraryBuilder.java index 465d850c5be..c9dc012faa7 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/ItineraryBuilder.java +++ b/application/src/main/java/org/opentripplanner/model/plan/ItineraryBuilder.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Function; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.model.SystemNotice; import org.opentripplanner.street.model.path.ElevationChange; 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 b48bd0fa0d3..2a0c81ce0d8 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.core.domain.model.basic.NormalizedCost; +import org.opentripplanner.core.model.basic.NormalizedCost; import org.opentripplanner.utils.tostring.ValueObjectToStringBuilder; /** 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 fc2d54a6caf..1b5f782f268 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/Leg.java +++ b/application/src/main/java/org/opentripplanner/model/plan/Leg.java @@ -9,8 +9,8 @@ import java.util.stream.Stream; import javax.annotation.Nullable; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.fare.FareOffer; import org.opentripplanner.model.plan.leg.LegCallTime; 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 7edd5a27f0e..9fc4a1c3d96 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/Place.java +++ b/application/src/main/java/org/opentripplanner/model/plan/Place.java @@ -1,9 +1,9 @@ package org.opentripplanner.model.plan; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.LocalizedString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.LocalizedString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.model.plan.leg.ViaLocationType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; diff --git a/application/src/main/java/org/opentripplanner/model/plan/leg/ScheduledTransitLeg.java b/application/src/main/java/org/opentripplanner/model/plan/leg/ScheduledTransitLeg.java index 6e8a699d392..6c390c143ff 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/leg/ScheduledTransitLeg.java +++ b/application/src/main/java/org/opentripplanner/model/plan/leg/ScheduledTransitLeg.java @@ -11,9 +11,9 @@ import java.util.Set; import javax.annotation.Nullable; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.basic.Cost; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.fare.FareOffer; import org.opentripplanner.model.plan.Emission; diff --git a/application/src/main/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializer.java b/application/src/main/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializer.java index 5cc06586665..a09920d718b 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializer.java +++ b/application/src/main/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializer.java @@ -9,7 +9,7 @@ import java.time.format.DateTimeFormatter; import java.util.Base64; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 6751ddcebd3..c1c2d5bc55c 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 @@ -5,7 +5,7 @@ import java.util.OptionalInt; import java.util.function.Predicate; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.plan.leg.ScheduledTransitLeg; import org.opentripplanner.model.plan.leg.ScheduledTransitLegBuilder; import org.opentripplanner.routing.algorithm.mapping.AlertToLegMapper; diff --git a/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCut.java b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCut.java index b14f0a56148..c9ee5e1d013 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCut.java +++ b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCut.java @@ -1,7 +1,7 @@ package org.opentripplanner.model.plan.paging.cursor; import java.time.Instant; -import org.opentripplanner.core.domain.model.basic.NormalizedCost; +import org.opentripplanner.core.model.basic.NormalizedCost; import org.opentripplanner.model.plan.ItinerarySortKey; /** 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 f3262138a40..2543d9b9ce3 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,7 +3,7 @@ import java.time.Duration; import java.time.Instant; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.SortOrder; import org.opentripplanner.utils.collection.ListSection; 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 3591a8c24d5..bd0ee49d51f 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,7 +6,7 @@ import java.time.Duration; import java.time.Instant; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.SortOrder; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorInput.java b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorInput.java index d773da39bd5..32a23e9d993 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorInput.java +++ b/application/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorInput.java @@ -1,7 +1,7 @@ package org.opentripplanner.model.plan.paging.cursor; import java.time.Instant; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.model.plan.ItinerarySortKey; /** 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 565df6ccc48..5b335627880 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,7 +1,7 @@ package org.opentripplanner.model.plan.paging.cursor; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.framework.token.TokenSchema; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.SortOrder; diff --git a/application/src/main/java/org/opentripplanner/model/plan/walkstep/WalkStep.java b/application/src/main/java/org/opentripplanner/model/plan/walkstep/WalkStep.java index 8116f5408a9..5696a38dfeb 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/walkstep/WalkStep.java +++ b/application/src/main/java/org/opentripplanner/model/plan/walkstep/WalkStep.java @@ -4,7 +4,7 @@ import java.util.Objects; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.model.plan.walkstep.verticaltransportation.VerticalTransportationUse; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.street.model.edge.Edge; diff --git a/application/src/main/java/org/opentripplanner/model/plan/walkstep/WalkStepBuilder.java b/application/src/main/java/org/opentripplanner/model/plan/walkstep/WalkStepBuilder.java index dceeed15135..82a23881a32 100644 --- a/application/src/main/java/org/opentripplanner/model/plan/walkstep/WalkStepBuilder.java +++ b/application/src/main/java/org/opentripplanner/model/plan/walkstep/WalkStepBuilder.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.model.plan.walkstep.verticaltransportation.VerticalTransportationUse; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.street.model.edge.Edge; diff --git a/application/src/main/java/org/opentripplanner/netex/NetexBundle.java b/application/src/main/java/org/opentripplanner/netex/NetexBundle.java index 53894459025..0a58abf6a04 100644 --- a/application/src/main/java/org/opentripplanner/netex/NetexBundle.java +++ b/application/src/main/java/org/opentripplanner/netex/NetexBundle.java @@ -6,8 +6,8 @@ import java.util.Collection; import java.util.List; import java.util.Set; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.datastore.api.CompositeDataSource; import org.opentripplanner.datastore.api.DataSource; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; diff --git a/application/src/main/java/org/opentripplanner/netex/NetexModule.java b/application/src/main/java/org/opentripplanner/netex/NetexModule.java index 3335235d270..80ae75e98b8 100644 --- a/application/src/main/java/org/opentripplanner/netex/NetexModule.java +++ b/application/src/main/java/org/opentripplanner/netex/NetexModule.java @@ -3,8 +3,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Queue; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.time.LocalDateRange; import org.opentripplanner.ext.flex.FlexTripsMapper; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; diff --git a/application/src/main/java/org/opentripplanner/netex/configure/NetexConfigure.java b/application/src/main/java/org/opentripplanner/netex/configure/NetexConfigure.java index ed872992471..7eaaf5e6be7 100644 --- a/application/src/main/java/org/opentripplanner/netex/configure/NetexConfigure.java +++ b/application/src/main/java/org/opentripplanner/netex/configure/NetexConfigure.java @@ -2,7 +2,7 @@ import java.util.ArrayList; import java.util.List; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; import org.opentripplanner.datastore.api.CompositeDataSource; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.model.ConfiguredCompositeDataSource; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/FlexStopsMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/FlexStopsMapper.java index d8f5befd831..950fb4f9f71 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/FlexStopsMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/FlexStopsMapper.java @@ -6,7 +6,7 @@ import javax.annotation.Nullable; import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issue.api.Issue; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/GroupOfStationsMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/GroupOfStationsMapper.java index 746d30e0a90..bc254589bb7 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/GroupOfStationsMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/GroupOfStationsMapper.java @@ -3,9 +3,9 @@ import jakarta.xml.bind.JAXBElement; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/HeadsignMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/HeadsignMapper.java index d5a4e75997b..5f8dc71df43 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/HeadsignMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/HeadsignMapper.java @@ -2,7 +2,7 @@ import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.netex.config.SwissProfile; import org.rutebanken.netex.model.DestinationDisplay; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/MultiModalStationMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/MultiModalStationMapper.java index 733668d5974..2f6b16afb9a 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/MultiModalStationMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/MultiModalStationMapper.java @@ -2,7 +2,7 @@ import java.util.Collection; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java index 8ef0e917f73..c538d2e6de9 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java @@ -11,8 +11,8 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.calendar.ServiceCalendar; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/NoticeAssignmentMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/NoticeAssignmentMapper.java index f55cfb036dc..9ca5742c50d 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/NoticeAssignmentMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/NoticeAssignmentMapper.java @@ -4,7 +4,7 @@ import com.google.common.collect.Multimap; import java.util.Collection; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.StopTime; import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalMap; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/NoticeMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/NoticeMapper.java index 09ada4f10bc..4b1ac9f7b98 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/NoticeMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/NoticeMapper.java @@ -1,6 +1,6 @@ package org.opentripplanner.netex.mapping; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; import org.opentripplanner.transit.model.basic.Notice; import org.opentripplanner.transit.model.framework.DefaultEntityById; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/QuayMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/QuayMapper.java index a7b3aead53b..f32ef7b9df0 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/QuayMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/QuayMapper.java @@ -4,9 +4,9 @@ import java.util.Collection; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/RouteMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/RouteMapper.java index 3eb790656bd..0fa1067412e 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/RouteMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/RouteMapper.java @@ -6,8 +6,8 @@ import java.util.HashSet; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.netex.index.api.NetexEntityIndexReadOnlyView; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/StationMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/StationMapper.java index c230b3c94b5..e983030883f 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/StationMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/StationMapper.java @@ -8,10 +8,10 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.i18n.TranslatedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.TranslatedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; import org.opentripplanner.netex.support.JAXBUtils; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/StopAndStationMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/StopAndStationMapper.java index 94e03c6c316..b36ae5ea9b5 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/StopAndStationMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/StopAndStationMapper.java @@ -14,8 +14,8 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issue.api.Issue; import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalVersionMapById; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapper.java index ebbb20de82f..2a7cdc791bd 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapper.java @@ -12,7 +12,7 @@ import java.util.Objects; import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.StopTime; import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalMap; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/TariffZoneMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/TariffZoneMapper.java index 63dabace723..fee31bfdb19 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/TariffZoneMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/TariffZoneMapper.java @@ -4,7 +4,7 @@ import com.google.common.collect.Multimap; import java.time.LocalDateTime; import java.util.Collection; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalVersionMapById; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; import org.opentripplanner.transit.model.site.FareZone; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/TransferMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/TransferMapper.java index 784c8422681..ceff7db08a9 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/TransferMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/TransferMapper.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Map; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.netex.config.SwissProfile; import org.opentripplanner.netex.issues.InterchangeMaxWaitTimeNotGuaranteed; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/TripCalendarBuilder.java b/application/src/main/java/org/opentripplanner/netex/mapping/TripCalendarBuilder.java index 97abe457d80..53d40e3b04e 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/TripCalendarBuilder.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/TripCalendarBuilder.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalMap; import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalMapById; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/TripMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/TripMapper.java index 258d54050b2..4b574299dce 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/TripMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/TripMapper.java @@ -4,9 +4,9 @@ import java.util.Map; import java.util.function.Supplier; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalMap; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java index 6baafb223b2..7b950223e66 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java @@ -12,8 +12,8 @@ import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.StopTime; import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalMap; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java index bf41de90556..82eee0d9939 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java @@ -6,7 +6,7 @@ import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; import org.opentripplanner.service.vehicleparking.model.VehicleParking; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/WheelChairMapper.java b/application/src/main/java/org/opentripplanner/netex/mapping/WheelChairMapper.java index cdcfeda27d4..5445975fe73 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/WheelChairMapper.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/WheelChairMapper.java @@ -1,7 +1,7 @@ package org.opentripplanner.netex.mapping; import java.util.Optional; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.model.accessibility.Accessibility; import org.rutebanken.netex.model.AccessibilityAssessment; import org.rutebanken.netex.model.AccessibilityLimitation; import org.rutebanken.netex.model.AccessibilityLimitations_RelStructure; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/calendar/CalendarServiceBuilder.java b/application/src/main/java/org/opentripplanner/netex/mapping/calendar/CalendarServiceBuilder.java index f6863a8c303..842e23f51a9 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/calendar/CalendarServiceBuilder.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/calendar/CalendarServiceBuilder.java @@ -8,8 +8,8 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.LocalDateRange; import org.opentripplanner.model.calendar.ServiceCalendar; import org.opentripplanner.model.calendar.ServiceCalendarDate; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; diff --git a/application/src/main/java/org/opentripplanner/netex/mapping/support/FeedScopedIdFactory.java b/application/src/main/java/org/opentripplanner/netex/mapping/support/FeedScopedIdFactory.java index c258e0a84be..8bd3b0801cf 100644 --- a/application/src/main/java/org/opentripplanner/netex/mapping/support/FeedScopedIdFactory.java +++ b/application/src/main/java/org/opentripplanner/netex/mapping/support/FeedScopedIdFactory.java @@ -1,6 +1,6 @@ package org.opentripplanner.netex.mapping.support; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** * GTFS uses the term agency_id, which is used to scope the ids of all other elements in OTP. Since diff --git a/application/src/main/java/org/opentripplanner/osm/model/OsmEntity.java b/application/src/main/java/org/opentripplanner/osm/model/OsmEntity.java index 969abe364f5..e0e85482811 100644 --- a/application/src/main/java/org/opentripplanner/osm/model/OsmEntity.java +++ b/application/src/main/java/org/opentripplanner/osm/model/OsmEntity.java @@ -23,10 +23,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.i18n.TranslatedString; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.TranslatedString; import org.opentripplanner.graph_builder.module.osm.OsmModule; import org.opentripplanner.osm.OsmProvider; import org.opentripplanner.street.model.StreetTraversalPermission; diff --git a/application/src/main/java/org/opentripplanner/osm/wayproperty/CreativeNamer.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/CreativeNamer.java index 901a449a96a..427f9f3dae6 100644 --- a/application/src/main/java/org/opentripplanner/osm/wayproperty/CreativeNamer.java +++ b/application/src/main/java/org/opentripplanner/osm/wayproperty/CreativeNamer.java @@ -1,6 +1,6 @@ package org.opentripplanner.osm.wayproperty; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.osm.model.OsmEntity; /** diff --git a/application/src/main/java/org/opentripplanner/osm/wayproperty/LocalizedStringMapper.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/LocalizedStringMapper.java index 3022f1429ab..99e0371ba66 100644 --- a/application/src/main/java/org/opentripplanner/osm/wayproperty/LocalizedStringMapper.java +++ b/application/src/main/java/org/opentripplanner/osm/wayproperty/LocalizedStringMapper.java @@ -8,10 +8,10 @@ import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.opentripplanner.core.domain.framework.resources.ResourceBundleSingleton; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.LocalizedString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.LocalizedString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.resources.ResourceBundleSingleton; import org.opentripplanner.osm.model.OsmEntity; class LocalizedStringMapper { diff --git a/application/src/main/java/org/opentripplanner/osm/wayproperty/WayPropertySet.java b/application/src/main/java/org/opentripplanner/osm/wayproperty/WayPropertySet.java index f36a0974e73..e0e5be227b2 100644 --- a/application/src/main/java/org/opentripplanner/osm/wayproperty/WayPropertySet.java +++ b/application/src/main/java/org/opentripplanner/osm/wayproperty/WayPropertySet.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.List; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.framework.functional.FunctionUtils.TriFunction; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.osm.model.OsmEntity; diff --git a/application/src/main/java/org/opentripplanner/place/NearbyPlaceFinder.java b/application/src/main/java/org/opentripplanner/place/NearbyPlaceFinder.java index b41b5568940..ed528564196 100644 --- a/application/src/main/java/org/opentripplanner/place/NearbyPlaceFinder.java +++ b/application/src/main/java/org/opentripplanner/place/NearbyPlaceFinder.java @@ -1,7 +1,7 @@ package org.opentripplanner.place; import java.util.List; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.place.api.PlaceAtDistance; import org.opentripplanner.place.api.PlaceType; import org.opentripplanner.transit.model.basic.TransitMode; diff --git a/application/src/main/java/org/opentripplanner/place/api/NearbyStop.java b/application/src/main/java/org/opentripplanner/place/api/NearbyStop.java index 0e4c5d30baa..7ed01d94aa9 100644 --- a/application/src/main/java/org/opentripplanner/place/api/NearbyStop.java +++ b/application/src/main/java/org/opentripplanner/place/api/NearbyStop.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Locale; import java.util.Objects; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.place.nearbystopfinder.ChronologicalGraphPath; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.search.state.State; diff --git a/application/src/main/java/org/opentripplanner/place/api/PatternAtStop.java b/application/src/main/java/org/opentripplanner/place/api/PatternAtStop.java index cc060e0e5ca..c2e5d160cd4 100644 --- a/application/src/main/java/org/opentripplanner/place/api/PatternAtStop.java +++ b/application/src/main/java/org/opentripplanner/place/api/PatternAtStop.java @@ -6,7 +6,7 @@ import java.util.Base64; import java.util.List; import java.util.Objects; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.site.StopLocation; diff --git a/application/src/main/java/org/opentripplanner/place/nearbystopfinder/CompositeNearbyStopFilter.java b/application/src/main/java/org/opentripplanner/place/nearbystopfinder/CompositeNearbyStopFilter.java index dae0794a204..54844e0058b 100644 --- a/application/src/main/java/org/opentripplanner/place/nearbystopfinder/CompositeNearbyStopFilter.java +++ b/application/src/main/java/org/opentripplanner/place/nearbystopfinder/CompositeNearbyStopFilter.java @@ -5,7 +5,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.place.api.NearbyStop; /** diff --git a/application/src/main/java/org/opentripplanner/place/nearbystopfinder/FlexTripNearbyStopFilter.java b/application/src/main/java/org/opentripplanner/place/nearbystopfinder/FlexTripNearbyStopFilter.java index f2396e72493..700d5466abb 100644 --- a/application/src/main/java/org/opentripplanner/place/nearbystopfinder/FlexTripNearbyStopFilter.java +++ b/application/src/main/java/org/opentripplanner/place/nearbystopfinder/FlexTripNearbyStopFilter.java @@ -1,7 +1,7 @@ package org.opentripplanner.place.nearbystopfinder; import java.util.Collection; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.place.api.NearbyStop; import org.opentripplanner.transit.service.TransitService; diff --git a/application/src/main/java/org/opentripplanner/place/nearbystopfinder/NearbyStopFilter.java b/application/src/main/java/org/opentripplanner/place/nearbystopfinder/NearbyStopFilter.java index ecb0480708d..0d9a3d2d1c2 100644 --- a/application/src/main/java/org/opentripplanner/place/nearbystopfinder/NearbyStopFilter.java +++ b/application/src/main/java/org/opentripplanner/place/nearbystopfinder/NearbyStopFilter.java @@ -1,7 +1,7 @@ package org.opentripplanner.place.nearbystopfinder; import java.util.Collection; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.place.api.NearbyStop; /** diff --git a/application/src/main/java/org/opentripplanner/place/nearbystopfinder/NearbyStopFinderVisitor.java b/application/src/main/java/org/opentripplanner/place/nearbystopfinder/NearbyStopFinderVisitor.java index 77cb89b043f..1a5b915d08e 100644 --- a/application/src/main/java/org/opentripplanner/place/nearbystopfinder/NearbyStopFinderVisitor.java +++ b/application/src/main/java/org/opentripplanner/place/nearbystopfinder/NearbyStopFinderVisitor.java @@ -10,7 +10,7 @@ import java.util.Set; import java.util.function.Predicate; import org.opentripplanner.astar.spi.TraverseVisitor; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.place.api.NearbyStop; import org.opentripplanner.street.model.edge.Edge; diff --git a/application/src/main/java/org/opentripplanner/place/nearbystopfinder/PatternNearbyStopFilter.java b/application/src/main/java/org/opentripplanner/place/nearbystopfinder/PatternNearbyStopFilter.java index 4b78831f570..51291a51822 100644 --- a/application/src/main/java/org/opentripplanner/place/nearbystopfinder/PatternNearbyStopFilter.java +++ b/application/src/main/java/org/opentripplanner/place/nearbystopfinder/PatternNearbyStopFilter.java @@ -4,7 +4,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.place.api.NearbyStop; import org.opentripplanner.transit.model.network.TripPattern; diff --git a/application/src/main/java/org/opentripplanner/place/placefinder/PlaceFinderTraverseVisitor.java b/application/src/main/java/org/opentripplanner/place/placefinder/PlaceFinderTraverseVisitor.java index cb2a21f34ed..9e3ce3124cd 100644 --- a/application/src/main/java/org/opentripplanner/place/placefinder/PlaceFinderTraverseVisitor.java +++ b/application/src/main/java/org/opentripplanner/place/placefinder/PlaceFinderTraverseVisitor.java @@ -7,7 +7,7 @@ import java.util.Set; import org.opentripplanner.astar.spi.SkipEdgeStrategy; import org.opentripplanner.astar.spi.TraverseVisitor; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.place.api.PatternAtStop; import org.opentripplanner.place.api.PlaceAtDistance; import org.opentripplanner.place.api.PlaceType; diff --git a/application/src/main/java/org/opentripplanner/place/placefinder/StreetNearbyPlaceFinder.java b/application/src/main/java/org/opentripplanner/place/placefinder/StreetNearbyPlaceFinder.java index df480547f88..41e992426ee 100644 --- a/application/src/main/java/org/opentripplanner/place/placefinder/StreetNearbyPlaceFinder.java +++ b/application/src/main/java/org/opentripplanner/place/placefinder/StreetNearbyPlaceFinder.java @@ -6,7 +6,7 @@ import java.util.List; import org.opentripplanner.astar.spi.SkipEdgeStrategy; import org.opentripplanner.astar.spi.TraverseVisitor; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.application.OTPRequestTimeoutException; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.place.NearbyPlaceFinder; diff --git a/application/src/main/java/org/opentripplanner/routing/alertpatch/AlertCalendar.java b/application/src/main/java/org/opentripplanner/routing/alertpatch/AlertCalendar.java index 0b4c8212ec8..7ae8c3277a8 100644 --- a/application/src/main/java/org/opentripplanner/routing/alertpatch/AlertCalendar.java +++ b/application/src/main/java/org/opentripplanner/routing/alertpatch/AlertCalendar.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Objects; import java.util.Optional; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.utils.tostring.ToStringBuilder; /** diff --git a/application/src/main/java/org/opentripplanner/routing/alertpatch/EntityKey.java b/application/src/main/java/org/opentripplanner/routing/alertpatch/EntityKey.java index 61cbc918d03..e4c0fdaa28a 100644 --- a/application/src/main/java/org/opentripplanner/routing/alertpatch/EntityKey.java +++ b/application/src/main/java/org/opentripplanner/routing/alertpatch/EntityKey.java @@ -1,6 +1,6 @@ package org.opentripplanner.routing.alertpatch; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.timetable.Direction; /** diff --git a/application/src/main/java/org/opentripplanner/routing/alertpatch/EntitySelector.java b/application/src/main/java/org/opentripplanner/routing/alertpatch/EntitySelector.java index 8f049f90454..ff8a91ea2b9 100644 --- a/application/src/main/java/org/opentripplanner/routing/alertpatch/EntitySelector.java +++ b/application/src/main/java/org/opentripplanner/routing/alertpatch/EntitySelector.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.timetable.Direction; /** diff --git a/application/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java b/application/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java index d34897a11eb..7ee1b925aac 100644 --- a/application/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java +++ b/application/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java @@ -7,9 +7,9 @@ import java.util.Optional; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; import org.opentripplanner.transit.model.framework.TransitBuilder; diff --git a/application/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlertBuilder.java b/application/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlertBuilder.java index 16405e8f353..4fa0965033a 100644 --- a/application/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlertBuilder.java +++ b/application/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlertBuilder.java @@ -6,8 +6,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; public class TransitAlertBuilder extends AbstractEntityBuilder { 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 c2dac23e27d..071563bbf3e 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 @@ -11,7 +11,7 @@ import java.util.function.Consumer; import java.util.function.Function; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.ext.accessibilityscore.DecorateWithAccessibilityScore; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.model.plan.Itinerary; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java index dbf7eaf49c9..aaddc731839 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.OptionalInt; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.routing.algorithm.filterchain.filters.transit.TransitGeneralizedCostFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java index 686b1ab699c..38b70ea5810 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.OptionalInt; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterResult.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterResult.java index 52011cf8455..2ed0d1ac7a1 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterResult.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterResult.java @@ -1,6 +1,6 @@ package org.opentripplanner.routing.algorithm.filterchain.filters.transit; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.utils.tostring.ToStringBuilder; /** 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 b9578177663..a7f016aeb9f 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,7 +4,7 @@ import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCost.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCost.java index ee8ab04b797..cd8269ae844 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCost.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCost.java @@ -4,7 +4,7 @@ import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.GroupByFilter; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByAllSameStations.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByAllSameStations.java index 97158ce3a16..ec801855d58 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByAllSameStations.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByAllSameStations.java @@ -2,7 +2,7 @@ import java.util.List; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.GroupId; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameFirstOrLastTrip.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameFirstOrLastTrip.java index 149350a3b2e..88517b95742 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameFirstOrLastTrip.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameFirstOrLastTrip.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.GroupId; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameRoutesAndStops.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameRoutesAndStops.java index f1ec1c8c321..51cea0b048c 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameRoutesAndStops.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameRoutesAndStops.java @@ -2,7 +2,7 @@ import java.util.List; import java.util.stream.Stream; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.GroupId; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/paging/DefaultPageCursorInput.java b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/paging/DefaultPageCursorInput.java index bb26a1aac63..5944bea32c1 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/paging/DefaultPageCursorInput.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/filterchain/paging/DefaultPageCursorInput.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.algorithm.filterchain.paging; import java.time.Instant; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.paging.cursor.PageCursorInput; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/AlertToLegMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/AlertToLegMapper.java index e0926d0f1a8..c52e0f6880c 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/AlertToLegMapper.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/AlertToLegMapper.java @@ -8,8 +8,8 @@ import java.util.List; import java.util.Set; import java.util.function.Function; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.model.plan.TransitLeg; import org.opentripplanner.model.plan.leg.StopArrival; import org.opentripplanner.routing.alertpatch.StopCondition; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/LegsToItineraryMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/LegsToItineraryMapper.java index d4bdcaa2378..86ac99137c8 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/LegsToItineraryMapper.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/LegsToItineraryMapper.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.street.model.path.ElevationChange; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java index 13ce4e80ae4..ceffaf4620e 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java @@ -7,8 +7,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import org.opentripplanner.core.domain.model.basic.Cost; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.ext.carpooling.internal.CarpoolItineraryMapper; import org.opentripplanner.ext.carpooling.routing.CarpoolAccessEgress; import org.opentripplanner.framework.application.OTPFeature; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapper.java index 671524492ec..5a732c75c9d 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapper.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapper.java @@ -10,8 +10,8 @@ import javax.annotation.Nullable; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.LocalizedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.LocalizedString; import org.opentripplanner.model.plan.walkstep.RelativeDirection; import org.opentripplanner.model.plan.walkstep.WalkStep; import org.opentripplanner.model.plan.walkstep.WalkStepBuilder; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/StreetPathToLegsMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/StreetPathToLegsMapper.java index cc6e00a7a74..eed4e0a44b8 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/StreetPathToLegsMapper.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/StreetPathToLegsMapper.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.ext.flex.FlexibleTransitLeg; import org.opentripplanner.ext.flex.edgetype.FlexTripEdge; import org.opentripplanner.framework.application.OTPFeature; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/TripPlanMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/TripPlanMapper.java index 558587c3f64..ce0827fa3d2 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/TripPlanMapper.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/mapping/TripPlanMapper.java @@ -2,7 +2,7 @@ import java.time.Instant; import java.util.List; -import org.opentripplanner.core.domain.model.i18n.LocalizedString; +import org.opentripplanner.core.model.i18n.LocalizedString; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java index e188ec2bef2..3e221b09c1d 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java @@ -9,7 +9,7 @@ import java.util.concurrent.CompletionException; import java.util.stream.IntStream; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.carpooling.CarpoolingService; import org.opentripplanner.ext.dataoverlay.configuration.DataOverlayParameterBindings; import org.opentripplanner.ext.flex.FlexParameters; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/startonboardaccess/TripAndServiceDateResolver.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/startonboardaccess/TripAndServiceDateResolver.java index a9e06e1ad5b..17be03f1d80 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/startonboardaccess/TripAndServiceDateResolver.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/startonboardaccess/TripAndServiceDateResolver.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.algorithm.raptoradapter.router.startonboardaccess; import java.time.LocalDate; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.TripOnDateReference; import org.opentripplanner.routing.api.request.TripOnDateReferenceWithTripAndDate; import org.opentripplanner.routing.api.request.TripOnDateReferenceWithTripOnServiceDateId; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/startonboardaccess/TripLocationResolver.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/startonboardaccess/TripLocationResolver.java index e7085e653a1..5b960c72a10 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/startonboardaccess/TripLocationResolver.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/startonboardaccess/TripLocationResolver.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.api.response.InputField; import org.opentripplanner.routing.api.response.RoutingError; import org.opentripplanner.routing.api.response.RoutingErrorCode; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTripSchedule.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTripSchedule.java index 93ac3bb4854..63fbd18a309 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTripSchedule.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTripSchedule.java @@ -1,6 +1,6 @@ package org.opentripplanner.routing.algorithm.raptoradapter.transit.cost; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.model.accessibility.Accessibility; import org.opentripplanner.raptor.spi.RaptorTripSchedule; public interface DefaultTripSchedule extends RaptorTripSchedule { diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostLinearFunction.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostLinearFunction.java index 4ad7d30dd43..942580e2c40 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostLinearFunction.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostLinearFunction.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.algorithm.raptoradapter.transit.cost; import java.util.Objects; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.raptor.spi.RaptorCostConverter; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.routing.api.request.framework.LinearFunctionSerialization; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculator.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculator.java index ecf9ba3bc3c..ad0d597929b 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculator.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculator.java @@ -1,6 +1,6 @@ package org.opentripplanner.routing.algorithm.raptoradapter.transit.cost; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.model.accessibility.Accessibility; import org.opentripplanner.raptor.spi.RaptorCostCalculator; import org.opentripplanner.raptor.spi.RaptorCostConverter; import org.opentripplanner.raptor.spi.RaptorTransferConstraint; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyBoardOrAlightEvent.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyBoardOrAlightEvent.java index fd804d6bd56..9473438c82d 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyBoardOrAlightEvent.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/FrequencyBoardOrAlightEvent.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.algorithm.raptoradapter.transit.frequency; import java.time.LocalDate; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.model.accessibility.Accessibility; import org.opentripplanner.raptor.spi.RaptorBoardOrAlightEvent; import org.opentripplanner.raptor.spi.RaptorTransferConstraint; import org.opentripplanner.raptor.spi.RaptorTripPattern; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/GeneralizedCostParametersMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/GeneralizedCostParametersMapper.java index 4f558b24f3e..68746fdb4ee 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/GeneralizedCostParametersMapper.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/GeneralizedCostParametersMapper.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.Set; import java.util.function.Function; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.raptor.spi.RaptorTripPattern; import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.GeneralizedCostParameters; import org.opentripplanner.routing.api.request.RouteRequest; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/LookupStopIndexCallback.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/LookupStopIndexCallback.java index 8daf635d884..829a2fa9a94 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/LookupStopIndexCallback.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/LookupStopIndexCallback.java @@ -2,7 +2,7 @@ import java.util.Collection; import java.util.stream.IntStream; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** * The raptor mapper does not have access to the transit layer, so it needs help to diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java index e883ba26850..dbc35bb3e74 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.raptor.api.model.GeneralizedCostRelaxFunction; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TimetableUpdateMapper.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TimetableUpdateMapper.java index f1ca66219b0..10e7d3fd72e 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TimetableUpdateMapper.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TimetableUpdateMapper.java @@ -12,7 +12,7 @@ import java.util.SortedSet; import java.util.function.Function; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitData; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripPatternForDate; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilter.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilter.java index f6d7a6c5bb6..5047da906cf 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilter.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilter.java @@ -4,8 +4,8 @@ import java.util.Set; import java.util.function.Predicate; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.PickDrop; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.request.filter.TransitFilter; diff --git a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilterBuilder.java b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilterBuilder.java index 9a34fa16ccc..72c8486e3af 100644 --- a/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilterBuilder.java +++ b/application/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilterBuilder.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.request.filter.AllowAllTransitFilter; import org.opentripplanner.routing.api.request.request.filter.TransitFilter; 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 45792bbcac4..423cf6fe0ec 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,7 @@ import java.util.Arrays; import java.util.BitSet; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.model.accessibility.Accessibility; import org.opentripplanner.raptor.spi.IntIterator; import org.opentripplanner.raptor.spi.IntIterators; import org.opentripplanner.raptor.spi.RaptorRoute; 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 feded512a4b..52449a25ea9 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 @@ -1,7 +1,7 @@ package org.opentripplanner.routing.algorithm.raptoradapter.transit.request; import java.time.LocalDate; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.model.accessibility.Accessibility; import org.opentripplanner.raptor.spi.IntIterator; import org.opentripplanner.raptor.spi.RaptorTripPattern; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripPatternForDate; diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/TripLocation.java b/application/src/main/java/org/opentripplanner/routing/api/request/TripLocation.java index fa28f4219ac..4056fea9f5a 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/TripLocation.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/TripLocation.java @@ -3,7 +3,7 @@ import java.time.Instant; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** * Identifies a position on-board a specific transit trip. Used to start a trip planning search diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/TripOnDateReference.java b/application/src/main/java/org/opentripplanner/routing/api/request/TripOnDateReference.java index 9643d2a0794..ad2255a8fce 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/TripOnDateReference.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/TripOnDateReference.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.api.request; import java.time.LocalDate; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; public sealed interface TripOnDateReference permits TripOnDateReferenceWithTripOnServiceDateId, TripOnDateReferenceWithTripAndDate diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/TripOnDateReferenceWithTripAndDate.java b/application/src/main/java/org/opentripplanner/routing/api/request/TripOnDateReferenceWithTripAndDate.java index 7a79093c35a..9fc504d2afc 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/TripOnDateReferenceWithTripAndDate.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/TripOnDateReferenceWithTripAndDate.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.api.request; import java.time.LocalDate; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** * A reference to a trip on date with an id representing the trip and a date identifying on which diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/TripOnDateReferenceWithTripOnServiceDateId.java b/application/src/main/java/org/opentripplanner/routing/api/request/TripOnDateReferenceWithTripOnServiceDateId.java index c774afaec61..351eb20c7a1 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/TripOnDateReferenceWithTripOnServiceDateId.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/TripOnDateReferenceWithTripOnServiceDateId.java @@ -1,6 +1,6 @@ package org.opentripplanner.routing.api.request; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** * A reference to a trip on date with a single id referencing the specific trip on service date. diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/framework/CostLinearFunction.java b/application/src/main/java/org/opentripplanner/routing/api/request/framework/CostLinearFunction.java index 68672a44677..3d653405064 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/framework/CostLinearFunction.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/framework/CostLinearFunction.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.api.request.framework; import java.time.Duration; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; /** * A linear function to calculate a new cost based on a cost value input. 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 312df233eb6..44f37902007 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,7 +7,7 @@ import java.util.function.BiFunction; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.utils.lang.IntUtils; import org.opentripplanner.utils.lang.StringUtils; import org.opentripplanner.utils.lang.Units; diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenalty.java b/application/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenalty.java index 4f1be0e8e58..cc416f5ac0b 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenalty.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenalty.java @@ -2,7 +2,7 @@ import java.time.Duration; import java.util.Objects; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.utils.lang.Units; 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 52114440f29..5ad89994097 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 @@ -2,7 +2,7 @@ import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.utils.tostring.ToStringBuilder; /** 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 138ad26a090..6891c4dd2ac 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 @@ -8,7 +8,7 @@ import java.io.Serializable; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.street.model.VehicleRoutingOptimizeType; import org.opentripplanner.utils.lang.Units; import org.opentripplanner.utils.tostring.ToStringBuilder; 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 7a780e47f75..142fe1a217b 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 @@ -6,7 +6,7 @@ import java.time.Duration; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.utils.lang.DoubleUtils; import org.opentripplanner.utils.lang.Units; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/DirectTransitPreferences.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/DirectTransitPreferences.java index a76125727c4..8b36f200225 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/DirectTransitPreferences.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/DirectTransitPreferences.java @@ -4,7 +4,7 @@ import java.util.Objects; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.utils.tostring.ToStringBuilder; 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 844597f2c0e..e31641713bf 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 @@ -4,7 +4,7 @@ import java.time.Duration; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.utils.lang.Units; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterDebugProfile.java b/application/src/main/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterDebugProfile.java index 6f733e59bb4..53d15dfe32d 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterDebugProfile.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/preference/ItineraryFilterDebugProfile.java @@ -1,6 +1,6 @@ package org.opentripplanner.routing.api.request.preference; -import org.opentripplanner.core.domain.model.doc.DocumentedEnum; +import org.opentripplanner.core.model.doc.DocumentedEnum; /** * This enum controls the number of itineraries returned with debug information - itineraries 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 667348b38c7..08ed0ec99f2 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 @@ -7,7 +7,7 @@ import java.time.Duration; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.routing.algorithm.transferoptimization.api.TransferOptimizationParameters; import org.opentripplanner.utils.lang.Units; import org.opentripplanner.utils.time.DurationUtils; 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 84e6c2f1ee8..2c78a737ded 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,7 +7,7 @@ import java.util.Objects; import java.util.Optional; import java.util.function.Consumer; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.routing.api.request.framework.DurationForEnum; import org.opentripplanner.transit.model.basic.TransitMode; 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 527914d622f..a4dba756468 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 @@ -6,7 +6,7 @@ import java.util.Objects; import java.util.Set; import java.util.function.Consumer; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.routing.api.request.preference.filter.VehicleParkingFilter; import org.opentripplanner.routing.api.request.preference.filter.VehicleParkingSelect; import org.opentripplanner.utils.tostring.ToStringBuilder; 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 33b17597470..c4e581d5ac8 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 @@ -5,7 +5,7 @@ import java.util.Objects; import java.util.Set; import java.util.function.Consumer; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.street.search.request.RentalRequest; import org.opentripplanner.utils.lang.DoubleUtils; import org.opentripplanner.utils.lang.Units; 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 224d3c26d7d..da994c8b7b6 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 @@ -4,7 +4,7 @@ import java.time.Duration; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.utils.lang.Units; import org.opentripplanner.utils.tostring.ToStringBuilder; 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 7ead768c115..cd609662d9d 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 @@ -6,7 +6,7 @@ import java.io.Serializable; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.utils.lang.Units; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/request/TransitRequest.java b/application/src/main/java/org/opentripplanner/routing/api/request/request/TransitRequest.java index 6dda2c7f0b0..bfb7994e651 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/request/TransitRequest.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/request/TransitRequest.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.List; import java.util.Objects; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.modes.ExcludeAllTransitFilter; import org.opentripplanner.routing.api.request.DebugRaptor; import org.opentripplanner.routing.api.request.request.filter.AllowAllTransitFilter; diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/request/TransitRequestBuilder.java b/application/src/main/java/org/opentripplanner/routing/api/request/request/TransitRequestBuilder.java index 9330fba3f64..458d580662a 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/request/TransitRequestBuilder.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/request/TransitRequestBuilder.java @@ -2,7 +2,7 @@ import java.util.List; import java.util.function.Consumer; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.modes.ExcludeAllTransitFilter; import org.opentripplanner.routing.api.request.DebugRaptor; import org.opentripplanner.routing.api.request.DebugRaptorBuilder; 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 a392a9800d8..8dc4a184b2e 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,7 +4,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.modes.AllowTransitModeFilter; import org.opentripplanner.transit.model.basic.MainAndSubMode; import org.opentripplanner.transit.model.basic.NarrowedTransitMode; 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 553d1fe696c..907ea35e726 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,7 +5,7 @@ import java.util.Comparator; import java.util.List; import java.util.Objects; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/via/AbstractViaLocation.java b/application/src/main/java/org/opentripplanner/routing/api/request/via/AbstractViaLocation.java index 31ed72abb84..906a9a99870 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/via/AbstractViaLocation.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/via/AbstractViaLocation.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; public abstract class AbstractViaLocation implements ViaLocation { 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 73c881e5a81..ca05867b81b 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,7 +2,7 @@ import java.util.Collection; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.utils.tostring.ToStringBuilder; /** diff --git a/application/src/main/java/org/opentripplanner/routing/api/request/via/ViaLocation.java b/application/src/main/java/org/opentripplanner/routing/api/request/via/ViaLocation.java index ce4d74b8114..0328196f04e 100644 --- a/application/src/main/java/org/opentripplanner/routing/api/request/via/ViaLocation.java +++ b/application/src/main/java/org/opentripplanner/routing/api/request/via/ViaLocation.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; /** 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 aaff89d65ca..f82bc183d36 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,7 +5,7 @@ import java.util.Objects; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.utils.time.DurationUtils; diff --git a/application/src/main/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImpl.java b/application/src/main/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImpl.java index 20ab69216f0..7674874a921 100644 --- a/application/src/main/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImpl.java +++ b/application/src/main/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImpl.java @@ -7,7 +7,7 @@ import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.alertpatch.StopCondition; import org.opentripplanner.routing.alertpatch.TransitAlert; import org.opentripplanner.routing.services.TransitAlertService; diff --git a/application/src/main/java/org/opentripplanner/routing/impl/TransitAlertServiceImpl.java b/application/src/main/java/org/opentripplanner/routing/impl/TransitAlertServiceImpl.java index 8e87cd9c860..1a92972b052 100644 --- a/application/src/main/java/org/opentripplanner/routing/impl/TransitAlertServiceImpl.java +++ b/application/src/main/java/org/opentripplanner/routing/impl/TransitAlertServiceImpl.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.alertpatch.EntityKey; import org.opentripplanner.routing.alertpatch.EntitySelector; import org.opentripplanner.routing.alertpatch.StopCondition; diff --git a/application/src/main/java/org/opentripplanner/routing/linking/LinkingContextFactory.java b/application/src/main/java/org/opentripplanner/routing/linking/LinkingContextFactory.java index 7c020ebd1ab..5cdecc02330 100644 --- a/application/src/main/java/org/opentripplanner/routing/linking/LinkingContextFactory.java +++ b/application/src/main/java/org/opentripplanner/routing/linking/LinkingContextFactory.java @@ -17,7 +17,7 @@ import javax.annotation.Nullable; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.GeometryFactory; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.routing.api.response.InputField; import org.opentripplanner.routing.api.response.RoutingError; diff --git a/application/src/main/java/org/opentripplanner/routing/linking/internal/VertexCreationService.java b/application/src/main/java/org/opentripplanner/routing/linking/internal/VertexCreationService.java index 944d903eb7b..08216800d9f 100644 --- a/application/src/main/java/org/opentripplanner/routing/linking/internal/VertexCreationService.java +++ b/application/src/main/java/org/opentripplanner/routing/linking/internal/VertexCreationService.java @@ -3,9 +3,9 @@ import java.util.List; import javax.annotation.Nullable; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.LocalizedString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.LocalizedString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.street.linking.LinkingDirection; import org.opentripplanner.street.linking.TemporaryVerticesContainer; import org.opentripplanner.street.linking.VertexLinker; diff --git a/application/src/main/java/org/opentripplanner/routing/refetch/RefetchItineraryService.java b/application/src/main/java/org/opentripplanner/routing/refetch/RefetchItineraryService.java index 9253933c0bc..5e0d4379b83 100644 --- a/application/src/main/java/org/opentripplanner/routing/refetch/RefetchItineraryService.java +++ b/application/src/main/java/org/opentripplanner/routing/refetch/RefetchItineraryService.java @@ -9,7 +9,7 @@ import java.util.Set; import javax.annotation.Nullable; import org.opentripplanner.astar.strategy.DurationSkipEdgeStrategy; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.framework.application.OTPRequestTimeoutException; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.model.plan.Itinerary; diff --git a/application/src/main/java/org/opentripplanner/routing/services/TransitAlertService.java b/application/src/main/java/org/opentripplanner/routing/services/TransitAlertService.java index 58e7cc78b60..eb361cab4d5 100644 --- a/application/src/main/java/org/opentripplanner/routing/services/TransitAlertService.java +++ b/application/src/main/java/org/opentripplanner/routing/services/TransitAlertService.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.List; import java.util.Set; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.alertpatch.StopCondition; import org.opentripplanner.routing.alertpatch.TransitAlert; import org.opentripplanner.transit.api.request.TransitAlertRequest; diff --git a/application/src/main/java/org/opentripplanner/service/osminfo/model/Platform.java b/application/src/main/java/org/opentripplanner/service/osminfo/model/Platform.java index 173bad79eb4..545c86283c4 100644 --- a/application/src/main/java/org/opentripplanner/service/osminfo/model/Platform.java +++ b/application/src/main/java/org/opentripplanner/service/osminfo/model/Platform.java @@ -2,6 +2,6 @@ import java.util.Set; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; public record Platform(I18NString name, Geometry geometry, Set references) {} diff --git a/application/src/main/java/org/opentripplanner/service/realtimevehicles/RealtimeVehicleRepository.java b/application/src/main/java/org/opentripplanner/service/realtimevehicles/RealtimeVehicleRepository.java index 4ed0f609b70..53bbf3773a6 100644 --- a/application/src/main/java/org/opentripplanner/service/realtimevehicles/RealtimeVehicleRepository.java +++ b/application/src/main/java/org/opentripplanner/service/realtimevehicles/RealtimeVehicleRepository.java @@ -1,7 +1,7 @@ package org.opentripplanner.service.realtimevehicles; import com.google.common.collect.Multimap; -import org.opentripplanner.core.domain.framework.transaction.api.WriteContext; +import org.opentripplanner.core.model.transaction.WriteContext; import org.opentripplanner.service.realtimevehicles.model.RealtimeVehicle; import org.opentripplanner.transit.model.network.TripPattern; diff --git a/application/src/main/java/org/opentripplanner/service/realtimevehicles/configure/RealtimeVehicleRepositoryModule.java b/application/src/main/java/org/opentripplanner/service/realtimevehicles/configure/RealtimeVehicleRepositoryModule.java index 8dcb1f04821..f249b48a1de 100644 --- a/application/src/main/java/org/opentripplanner/service/realtimevehicles/configure/RealtimeVehicleRepositoryModule.java +++ b/application/src/main/java/org/opentripplanner/service/realtimevehicles/configure/RealtimeVehicleRepositoryModule.java @@ -3,9 +3,9 @@ import dagger.Module; import dagger.Provides; import jakarta.inject.Singleton; -import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; import org.opentripplanner.core.framework.transaction.configure.TransitDomain; +import org.opentripplanner.core.model.transaction.RepositoryHandle; +import org.opentripplanner.core.model.transaction.RepositoryRegistry; import org.opentripplanner.service.realtimevehicles.RealtimeVehicleRepository; import org.opentripplanner.service.realtimevehicles.RealtimeVehicleRepositorySnapshot; import org.opentripplanner.service.realtimevehicles.internal.DefaultRealtimeVehicleRepository; diff --git a/application/src/main/java/org/opentripplanner/service/realtimevehicles/internal/RealtimeVehicleRepositoryLifecycle.java b/application/src/main/java/org/opentripplanner/service/realtimevehicles/internal/RealtimeVehicleRepositoryLifecycle.java index 8c2ccc2a471..861ff70217e 100644 --- a/application/src/main/java/org/opentripplanner/service/realtimevehicles/internal/RealtimeVehicleRepositoryLifecycle.java +++ b/application/src/main/java/org/opentripplanner/service/realtimevehicles/internal/RealtimeVehicleRepositoryLifecycle.java @@ -1,6 +1,6 @@ package org.opentripplanner.service.realtimevehicles.internal; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryLifecycle; +import org.opentripplanner.core.model.transaction.RepositoryLifecycle; import org.opentripplanner.service.realtimevehicles.RealtimeVehicleRepository; import org.opentripplanner.service.realtimevehicles.RealtimeVehicleRepositorySnapshot; diff --git a/application/src/main/java/org/opentripplanner/service/realtimevehicles/model/RealtimeVehicle.java b/application/src/main/java/org/opentripplanner/service/realtimevehicles/model/RealtimeVehicle.java index b297356a0d7..9937aa4de24 100644 --- a/application/src/main/java/org/opentripplanner/service/realtimevehicles/model/RealtimeVehicle.java +++ b/application/src/main/java/org/opentripplanner/service/realtimevehicles/model/RealtimeVehicle.java @@ -2,7 +2,7 @@ import java.time.Instant; import java.util.Optional; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.OccupancyStatus; diff --git a/application/src/main/java/org/opentripplanner/service/realtimevehicles/model/RealtimeVehicleBuilder.java b/application/src/main/java/org/opentripplanner/service/realtimevehicles/model/RealtimeVehicleBuilder.java index d065e857607..403e6fee896 100644 --- a/application/src/main/java/org/opentripplanner/service/realtimevehicles/model/RealtimeVehicleBuilder.java +++ b/application/src/main/java/org/opentripplanner/service/realtimevehicles/model/RealtimeVehicleBuilder.java @@ -1,7 +1,7 @@ package org.opentripplanner.service.realtimevehicles.model; import java.time.Instant; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.realtimevehicles.model.RealtimeVehicle.StopStatus; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.site.StopLocation; diff --git a/application/src/main/java/org/opentripplanner/standalone/api/HttpRequestScoped.java b/application/src/main/java/org/opentripplanner/standalone/api/HttpRequestScoped.java index dcea6ae11e7..9caf1f411ec 100644 --- a/application/src/main/java/org/opentripplanner/standalone/api/HttpRequestScoped.java +++ b/application/src/main/java/org/opentripplanner/standalone/api/HttpRequestScoped.java @@ -5,7 +5,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.opentripplanner.core.domain.framework.transaction.api.TransactionScope; +import org.opentripplanner.core.model.transaction.TransactionScope; import org.opentripplanner.standalone.configure.RequestScopedFactory; /** 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 579dc451fe5..4cbc3030b9a 100644 --- a/application/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java +++ b/application/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java @@ -19,8 +19,8 @@ import java.util.Set; import java.util.regex.Pattern; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.LocalDateRange; import org.opentripplanner.datastore.api.OtpDataStoreConfig; import org.opentripplanner.ext.dataoverlay.configuration.DataOverlayConfig; import org.opentripplanner.ext.datastore.gs.config.GsConfig; diff --git a/application/src/main/java/org/opentripplanner/standalone/config/configure/DeduplicatorServiceModule.java b/application/src/main/java/org/opentripplanner/standalone/config/configure/DeduplicatorServiceModule.java index 0643a9c6539..f1cd44756b3 100644 --- a/application/src/main/java/org/opentripplanner/standalone/config/configure/DeduplicatorServiceModule.java +++ b/application/src/main/java/org/opentripplanner/standalone/config/configure/DeduplicatorServiceModule.java @@ -3,7 +3,7 @@ import dagger.Module; import dagger.Provides; import jakarta.inject.Singleton; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; import org.opentripplanner.transit.model.framework.Deduplicator; @Module diff --git a/application/src/main/java/org/opentripplanner/standalone/config/configure/LoadConfigModule.java b/application/src/main/java/org/opentripplanner/standalone/config/configure/LoadConfigModule.java index b938132c35c..1980d181fc4 100644 --- a/application/src/main/java/org/opentripplanner/standalone/config/configure/LoadConfigModule.java +++ b/application/src/main/java/org/opentripplanner/standalone/config/configure/LoadConfigModule.java @@ -4,8 +4,8 @@ import dagger.Provides; import jakarta.inject.Singleton; import java.io.File; -import org.opentripplanner.core.domain.framework.di.TransitServicePeriod; -import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.model.di.TransitServicePeriod; +import org.opentripplanner.core.model.time.LocalDateRange; import org.opentripplanner.datastore.api.OtpBaseDirectory; import org.opentripplanner.datastore.api.OtpDataStoreConfig; import org.opentripplanner.standalone.config.BuildConfig; 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 ebd3e659bad..5c089fb8220 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 @@ -2,7 +2,7 @@ import java.util.Arrays; import java.util.Optional; -import org.opentripplanner.core.domain.model.doc.DocumentedEnum; +import org.opentripplanner.core.model.doc.DocumentedEnum; import org.opentripplanner.utils.lang.StringUtils; /** 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 3f80d8043b6..bd0e4a787d0 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,7 +36,7 @@ import java.util.Set; import java.util.function.Function; import java.util.regex.Pattern; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.application.OtpAppException; import org.opentripplanner.framework.model.Gram; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; 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 ff37cdc814a..f6134d54a78 100644 --- a/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java +++ b/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java @@ -2,8 +2,8 @@ import jakarta.ws.rs.core.Application; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.transaction.RepositoryHandle; import org.opentripplanner.datastore.api.DataSource; import org.opentripplanner.ext.carpooling.CarpoolingRepository; import org.opentripplanner.ext.carpooling.routing.CarpoolTripVertexResolver; diff --git a/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java b/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java index 6d08aeeb770..9c863f21944 100644 --- a/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java +++ b/application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java @@ -9,11 +9,11 @@ import org.opentripplanner.apis.gtfs.configure.GtfsSchemaModule; import org.opentripplanner.apis.transmodel.configure.TransmodelSchema; import org.opentripplanner.apis.transmodel.configure.TransmodelSchemaModule; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.domain.framework.transaction.UpdateManager; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; import org.opentripplanner.core.framework.transaction.configure.StreetDomain; import org.opentripplanner.core.framework.transaction.configure.TransitDomain; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.transaction.RepositoryHandle; +import org.opentripplanner.core.model.transaction.UpdateManager; import org.opentripplanner.ext.carpooling.CarpoolingRepository; import org.opentripplanner.ext.carpooling.CarpoolingService; import org.opentripplanner.ext.carpooling.configure.CarpoolingModule; diff --git a/application/src/main/java/org/opentripplanner/standalone/configure/RequestScopedFactory.java b/application/src/main/java/org/opentripplanner/standalone/configure/RequestScopedFactory.java index 9672c903243..11b910a479d 100644 --- a/application/src/main/java/org/opentripplanner/standalone/configure/RequestScopedFactory.java +++ b/application/src/main/java/org/opentripplanner/standalone/configure/RequestScopedFactory.java @@ -9,7 +9,7 @@ import org.opentripplanner.apis.transmodel.TransmodelAPIParameters; import org.opentripplanner.apis.transmodel.TransmodelGraphQLRequestContext; import org.opentripplanner.apis.transmodel.configure.TransmodelSchema; -import org.opentripplanner.core.domain.framework.transaction.api.TransactionScope; +import org.opentripplanner.core.model.transaction.TransactionScope; import org.opentripplanner.ext.empiricaldelay.EmpiricalDelayService; import org.opentripplanner.ext.geocoder.LuceneIndex; import org.opentripplanner.ext.ojp.parameters.OjpApiParameters; diff --git a/application/src/main/java/org/opentripplanner/standalone/configure/RequestScopedModule.java b/application/src/main/java/org/opentripplanner/standalone/configure/RequestScopedModule.java index d5d3f60c93e..04852e03bc3 100644 --- a/application/src/main/java/org/opentripplanner/standalone/configure/RequestScopedModule.java +++ b/application/src/main/java/org/opentripplanner/standalone/configure/RequestScopedModule.java @@ -9,10 +9,10 @@ import org.opentripplanner.apis.gtfs.GtfsGraphQLRequestContext; import org.opentripplanner.apis.transmodel.TransmodelAPIParameters; import org.opentripplanner.apis.transmodel.TransmodelGraphQLRequestContext; -import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; -import org.opentripplanner.core.domain.framework.transaction.api.TransactionScope; import org.opentripplanner.core.framework.transaction.configure.TransitDomain; +import org.opentripplanner.core.model.transaction.RepositoryHandle; +import org.opentripplanner.core.model.transaction.RepositoryRegistry; +import org.opentripplanner.core.model.transaction.TransactionScope; import org.opentripplanner.ext.carpooling.CarpoolingService; import org.opentripplanner.ext.dataoverlay.configuration.DataOverlayParameterBindings; import org.opentripplanner.ext.flex.FlexParameters; diff --git a/application/src/main/java/org/opentripplanner/standalone/server/MetricsLogging.java b/application/src/main/java/org/opentripplanner/standalone/server/MetricsLogging.java index f5a79aaf01e..bdfd3a48205 100644 --- a/application/src/main/java/org/opentripplanner/standalone/server/MetricsLogging.java +++ b/application/src/main/java/org/opentripplanner/standalone/server/MetricsLogging.java @@ -19,9 +19,9 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ForkJoinPool; -import org.opentripplanner.core.domain.framework.transaction.UpdateManager; import org.opentripplanner.core.framework.transaction.configure.StreetDomain; import org.opentripplanner.core.framework.transaction.configure.TransitDomain; +import org.opentripplanner.core.model.transaction.UpdateManager; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.graph_builder.issue.api.DataImportIssueSummary; import org.opentripplanner.raptor.configure.RaptorConfig; diff --git a/application/src/main/java/org/opentripplanner/streetadapter/VertexFactory.java b/application/src/main/java/org/opentripplanner/streetadapter/VertexFactory.java index 62ddd071b4d..d19e72e73e3 100644 --- a/application/src/main/java/org/opentripplanner/streetadapter/VertexFactory.java +++ b/application/src/main/java/org/opentripplanner/streetadapter/VertexFactory.java @@ -3,8 +3,8 @@ import java.util.Set; import javax.annotation.Nullable; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.osm.model.OsmNode; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehicleparking.model.VehicleParkingEntrance; diff --git a/application/src/main/java/org/opentripplanner/transfer/constrained/model/ConstrainedTransfer.java b/application/src/main/java/org/opentripplanner/transfer/constrained/model/ConstrainedTransfer.java index 44f0068d5aa..717f1143659 100644 --- a/application/src/main/java/org/opentripplanner/transfer/constrained/model/ConstrainedTransfer.java +++ b/application/src/main/java/org/opentripplanner/transfer/constrained/model/ConstrainedTransfer.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.raptor.spi.RaptorConstrainedTransfer; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/main/java/org/opentripplanner/transit/EntranceResolver.java b/application/src/main/java/org/opentripplanner/transit/EntranceResolver.java index 421592a9cf6..76e0695cd22 100644 --- a/application/src/main/java/org/opentripplanner/transit/EntranceResolver.java +++ b/application/src/main/java/org/opentripplanner/transit/EntranceResolver.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.site.Entrance; @FunctionalInterface diff --git a/application/src/main/java/org/opentripplanner/transit/SiteResolver.java b/application/src/main/java/org/opentripplanner/transit/SiteResolver.java index 052af627c15..68e64765183 100644 --- a/application/src/main/java/org/opentripplanner/transit/SiteResolver.java +++ b/application/src/main/java/org/opentripplanner/transit/SiteResolver.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.site.Entrance; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; diff --git a/application/src/main/java/org/opentripplanner/transit/StopResolver.java b/application/src/main/java/org/opentripplanner/transit/StopResolver.java index e27832986aa..97cef33aa6a 100644 --- a/application/src/main/java/org/opentripplanner/transit/StopResolver.java +++ b/application/src/main/java/org/opentripplanner/transit/StopResolver.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.site.RegularStop; /** diff --git a/application/src/main/java/org/opentripplanner/transit/api/model/FilterValues.java b/application/src/main/java/org/opentripplanner/transit/api/model/FilterValues.java index 6107ff463e8..a2fba3b95ab 100644 --- a/application/src/main/java/org/opentripplanner/transit/api/model/FilterValues.java +++ b/application/src/main/java/org/opentripplanner/transit/api/model/FilterValues.java @@ -4,7 +4,7 @@ import java.util.NoSuchElementException; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.service.TransitService; import org.opentripplanner.utils.tostring.ToStringBuilder; 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 79b20148e45..f635ffa5271 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.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.LocalDateRange; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.transit.api.model.FilterValues; import org.opentripplanner.transit.model.basic.MainAndSubMode; import org.opentripplanner.transit.model.basic.TransitMode; diff --git a/application/src/main/java/org/opentripplanner/transit/api/request/TripOnServiceDateRequestBuilder.java b/application/src/main/java/org/opentripplanner/transit/api/request/TripOnServiceDateRequestBuilder.java index 072feb9b797..71c5cd69448 100644 --- a/application/src/main/java/org/opentripplanner/transit/api/request/TripOnServiceDateRequestBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/api/request/TripOnServiceDateRequestBuilder.java @@ -2,9 +2,9 @@ import java.time.LocalDate; import java.util.List; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.LocalDateRange; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.transit.api.model.FilterValues; import org.opentripplanner.transit.model.filter.selector.FilterRequest; import org.opentripplanner.transit.model.filter.transit.TripOnServiceDateSelectRequest; diff --git a/application/src/main/java/org/opentripplanner/transit/api/request/TripRequest.java b/application/src/main/java/org/opentripplanner/transit/api/request/TripRequest.java index 0bd1c2a06d8..5cc3ec2ed8a 100644 --- a/application/src/main/java/org/opentripplanner/transit/api/request/TripRequest.java +++ b/application/src/main/java/org/opentripplanner/transit/api/request/TripRequest.java @@ -2,7 +2,7 @@ import java.time.LocalDate; import java.util.Objects; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.api.model.FilterValues; import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/main/java/org/opentripplanner/transit/api/request/TripRequestBuilder.java b/application/src/main/java/org/opentripplanner/transit/api/request/TripRequestBuilder.java index 0d9978ed4f0..aee24410d90 100644 --- a/application/src/main/java/org/opentripplanner/transit/api/request/TripRequestBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/api/request/TripRequestBuilder.java @@ -3,7 +3,7 @@ import java.time.LocalDate; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.api.model.FilterValues; public class TripRequestBuilder { diff --git a/application/src/main/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequest.java b/application/src/main/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequest.java index 8074efb165b..a1b168ac098 100644 --- a/application/src/main/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequest.java +++ b/application/src/main/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequest.java @@ -8,9 +8,9 @@ import java.util.Objects; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.LocalDateRange; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.transit.api.model.FilterValues; import org.opentripplanner.transit.model.basic.TransitMode; diff --git a/application/src/main/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequestBuilder.java b/application/src/main/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequestBuilder.java index eb6e02cf6b8..5fbf2dabdc8 100644 --- a/application/src/main/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequestBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequestBuilder.java @@ -6,9 +6,9 @@ import java.util.Comparator; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.LocalDateRange; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.transit.api.model.FilterValues; import org.opentripplanner.transit.model.basic.TransitMode; diff --git a/application/src/main/java/org/opentripplanner/transit/configure/TransitModule.java b/application/src/main/java/org/opentripplanner/transit/configure/TransitModule.java index 957716d319d..0dca65ac841 100644 --- a/application/src/main/java/org/opentripplanner/transit/configure/TransitModule.java +++ b/application/src/main/java/org/opentripplanner/transit/configure/TransitModule.java @@ -5,9 +5,9 @@ import dagger.Provides; import jakarta.inject.Singleton; import java.time.LocalDate; -import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; import org.opentripplanner.core.framework.transaction.configure.TransitDomain; +import org.opentripplanner.core.model.transaction.RepositoryHandle; +import org.opentripplanner.core.model.transaction.RepositoryRegistry; import org.opentripplanner.framework.transaction.TimetableSnapshotParameters; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitData; import org.opentripplanner.standalone.config.ConfigModel; diff --git a/application/src/main/java/org/opentripplanner/transit/model/basic/LocalizedMoney.java b/application/src/main/java/org/opentripplanner/transit/model/basic/LocalizedMoney.java index 8a00b73f652..284a9028265 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/basic/LocalizedMoney.java +++ b/application/src/main/java/org/opentripplanner/transit/model/basic/LocalizedMoney.java @@ -1,7 +1,7 @@ package org.opentripplanner.transit.model.basic; import java.util.Locale; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; public record LocalizedMoney(Money money) implements I18NString { @Override diff --git a/application/src/main/java/org/opentripplanner/transit/model/basic/Notice.java b/application/src/main/java/org/opentripplanner/transit/model/basic/Notice.java index 62cea7a4b7b..de7514b424d 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/basic/Notice.java +++ b/application/src/main/java/org/opentripplanner/transit/model/basic/Notice.java @@ -1,7 +1,7 @@ package org.opentripplanner.transit.model.basic; import java.util.Objects; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; /** diff --git a/application/src/main/java/org/opentripplanner/transit/model/basic/NoticeBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/basic/NoticeBuilder.java index c3a2d696599..cecedf987ad 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/basic/NoticeBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/basic/NoticeBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.basic; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; public class NoticeBuilder extends AbstractEntityBuilder { diff --git a/application/src/main/java/org/opentripplanner/transit/model/basic/TransitMode.java b/application/src/main/java/org/opentripplanner/transit/model/basic/TransitMode.java index 1819662889e..5e5ee753aa0 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/basic/TransitMode.java +++ b/application/src/main/java/org/opentripplanner/transit/model/basic/TransitMode.java @@ -2,7 +2,7 @@ import java.util.EnumSet; import java.util.Set; -import org.opentripplanner.core.domain.model.doc.DocumentedEnum; +import org.opentripplanner.core.model.doc.DocumentedEnum; /** * Equivalent to GTFS route_type or to NeTEx TransportMode. diff --git a/application/src/main/java/org/opentripplanner/transit/model/calendar/TripCalendars.java b/application/src/main/java/org/opentripplanner/transit/model/calendar/TripCalendars.java index 9e3a024dbd4..89cfa925a35 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/calendar/TripCalendars.java +++ b/application/src/main/java/org/opentripplanner/transit/model/calendar/TripCalendars.java @@ -14,7 +14,7 @@ import java.util.Set; import java.util.function.Consumer; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.calendar.CalendarServiceData; import org.opentripplanner.utils.time.ServiceDateUtils; import org.slf4j.Logger; diff --git a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TransitAlertMatcherFactory.java b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TransitAlertMatcherFactory.java index dd74d4c790a..5d717456a37 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TransitAlertMatcherFactory.java +++ b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TransitAlertMatcherFactory.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.filter.transit; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.routing.alertpatch.AlertCause; import org.opentripplanner.routing.alertpatch.AlertEffect; import org.opentripplanner.routing.alertpatch.AlertSeverity; diff --git a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TransitAlertSelectRequest.java b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TransitAlertSelectRequest.java index e5b3484bf14..ce7e7ad49fe 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TransitAlertSelectRequest.java +++ b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TransitAlertSelectRequest.java @@ -2,7 +2,7 @@ import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.routing.alertpatch.AlertCause; import org.opentripplanner.routing.alertpatch.AlertEffect; import org.opentripplanner.routing.alertpatch.AlertSeverity; diff --git a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripMatcherFactory.java b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripMatcherFactory.java index 2f0bf3d7b92..84237367dce 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripMatcherFactory.java +++ b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripMatcherFactory.java @@ -3,7 +3,7 @@ import java.time.LocalDate; import java.util.Set; import java.util.function.Function; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.api.request.TripRequest; import org.opentripplanner.transit.model.filter.expr.ContainsMatcher; import org.opentripplanner.transit.model.filter.expr.EqualityMatcher; diff --git a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactory.java b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactory.java index 2b38a5cc55b..ed8be4e5bde 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactory.java +++ b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactory.java @@ -4,9 +4,9 @@ import java.util.Collection; import java.util.function.BiFunction; import java.util.function.Function; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.LocalDateRange; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.model.modes.AllowTransitModeFilter; import org.opentripplanner.transit.api.request.TripOnServiceDateRequest; import org.opentripplanner.transit.model.basic.NarrowedTransitMode; diff --git a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateSelectRequest.java b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateSelectRequest.java index 26cb264740d..28f53285bb0 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateSelectRequest.java +++ b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateSelectRequest.java @@ -2,9 +2,9 @@ import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.LocalDateRange; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.transit.api.model.FilterValues; import org.opentripplanner.transit.model.basic.MainAndSubMode; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripTimeOnDateMatcherFactory.java b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripTimeOnDateMatcherFactory.java index 5234502d943..79ea07dbecd 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripTimeOnDateMatcherFactory.java +++ b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripTimeOnDateMatcherFactory.java @@ -1,8 +1,8 @@ package org.opentripplanner.transit.model.filter.transit; import java.time.Instant; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.model.modes.AllowTransitModeFilter; import org.opentripplanner.transit.api.request.TripTimeOnDateRequest; diff --git a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripTimeOnDateSelectRequest.java b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripTimeOnDateSelectRequest.java index 26cd01a4b14..d11299b5d81 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripTimeOnDateSelectRequest.java +++ b/application/src/main/java/org/opentripplanner/transit/model/filter/transit/TripTimeOnDateSelectRequest.java @@ -2,7 +2,7 @@ import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.api.model.FilterValues; import org.opentripplanner.transit.model.basic.MainAndSubMode; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/application/src/main/java/org/opentripplanner/transit/model/framework/AbstractEntityBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/framework/AbstractEntityBuilder.java index 2011060ef1c..313d3742ce2 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/framework/AbstractEntityBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/framework/AbstractEntityBuilder.java @@ -1,7 +1,7 @@ package org.opentripplanner.transit.model.framework; import java.util.Objects; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; public abstract class AbstractEntityBuilder< E extends AbstractTransitEntity, diff --git a/application/src/main/java/org/opentripplanner/transit/model/framework/AbstractTransitEntity.java b/application/src/main/java/org/opentripplanner/transit/model/framework/AbstractTransitEntity.java index a9dc1f55d91..41e5fadf4f4 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/framework/AbstractTransitEntity.java +++ b/application/src/main/java/org/opentripplanner/transit/model/framework/AbstractTransitEntity.java @@ -2,7 +2,7 @@ import java.io.Serializable; import java.util.Objects; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** * All OTP Transit entities should extend this class. The purpose of the class is to enforce a 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 82b7972d7dd..dc63d23a736 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 @@ -13,7 +13,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; import org.opentripplanner.utils.tostring.ToStringBuilder; /** diff --git a/application/src/main/java/org/opentripplanner/transit/model/framework/DefaultEntityById.java b/application/src/main/java/org/opentripplanner/transit/model/framework/DefaultEntityById.java index 100bdc27e42..71c94cac282 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/framework/DefaultEntityById.java +++ b/application/src/main/java/org/opentripplanner/transit/model/framework/DefaultEntityById.java @@ -9,7 +9,7 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** * The purpose of this class is to provide a map from id to the corresponding entity. It is simply diff --git a/application/src/main/java/org/opentripplanner/transit/model/framework/EntityById.java b/application/src/main/java/org/opentripplanner/transit/model/framework/EntityById.java index 93453512da5..2301dbd7e9d 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/framework/EntityById.java +++ b/application/src/main/java/org/opentripplanner/transit/model/framework/EntityById.java @@ -4,7 +4,7 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Predicate; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** * The purpose of this class is to provide a map from id to the corresponding entity. It is simply diff --git a/application/src/main/java/org/opentripplanner/transit/model/framework/EntityNotFoundException.java b/application/src/main/java/org/opentripplanner/transit/model/framework/EntityNotFoundException.java index d1703c59531..d29a0dddb87 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/framework/EntityNotFoundException.java +++ b/application/src/main/java/org/opentripplanner/transit/model/framework/EntityNotFoundException.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.framework; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** * This exception is used by the main OTP business logic to signal that one of the diff --git a/application/src/main/java/org/opentripplanner/transit/model/framework/ImmutableEntityById.java b/application/src/main/java/org/opentripplanner/transit/model/framework/ImmutableEntityById.java index bda53f1374c..07989b5a4cb 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/framework/ImmutableEntityById.java +++ b/application/src/main/java/org/opentripplanner/transit/model/framework/ImmutableEntityById.java @@ -2,7 +2,7 @@ import java.util.Collection; import java.util.Map; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** * The purpose of this class is to provide a map from id to the corresponding entity. It is simply diff --git a/application/src/main/java/org/opentripplanner/transit/model/framework/TransitEntity.java b/application/src/main/java/org/opentripplanner/transit/model/framework/TransitEntity.java index 3a0b29bded6..cea01238720 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/framework/TransitEntity.java +++ b/application/src/main/java/org/opentripplanner/transit/model/framework/TransitEntity.java @@ -1,7 +1,7 @@ package org.opentripplanner.transit.model.framework; import java.util.Comparator; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; public interface TransitEntity { FeedScopedId getId(); diff --git a/application/src/main/java/org/opentripplanner/transit/model/network/GroupOfRoutes.java b/application/src/main/java/org/opentripplanner/transit/model/network/GroupOfRoutes.java index 61fbb40fdad..0a5b918f437 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/network/GroupOfRoutes.java +++ b/application/src/main/java/org/opentripplanner/transit/model/network/GroupOfRoutes.java @@ -2,7 +2,7 @@ import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; import org.opentripplanner.transit.model.framework.LogInfo; diff --git a/application/src/main/java/org/opentripplanner/transit/model/network/GroupOfRoutesBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/network/GroupOfRoutesBuilder.java index 8ef9950ff35..f5bc66f42c5 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/network/GroupOfRoutesBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/network/GroupOfRoutesBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.network; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; /** 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 8feb257b87f..9f3b0547461 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,8 +9,8 @@ import java.util.Locale; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.SubMode; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/main/java/org/opentripplanner/transit/model/network/RouteBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/network/RouteBuilder.java index 1b7ddccf59f..b9f6ba3b654 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/network/RouteBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/network/RouteBuilder.java @@ -3,8 +3,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; import org.opentripplanner.transit.model.organization.Agency; 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 5dba43f68fc..4dc6dc1e59b 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 @@ -10,7 +10,7 @@ import java.util.Optional; import java.util.function.Predicate; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; import org.opentripplanner.transit.model.site.RegularStop; 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 0251f49dbad..fb27ac4dd80 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 @@ -10,9 +10,9 @@ import java.util.stream.Stream; import javax.annotation.Nullable; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.PickDrop; import org.opentripplanner.street.geometry.CompactLineStringSequence; import org.opentripplanner.transit.model.basic.SubMode; diff --git a/application/src/main/java/org/opentripplanner/transit/model/network/TripPatternBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/network/TripPatternBuilder.java index 824aeef760b..5d5f9426aef 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/network/TripPatternBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/network/TripPatternBuilder.java @@ -7,7 +7,7 @@ import javax.annotation.Nullable; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.CompactLineStringSequence; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.geometry.SphericalDistanceLibrary; diff --git a/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/EntityAdapter.java b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/EntityAdapter.java index 34f9f7decd0..2f4f12dc5a7 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/EntityAdapter.java +++ b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/EntityAdapter.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.network.grouppriority; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.TransitMode; /** diff --git a/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java index 02c38f4e2ed..f73edd4df8f 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java +++ b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java @@ -15,7 +15,7 @@ import java.util.function.Predicate; import java.util.regex.Pattern; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.request.filter.TransitGroupSelect; import org.opentripplanner.transit.model.basic.TransitMode; 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 511dc642dac..b7d45bd5470 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,7 +7,7 @@ import java.util.Collection; import java.util.List; import java.util.stream.Stream; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.routing.api.request.request.filter.TransitGroupSelect; import org.opentripplanner.transit.model.network.TripPattern; diff --git a/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripAdapter.java b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripAdapter.java index 9ef49e6ca38..4ea95894fd6 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripAdapter.java +++ b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripAdapter.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.network.grouppriority; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.timetable.Trip; diff --git a/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripPatternAdapter.java b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripPatternAdapter.java index d3c20250135..51d0d4af010 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripPatternAdapter.java +++ b/application/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripPatternAdapter.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.network.grouppriority; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.network.TripPattern; 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 0b6912a8b46..65251b63497 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 @@ -6,7 +6,7 @@ import java.time.ZoneId; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; import org.opentripplanner.transit.model.framework.LogInfo; diff --git a/application/src/main/java/org/opentripplanner/transit/model/organization/AgencyBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/organization/AgencyBuilder.java index ba4b44a81e9..2ba70201604 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/organization/AgencyBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/organization/AgencyBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.organization; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; public class AgencyBuilder extends AbstractEntityBuilder { diff --git a/application/src/main/java/org/opentripplanner/transit/model/organization/Branding.java b/application/src/main/java/org/opentripplanner/transit/model/organization/Branding.java index a511cb8ce47..55205d7aa11 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/organization/Branding.java +++ b/application/src/main/java/org/opentripplanner/transit/model/organization/Branding.java @@ -2,7 +2,7 @@ import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; import org.opentripplanner.transit.model.framework.LogInfo; diff --git a/application/src/main/java/org/opentripplanner/transit/model/organization/BrandingBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/organization/BrandingBuilder.java index 86edc41ab89..b25120459b4 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/organization/BrandingBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/organization/BrandingBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.organization; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; public class BrandingBuilder extends AbstractEntityBuilder { 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 d002f1e9392..fb5dd27df6a 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 @@ -4,7 +4,7 @@ import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; import org.opentripplanner.transit.model.framework.LogInfo; diff --git a/application/src/main/java/org/opentripplanner/transit/model/organization/OperatorBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/organization/OperatorBuilder.java index b3470f60c32..2581bd08af6 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/organization/OperatorBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/organization/OperatorBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.organization; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; public class OperatorBuilder extends AbstractEntityBuilder { diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java b/application/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java index cbbc0d62899..dd1cd956d2f 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java @@ -6,9 +6,9 @@ import java.util.function.IntSupplier; import javax.annotation.Nullable; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/AreaStopBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/AreaStopBuilder.java index ae234792afe..65ee210be0c 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/AreaStopBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/AreaStopBuilder.java @@ -3,8 +3,8 @@ import java.util.Objects; import java.util.function.IntSupplier; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/BoardingArea.java b/application/src/main/java/org/opentripplanner/transit/model/site/BoardingArea.java index f1602ebc898..939746275ec 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/BoardingArea.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/BoardingArea.java @@ -2,7 +2,7 @@ package org.opentripplanner.transit.model.site; import java.util.Objects; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; /** diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/BoardingAreaBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/BoardingAreaBuilder.java index 5aaf8657956..dff9ff8eeaf 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/BoardingAreaBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/BoardingAreaBuilder.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.site; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; public final class BoardingAreaBuilder extends StationElementBuilder diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/Entrance.java b/application/src/main/java/org/opentripplanner/transit/model/site/Entrance.java index fe965b6b59c..76aba319962 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/Entrance.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/Entrance.java @@ -1,7 +1,7 @@ package org.opentripplanner.transit.model.site; import java.util.Objects; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** * A place where a station connects to the street network. Equivalent to GTFS stop location . diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/EntranceBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/EntranceBuilder.java index e3e1d3b84cd..3620022f4ce 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/EntranceBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/EntranceBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.site; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** * A place where a station connects to the street network. Equivalent to GTFS stop location . diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/FareZone.java b/application/src/main/java/org/opentripplanner/transit/model/site/FareZone.java index 4890b8330e5..9cd2e4a443d 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/FareZone.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/FareZone.java @@ -2,7 +2,7 @@ import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; /** diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/FareZoneBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/FareZoneBuilder.java index 0ddbc2c01d2..428502e5213 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/FareZoneBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/FareZoneBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.site; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; public class FareZoneBuilder extends AbstractEntityBuilder { diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/GroupOfStations.java b/application/src/main/java/org/opentripplanner/transit/model/site/GroupOfStations.java index 4d997e48a72..9bfb14583e8 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/GroupOfStations.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/GroupOfStations.java @@ -4,8 +4,8 @@ import java.util.Objects; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/GroupOfStationsBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/GroupOfStationsBuilder.java index 09f938eabc2..bec295b3098 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/GroupOfStationsBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/GroupOfStationsBuilder.java @@ -2,8 +2,8 @@ import java.util.HashSet; import java.util.Set; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java b/application/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java index becb904f557..0d3faeea966 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java @@ -7,8 +7,8 @@ import javax.annotation.Nullable; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.GeometryCollection; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java index e58eec18f6f..6287cdd3c1b 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java @@ -5,8 +5,8 @@ import java.util.function.IntSupplier; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.GeometryCollection; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/MultiModalStation.java b/application/src/main/java/org/opentripplanner/transit/model/site/MultiModalStation.java index 14bacada5d7..d882f9026e2 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/MultiModalStation.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/MultiModalStation.java @@ -2,8 +2,8 @@ import java.util.Collection; import java.util.Objects; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/MultiModalStationBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/MultiModalStationBuilder.java index 59aa7a9bc86..59648cf7c80 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/MultiModalStationBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/MultiModalStationBuilder.java @@ -2,8 +2,8 @@ import java.util.Collection; import java.util.Set; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/Pathway.java b/application/src/main/java/org/opentripplanner/transit/model/site/Pathway.java index 9707e580317..f7b594ac0e4 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/Pathway.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/Pathway.java @@ -2,7 +2,7 @@ package org.opentripplanner.transit.model.site; import java.util.Objects; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; public final class Pathway extends AbstractTransitEntity { diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/PathwayBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/PathwayBuilder.java index d07ca9e6f09..20433858432 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/PathwayBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/PathwayBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.site; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; @SuppressWarnings("UnusedReturnValue") diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/PathwayNode.java b/application/src/main/java/org/opentripplanner/transit/model/site/PathwayNode.java index b869f9410ad..bf266c4d5dd 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/PathwayNode.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/PathwayNode.java @@ -1,7 +1,7 @@ package org.opentripplanner.transit.model.site; import java.util.Objects; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** * A place where a station connects to the street network. Equivalent to GTFS stop location . diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/PathwayNodeBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/PathwayNodeBuilder.java index 0f6e44b5b97..fcdb9b4fb73 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/PathwayNodeBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/PathwayNodeBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.site; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** * A place where a station connects to the street network. Equivalent to GTFS stop location . diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/RegularStop.java b/application/src/main/java/org/opentripplanner/transit/model/site/RegularStop.java index d9c29e1d04a..e9e47f99dab 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/RegularStop.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/RegularStop.java @@ -11,8 +11,8 @@ import java.util.function.IntSupplier; import javax.annotation.Nullable; import org.locationtech.jts.geom.Point; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.transit.model.basic.SubMode; import org.opentripplanner.transit.model.basic.TransitMode; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/RegularStopBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/RegularStopBuilder.java index a83cf4a9724..bcbad0adeed 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/RegularStopBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/RegularStopBuilder.java @@ -9,8 +9,8 @@ import java.util.Objects; import java.util.Set; import java.util.function.IntSupplier; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.TransitEntity; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/Station.java b/application/src/main/java/org/opentripplanner/transit/model/site/Station.java index 4f8faae3b9e..29d87844acd 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/Station.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/Station.java @@ -14,8 +14,8 @@ import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.GeometryCollection; import org.locationtech.jts.geom.Point; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; import org.opentripplanner.transit.model.framework.LogInfo; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/StationBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/StationBuilder.java index 81fc1ba4d3c..99ca116132f 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/StationBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/StationBuilder.java @@ -1,8 +1,8 @@ package org.opentripplanner.transit.model.site; import java.time.ZoneId; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/StationElement.java b/application/src/main/java/org/opentripplanner/transit/model/site/StationElement.java index d23b367a3d3..560d04fc9b6 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/StationElement.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/StationElement.java @@ -3,9 +3,9 @@ import java.util.List; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/main/java/org/opentripplanner/transit/model/site/StationElementBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/site/StationElementBuilder.java index ae124e86be9..95aa9351d0a 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/site/StationElementBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/site/StationElementBuilder.java @@ -1,9 +1,9 @@ package org.opentripplanner.transit.model.site; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; 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 7b6d662d32c..56e2d9216bf 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 @@ -6,9 +6,9 @@ import java.util.Optional; import javax.annotation.Nullable; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.basic.SubMode; import org.opentripplanner.transit.model.basic.TransitMode; 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 7830c7e9148..cba442c68d1 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 @@ -1,8 +1,8 @@ package org.opentripplanner.transit.model.site; import java.util.Collection; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.framework.LogInfo; import org.opentripplanner.utils.lang.ObjectUtils; diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/OccupancyStatus.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/OccupancyStatus.java index bb35a0601f6..4c1054b5560 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/OccupancyStatus.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/OccupancyStatus.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.timetable; -import org.opentripplanner.core.domain.model.doc.DocumentedEnum; +import org.opentripplanner.core.model.doc.DocumentedEnum; /** * OccupancyStatus to be exposed in the API. The values are based on GTFS-RT diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java index c97827b8f3c..ec89ea447f1 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java @@ -9,9 +9,9 @@ import java.util.Optional; import java.util.OptionalInt; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.network.ReplacedByRelation; import org.opentripplanner.transit.model.timetable.booking.BookingInfo; import org.opentripplanner.utils.lang.IntUtils; diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimesBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimesBuilder.java index bc6661ebac4..629e8108503 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimesBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimesBuilder.java @@ -9,9 +9,9 @@ import java.util.List; import java.util.stream.IntStream; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.DataValidationException; public class RealTimeTripTimesBuilder { 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 bd04a1668bc..719fe0e00e5 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 @@ -9,10 +9,10 @@ import java.util.OptionalInt; import java.util.function.Supplier; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.error.OtpError; import org.opentripplanner.transit.model.framework.DataValidationException; import org.opentripplanner.transit.model.framework.Deduplicator; 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 4ae002621cd..b10e2be56b4 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 @@ -3,8 +3,8 @@ import java.util.BitSet; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.transit.model.timetable.booking.BookingInfo; import org.opentripplanner.utils.time.TimeUtils; diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeKey.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeKey.java index 65c6b8b2c27..c16c218105c 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeKey.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeKey.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.timetable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; /** diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeKeyBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeKeyBuilder.java index 917baa4c91f..480456d309a 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeKeyBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeKeyBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.transit.model.timetable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; public class StopTimeKeyBuilder extends AbstractEntityBuilder { diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeToScheduledTripTimesMapper.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeToScheduledTripTimesMapper.java index 87495668ce5..e6cf5df3259 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeToScheduledTripTimesMapper.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeToScheduledTripTimesMapper.java @@ -5,8 +5,8 @@ import java.util.Collection; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.model.StopTime; import org.opentripplanner.transit.model.timetable.booking.BookingInfo; diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/Timetable.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/Timetable.java index 995ca9ff90f..6cdadc42aa2 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/Timetable.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/Timetable.java @@ -10,7 +10,7 @@ import java.util.Optional; import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.network.TripPattern; /** diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/TimetableBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TimetableBuilder.java index 2fd824287f4..f6dbb15405b 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/TimetableBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/TimetableBuilder.java @@ -7,7 +7,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.network.TripPattern; public class TimetableBuilder { 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 4f592e9df69..8dee9b675fb 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 @@ -7,9 +7,9 @@ import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.SubMode; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripBuilder.java index 80ae464e634..ae4cd8319e3 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripBuilder.java @@ -1,8 +1,8 @@ package org.opentripplanner.transit.model.timetable; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; import org.opentripplanner.transit.model.network.BikeAccess; diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripIdAndServiceDate.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripIdAndServiceDate.java index 28fd5d8ca3e..a110ded2c45 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripIdAndServiceDate.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripIdAndServiceDate.java @@ -1,7 +1,7 @@ package org.opentripplanner.transit.model.timetable; import java.time.LocalDate; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** * Class to use as key in HashMap containing feed id, trip id and service date diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripOnServiceDate.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripOnServiceDate.java index 1c265afd5c0..974f29e4e05 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripOnServiceDate.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripOnServiceDate.java @@ -3,7 +3,7 @@ import java.time.LocalDate; import java.util.List; import java.util.Objects; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; /** diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripOnServiceDateBuilder.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripOnServiceDateBuilder.java index 040bf66b608..705a6b1ab04 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripOnServiceDateBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripOnServiceDateBuilder.java @@ -3,7 +3,7 @@ import java.time.LocalDate; import java.util.ArrayList; import java.util.List; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.AbstractEntityBuilder; public class TripOnServiceDateBuilder diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java index ab836f7259c..87d03cbf400 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java @@ -11,10 +11,10 @@ import java.util.Optional; import java.util.OptionalInt; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.model.StopTime; import org.opentripplanner.transit.model.framework.DataValidationException; import org.opentripplanner.transit.model.network.ReplacedByRelation; diff --git a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimesFactory.java b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimesFactory.java index e90757c084b..fff21fb1fa2 100644 --- a/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimesFactory.java +++ b/application/src/main/java/org/opentripplanner/transit/model/timetable/TripTimesFactory.java @@ -1,7 +1,7 @@ package org.opentripplanner.transit.model.timetable; import java.util.List; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; import org.opentripplanner.model.StopTime; /** diff --git a/application/src/main/java/org/opentripplanner/transit/repository/DefaultTimetableRepository.java b/application/src/main/java/org/opentripplanner/transit/repository/DefaultTimetableRepository.java index 18b1946511f..2e935c008e2 100644 --- a/application/src/main/java/org/opentripplanner/transit/repository/DefaultTimetableRepository.java +++ b/application/src/main/java/org/opentripplanner/transit/repository/DefaultTimetableRepository.java @@ -26,7 +26,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitData; import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.TimetableUpdateMapper; import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.TripPatternForDateMapper; diff --git a/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepository.java b/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepository.java index 1798441f85a..525a1d21a62 100644 --- a/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepository.java +++ b/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepository.java @@ -2,8 +2,8 @@ import java.time.LocalDate; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.framework.transaction.api.WriteContext; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.transaction.WriteContext; import org.opentripplanner.transit.model.timetable.RealTimeTripUpdate; /** diff --git a/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepositoryLifecycle.java b/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepositoryLifecycle.java index 9e39e939613..27834850088 100644 --- a/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepositoryLifecycle.java +++ b/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepositoryLifecycle.java @@ -2,7 +2,7 @@ import java.time.LocalDate; import java.util.function.Supplier; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryLifecycle; +import org.opentripplanner.core.model.transaction.RepositoryLifecycle; /** * Copy-on-write / freeze lifecycle for the realtime-timetable repository. The repository is a diff --git a/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepositorySnapshot.java b/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepositorySnapshot.java index 2d024cc1af3..3a9b8a084d1 100644 --- a/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepositorySnapshot.java +++ b/application/src/main/java/org/opentripplanner/transit/repository/TimetableRepositorySnapshot.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitData; import org.opentripplanner.transit.model.calendar.TripCalendars; import org.opentripplanner.transit.model.network.Route; 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 b51d38bc6df..c45c3d1b146 100644 --- a/application/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java +++ b/application/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java @@ -22,8 +22,8 @@ import java.util.stream.Stream; import javax.annotation.Nullable; import org.locationtech.jts.geom.Envelope; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.ext.flex.FlexIndex; import org.opentripplanner.framework.application.OTPRequestTimeoutException; import org.opentripplanner.model.FeedInfo; diff --git a/application/src/main/java/org/opentripplanner/transit/service/PatternByServiceDatesFilter.java b/application/src/main/java/org/opentripplanner/transit/service/PatternByServiceDatesFilter.java index e20dc301b9b..20b6d79877b 100644 --- a/application/src/main/java/org/opentripplanner/transit/service/PatternByServiceDatesFilter.java +++ b/application/src/main/java/org/opentripplanner/transit/service/PatternByServiceDatesFilter.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.Objects; import java.util.function.Function; -import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.model.time.LocalDateRange; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.Trip; 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 75ee4dc7701..1c5cafb4a38 100644 --- a/application/src/main/java/org/opentripplanner/transit/service/SiteRepository.java +++ b/application/src/main/java/org/opentripplanner/transit/service/SiteRepository.java @@ -9,7 +9,7 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.Nullable; import org.locationtech.jts.geom.Envelope; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.site.AreaStop; import org.opentripplanner.transit.model.site.Entrance; import org.opentripplanner.transit.model.site.GroupOfStations; diff --git a/application/src/main/java/org/opentripplanner/transit/service/SiteRepositoryBuilder.java b/application/src/main/java/org/opentripplanner/transit/service/SiteRepositoryBuilder.java index 7a9785207a8..b59e1bd2c56 100644 --- a/application/src/main/java/org/opentripplanner/transit/service/SiteRepositoryBuilder.java +++ b/application/src/main/java/org/opentripplanner/transit/service/SiteRepositoryBuilder.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.DefaultEntityById; import org.opentripplanner.transit.model.framework.EntityById; import org.opentripplanner.transit.model.framework.ImmutableEntityById; diff --git a/application/src/main/java/org/opentripplanner/transit/service/TransitRepository.java b/application/src/main/java/org/opentripplanner/transit/service/TransitRepository.java index 055388eb4e5..3891907c828 100644 --- a/application/src/main/java/org/opentripplanner/transit/service/TransitRepository.java +++ b/application/src/main/java/org/opentripplanner/transit/service/TransitRepository.java @@ -25,7 +25,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.model.FeedInfo; import org.opentripplanner.model.calendar.CalendarServiceData; diff --git a/application/src/main/java/org/opentripplanner/transit/service/TransitRepositoryIndex.java b/application/src/main/java/org/opentripplanner/transit/service/TransitRepositoryIndex.java index 15d0c5b9571..421c6c47816 100644 --- a/application/src/main/java/org/opentripplanner/transit/service/TransitRepositoryIndex.java +++ b/application/src/main/java/org/opentripplanner/transit/service/TransitRepositoryIndex.java @@ -9,7 +9,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.FlexIndex; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.framework.application.OTPFeature; diff --git a/application/src/main/java/org/opentripplanner/transit/service/TransitService.java b/application/src/main/java/org/opentripplanner/transit/service/TransitService.java index 7391bfeeb9c..57ce10560ee 100644 --- a/application/src/main/java/org/opentripplanner/transit/service/TransitService.java +++ b/application/src/main/java/org/opentripplanner/transit/service/TransitService.java @@ -12,7 +12,7 @@ import java.util.Set; import javax.annotation.Nullable; import org.locationtech.jts.geom.Envelope; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.FlexIndex; import org.opentripplanner.model.FeedInfo; import org.opentripplanner.model.StopTimesInPattern; diff --git a/application/src/main/java/org/opentripplanner/transit/service/TransitServiceResolver.java b/application/src/main/java/org/opentripplanner/transit/service/TransitServiceResolver.java index 1a6451ec1a2..af07707dd94 100644 --- a/application/src/main/java/org/opentripplanner/transit/service/TransitServiceResolver.java +++ b/application/src/main/java/org/opentripplanner/transit/service/TransitServiceResolver.java @@ -1,7 +1,7 @@ package org.opentripplanner.transit.service; import java.util.Objects; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.SiteResolver; import org.opentripplanner.transit.StopResolver; import org.opentripplanner.transit.model.site.Entrance; diff --git a/application/src/main/java/org/opentripplanner/updater/GraphUpdaterManager.java b/application/src/main/java/org/opentripplanner/updater/GraphUpdaterManager.java index 801c9fb0456..a55460c3bcc 100644 --- a/application/src/main/java/org/opentripplanner/updater/GraphUpdaterManager.java +++ b/application/src/main/java/org/opentripplanner/updater/GraphUpdaterManager.java @@ -10,7 +10,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.Predicate; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.framework.transaction.UpdateManager; +import org.opentripplanner.core.model.transaction.UpdateManager; import org.opentripplanner.model.projectinfo.OtpProjectInfo; import org.opentripplanner.updater.spi.GraphUpdater; import org.opentripplanner.updater.spi.PollingGraphUpdater; diff --git a/application/src/main/java/org/opentripplanner/updater/GraphWriterService.java b/application/src/main/java/org/opentripplanner/updater/GraphWriterService.java index dabc8aff49c..5f2c49eeb9b 100644 --- a/application/src/main/java/org/opentripplanner/updater/GraphWriterService.java +++ b/application/src/main/java/org/opentripplanner/updater/GraphWriterService.java @@ -2,9 +2,9 @@ import java.util.concurrent.Future; import java.util.function.Function; -import org.opentripplanner.core.domain.framework.transaction.UpdateManager; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; -import org.opentripplanner.core.domain.framework.transaction.api.WriteContext; +import org.opentripplanner.core.model.transaction.RepositoryHandle; +import org.opentripplanner.core.model.transaction.UpdateManager; +import org.opentripplanner.core.model.transaction.WriteContext; import org.opentripplanner.service.realtimevehicles.RealtimeVehicleRepository; import org.opentripplanner.service.realtimevehicles.RealtimeVehicleRepositorySnapshot; import org.opentripplanner.street.graph.Graph; diff --git a/application/src/main/java/org/opentripplanner/updater/alert/gtfs/AlertsUpdateHandler.java b/application/src/main/java/org/opentripplanner/updater/alert/gtfs/AlertsUpdateHandler.java index ed1ebede6e6..a9bc42d37da 100644 --- a/application/src/main/java/org/opentripplanner/updater/alert/gtfs/AlertsUpdateHandler.java +++ b/application/src/main/java/org/opentripplanner/updater/alert/gtfs/AlertsUpdateHandler.java @@ -15,10 +15,10 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.TranslatedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.TranslatedString; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.gtfs.mapping.DirectionMapper; import org.opentripplanner.routing.alertpatch.AlertCalendar; diff --git a/application/src/main/java/org/opentripplanner/updater/alert/siri/SiriAlertsUpdateHandler.java b/application/src/main/java/org/opentripplanner/updater/alert/siri/SiriAlertsUpdateHandler.java index 3c0f0e810f9..9fa7da07d6a 100644 --- a/application/src/main/java/org/opentripplanner/updater/alert/siri/SiriAlertsUpdateHandler.java +++ b/application/src/main/java/org/opentripplanner/updater/alert/siri/SiriAlertsUpdateHandler.java @@ -9,11 +9,11 @@ import java.util.Map; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.i18n.TranslatedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.TranslatedString; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.routing.alertpatch.AlertCalendar; import org.opentripplanner.routing.alertpatch.AlertUrl; import org.opentripplanner.routing.alertpatch.EntitySelector; diff --git a/application/src/main/java/org/opentripplanner/updater/alert/siri/mapping/AffectsMapper.java b/application/src/main/java/org/opentripplanner/updater/alert/siri/mapping/AffectsMapper.java index 23c93742832..464970ef515 100644 --- a/application/src/main/java/org/opentripplanner/updater/alert/siri/mapping/AffectsMapper.java +++ b/application/src/main/java/org/opentripplanner/updater/alert/siri/mapping/AffectsMapper.java @@ -9,7 +9,7 @@ import java.util.Optional; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.alertpatch.EntitySelector; import org.opentripplanner.routing.alertpatch.StopCondition; import org.opentripplanner.transit.model.timetable.Direction; diff --git a/application/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java b/application/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java index 9d20459b326..f98504a7df5 100644 --- a/application/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java +++ b/application/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java @@ -4,9 +4,9 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.domain.framework.transaction.UpdateManager; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.transaction.RepositoryHandle; +import org.opentripplanner.core.model.transaction.UpdateManager; import org.opentripplanner.ext.carpooling.CarpoolingRepository; import org.opentripplanner.ext.carpooling.routing.CarpoolTripVertexResolver; import org.opentripplanner.ext.carpooling.updater.SiriETCarpoolingUpdater; diff --git a/application/src/main/java/org/opentripplanner/updater/spi/UpdateError.java b/application/src/main/java/org/opentripplanner/updater/spi/UpdateError.java index e046a376deb..049c2d243a0 100644 --- a/application/src/main/java/org/opentripplanner/updater/spi/UpdateError.java +++ b/application/src/main/java/org/opentripplanner/updater/spi/UpdateError.java @@ -1,7 +1,7 @@ package org.opentripplanner.updater.spi; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** * Detailed information about a failure to apply a realtime update, for example for trips or vehicle diff --git a/application/src/main/java/org/opentripplanner/updater/spi/UpdateException.java b/application/src/main/java/org/opentripplanner/updater/spi/UpdateException.java index 520ae41f3f7..f7508c85a24 100644 --- a/application/src/main/java/org/opentripplanner/updater/spi/UpdateException.java +++ b/application/src/main/java/org/opentripplanner/updater/spi/UpdateException.java @@ -1,7 +1,7 @@ package org.opentripplanner.updater.spi; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /// An exception for indicating various issues with realtime data. It can be thrown anywhere in the /// handling code for a realtime update and is caught by the UpdateAdapters. diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/CanceledTripHandler.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/CanceledTripHandler.java index b550b9c7f25..ce9502749c5 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/CanceledTripHandler.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/CanceledTripHandler.java @@ -3,7 +3,7 @@ import static org.opentripplanner.updater.spi.UpdateErrorType.NO_TRIP_FOR_CANCELLATION_FOUND; import static org.opentripplanner.updater.trip.UpdateIncrementality.FULL_DATASET; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.RealTimeTripUpdate; import org.opentripplanner.transit.model.timetable.Trip; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/DuplicatedTripHandler.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/DuplicatedTripHandler.java index 9ad8c4e3c4e..2c5ac311d17 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/DuplicatedTripHandler.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/DuplicatedTripHandler.java @@ -4,8 +4,8 @@ import static org.opentripplanner.updater.spi.UpdateErrorType.OUTSIDE_SERVICE_PERIOD; import static org.opentripplanner.updater.spi.UpdateErrorType.TRIP_NOT_FOUND; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.timetable.RealTimeTripUpdate; import org.opentripplanner.transit.model.timetable.ScheduledTripTimes; import org.opentripplanner.transit.model.timetable.Trip; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/GtfsRealTimeTripUpdateAdapter.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/GtfsRealTimeTripUpdateAdapter.java index 889da0d1cd9..7212b42366b 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/GtfsRealTimeTripUpdateAdapter.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/GtfsRealTimeTripUpdateAdapter.java @@ -2,7 +2,7 @@ import java.time.LocalDate; import java.util.function.Supplier; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; import org.opentripplanner.transit.repository.TimetableRepository; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.TransitRepository; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/GtfsRealtimeFuzzyTripMatcher.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/GtfsRealtimeFuzzyTripMatcher.java index de9516f03f8..79405d536d0 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/GtfsRealtimeFuzzyTripMatcher.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/GtfsRealtimeFuzzyTripMatcher.java @@ -4,7 +4,7 @@ import gnu.trove.set.TIntSet; import java.text.ParseException; import java.time.LocalDate; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.gtfs.mapping.DirectionMapper; import org.opentripplanner.transit.model.network.Route; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/NewTripHandler.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/NewTripHandler.java index 1ea046d504c..7c6f1787c9c 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/NewTripHandler.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/NewTripHandler.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.network.StopPattern; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.RealTimeTripTimes; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/RouteFactory.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/RouteFactory.java index 61ec5f71ee5..b4ec4797cfd 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/RouteFactory.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/RouteFactory.java @@ -2,9 +2,9 @@ import java.util.Objects; import java.util.Optional; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.gtfs.mapping.TransitModeMapper; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.network.Route; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/ScheduledTripHandler.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/ScheduledTripHandler.java index 7dc21f2f4ef..0e755b598c0 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/ScheduledTripHandler.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/ScheduledTripHandler.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.Map; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.network.StopPattern; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.site.StopLocation; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/StopPositionMapper.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/StopPositionMapper.java index 1c3e4a6f4a6..27e5e6622d6 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/StopPositionMapper.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/StopPositionMapper.java @@ -5,7 +5,7 @@ import java.util.Collections; import java.util.List; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.timetable.Timetable; import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.updater.spi.UpdateException; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/TripTimesUpdater.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/TripTimesUpdater.java index 96649393a5f..97e4e0504c5 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/TripTimesUpdater.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/TripTimesUpdater.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; import org.opentripplanner.transit.model.framework.DataValidationException; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/interpolation/BackwardsDelayPropagationType.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/interpolation/BackwardsDelayPropagationType.java index 6d71c272b90..ccaed7ec1e6 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/interpolation/BackwardsDelayPropagationType.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/interpolation/BackwardsDelayPropagationType.java @@ -1,6 +1,6 @@ package org.opentripplanner.updater.trip.gtfs.interpolation; -import org.opentripplanner.core.domain.model.doc.DocumentedEnum; +import org.opentripplanner.core.model.doc.DocumentedEnum; /** * The backwards delay propagation type for a GTFS RT trip updater. diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/interpolation/ForwardsDelayPropagationType.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/interpolation/ForwardsDelayPropagationType.java index 9a1b803098c..f2b3697d1dd 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/interpolation/ForwardsDelayPropagationType.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/interpolation/ForwardsDelayPropagationType.java @@ -1,6 +1,6 @@ package org.opentripplanner.updater.trip.gtfs.interpolation; -import org.opentripplanner.core.domain.model.doc.DocumentedEnum; +import org.opentripplanner.core.model.doc.DocumentedEnum; public enum ForwardsDelayPropagationType implements DocumentedEnum { NONE, diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/model/GtfsRealtimeMapper.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/model/GtfsRealtimeMapper.java index a5bacf0121a..9dfcf9551c4 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/model/GtfsRealtimeMapper.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/model/GtfsRealtimeMapper.java @@ -2,7 +2,7 @@ import com.google.transit.realtime.GtfsRealtime.VehicleDescriptor.WheelchairAccessible; import java.util.Optional; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.model.accessibility.Accessibility; class GtfsRealtimeMapper { diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/model/StopTimeUpdate.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/model/StopTimeUpdate.java index 3004cc4de38..26848bf8a46 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/model/StopTimeUpdate.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/model/StopTimeUpdate.java @@ -7,7 +7,7 @@ import java.util.OptionalInt; import java.util.OptionalLong; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.gtfs.mapping.PickDropMapper; import org.opentripplanner.model.PickDrop; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/model/TripUpdate.java b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/model/TripUpdate.java index 55520677c2e..1720b3d2633 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/gtfs/model/TripUpdate.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/gtfs/model/TripUpdate.java @@ -13,9 +13,9 @@ import java.util.OptionalInt; import java.util.function.Supplier; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.DataValidationException; import org.opentripplanner.updater.spi.UpdateException; import org.opentripplanner.utils.lang.StringUtils; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/patterncache/TripPatternIdGenerator.java b/application/src/main/java/org/opentripplanner/updater/trip/patterncache/TripPatternIdGenerator.java index c8c93a7721d..81f76432f55 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/patterncache/TripPatternIdGenerator.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/patterncache/TripPatternIdGenerator.java @@ -1,7 +1,7 @@ package org.opentripplanner.updater.trip.patterncache; import java.util.concurrent.atomic.AtomicInteger; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.gtfs.GenerateTripPatternsOperation; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.timetable.Direction; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/siri/AddedTripBuilder.java b/application/src/main/java/org/opentripplanner/updater/trip/siri/AddedTripBuilder.java index de0940268e6..6538563d870 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/siri/AddedTripBuilder.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/siri/AddedTripBuilder.java @@ -13,9 +13,9 @@ import java.util.Objects; import java.util.function.Function; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.StopTime; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.DataValidationException; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/siri/EntityResolver.java b/application/src/main/java/org/opentripplanner/updater/trip/siri/EntityResolver.java index 10b4577d50f..76f27562c93 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/siri/EntityResolver.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/siri/EntityResolver.java @@ -4,7 +4,7 @@ import java.time.LocalDate; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.organization.Operator; import org.opentripplanner.transit.model.site.RegularStop; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/siri/ExtraCallTripBuilder.java b/application/src/main/java/org/opentripplanner/updater/trip/siri/ExtraCallTripBuilder.java index 528f872d943..9cf1590dbf8 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/siri/ExtraCallTripBuilder.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/siri/ExtraCallTripBuilder.java @@ -13,8 +13,8 @@ import java.util.Objects; import java.util.function.Function; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.StopTime; import org.opentripplanner.transit.model.framework.DataValidationException; import org.opentripplanner.transit.model.network.StopPattern; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/siri/ModifiedTripBuilder.java b/application/src/main/java/org/opentripplanner/updater/trip/siri/ModifiedTripBuilder.java index 1fda400d56d..6b0c38738fb 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/siri/ModifiedTripBuilder.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/siri/ModifiedTripBuilder.java @@ -14,7 +14,7 @@ import java.util.Optional; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.DataValidationException; import org.opentripplanner.transit.model.network.StopPattern; import org.opentripplanner.transit.model.network.TripPattern; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriFuzzyTripMatcher.java b/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriFuzzyTripMatcher.java index 769628879ba..87c8d48ca17 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriFuzzyTripMatcher.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriFuzzyTripMatcher.java @@ -14,7 +14,7 @@ import java.util.Set; import java.util.function.BiFunction; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.calendar.TripCalendars; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.network.TripPattern; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriRealTimeTripUpdateAdapter.java b/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriRealTimeTripUpdateAdapter.java index 4f7b49bcac4..9d8d4ed5ab7 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriRealTimeTripUpdateAdapter.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriRealTimeTripUpdateAdapter.java @@ -1,7 +1,7 @@ package org.opentripplanner.updater.trip.siri; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; import org.opentripplanner.transit.repository.TimetableRepository; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.TransitRepository; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriRealTimeUpdateHandler.java b/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriRealTimeUpdateHandler.java index ad80047738e..2222a21477c 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriRealTimeUpdateHandler.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/siri/SiriRealTimeUpdateHandler.java @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; import org.opentripplanner.transit.model.framework.DataValidationException; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.RealTimeTripTimesBuilder; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/siri/StopTimesMapper.java b/application/src/main/java/org/opentripplanner/updater/trip/siri/StopTimesMapper.java index e850116e949..84a4c63da4a 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/siri/StopTimesMapper.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/siri/StopTimesMapper.java @@ -2,7 +2,7 @@ import java.time.ZonedDateTime; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; import org.opentripplanner.transit.model.site.RegularStop; diff --git a/application/src/main/java/org/opentripplanner/updater/trip/siri/TimetableHelper.java b/application/src/main/java/org/opentripplanner/updater/trip/siri/TimetableHelper.java index 69fb741901f..87ae515610f 100644 --- a/application/src/main/java/org/opentripplanner/updater/trip/siri/TimetableHelper.java +++ b/application/src/main/java/org/opentripplanner/updater/trip/siri/TimetableHelper.java @@ -4,7 +4,7 @@ import java.time.ZonedDateTime; import java.util.function.Supplier; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.transit.model.timetable.OccupancyStatus; import org.opentripplanner.transit.model.timetable.RealTimeTripTimesBuilder; import org.opentripplanner.utils.time.ServiceDateUtils; 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 0ab65a0e3c9..e9033fd7f85 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,7 +1,7 @@ package org.opentripplanner.updater.vehicle_parking; import java.util.Objects; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.utils.lang.IntUtils; public record AvailabiltyUpdate(FeedScopedId vehicleParkingId, int spacesAvailable) { 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 267de65a1ea..bccdb77a5d1 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 @@ -5,7 +5,7 @@ import java.util.concurrent.ExecutionException; import java.util.function.Function; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehicleparking.VehicleParkingRepository; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehicleparking.model.VehicleParkingSpaces; 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 9819baf68e9..96137f8b154 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 @@ -9,7 +9,7 @@ import java.util.concurrent.ExecutionException; import java.util.function.Function; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehicleparking.VehicleParkingRepository; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehicleparking.model.VehicleParkingState; 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 fc4e6131496..6bf8aff9aa8 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,7 +30,7 @@ import java.util.function.Function; import java.util.stream.Stream; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.realtimevehicles.RealtimeVehicleRepository; import org.opentripplanner.service.realtimevehicles.model.RealtimeVehicle; import org.opentripplanner.service.realtimevehicles.model.RealtimeVehicle.StopStatus; 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 518250c0e47..ea7399eb4e1 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 @@ -9,7 +9,7 @@ import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ExecutionException; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.retry.OtpRetry; import org.opentripplanner.framework.retry.OtpRetryBuilder; import org.opentripplanner.framework.retry.OtpRetryException; diff --git a/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/params/RentalPickupType.java b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/params/RentalPickupType.java index 93ed25cd4c8..e2a2e315fe3 100644 --- a/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/params/RentalPickupType.java +++ b/application/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/params/RentalPickupType.java @@ -3,7 +3,7 @@ import java.util.Collections; import java.util.EnumSet; import java.util.Set; -import org.opentripplanner.core.domain.model.doc.DocumentedEnum; +import org.opentripplanner.core.model.doc.DocumentedEnum; /** * This is temporary and will be removed in a future version of OTP. diff --git a/application/src/main/java/org/opentripplanner/warmup/api/WarmupApi.java b/application/src/main/java/org/opentripplanner/warmup/api/WarmupApi.java index 56d810fa464..96cf590c2d9 100644 --- a/application/src/main/java/org/opentripplanner/warmup/api/WarmupApi.java +++ b/application/src/main/java/org/opentripplanner/warmup/api/WarmupApi.java @@ -1,6 +1,6 @@ package org.opentripplanner.warmup.api; -import org.opentripplanner.core.domain.model.doc.DocumentedEnum; +import org.opentripplanner.core.model.doc.DocumentedEnum; /** Which GraphQL API to use for warmup queries. */ public enum WarmupApi implements DocumentedEnum { diff --git a/application/src/test-fixtures/java/org/opentripplanner/core/model/id/FeedScopedIdForTestFactory.java b/application/src/test-fixtures/java/org/opentripplanner/core/model/id/FeedScopedIdForTestFactory.java index cf78de29b4f..1703c80dc8a 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/core/model/id/FeedScopedIdForTestFactory.java +++ b/application/src/test-fixtures/java/org/opentripplanner/core/model/id/FeedScopedIdForTestFactory.java @@ -1,7 +1,5 @@ package org.opentripplanner.core.model.id; -import org.opentripplanner.core.domain.model.id.FeedScopedId; - public class FeedScopedIdForTestFactory { public static final String FEED_ID = "F"; diff --git a/application/src/test-fixtures/java/org/opentripplanner/ext/fares/model/FareModelForTest.java b/application/src/test-fixtures/java/org/opentripplanner/ext/fares/model/FareModelForTest.java index 0da2586cec8..66e83ae4988 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/ext/fares/model/FareModelForTest.java +++ b/application/src/test-fixtures/java/org/opentripplanner/ext/fares/model/FareModelForTest.java @@ -4,8 +4,8 @@ import static org.opentripplanner.transit.model._data.TransitRepositoryForTest.OTHER_FEED_AGENCY; import java.time.ZonedDateTime; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.fare.FareOffer; import org.opentripplanner.model.fare.FareProduct; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/application/src/test-fixtures/java/org/opentripplanner/ext/fares/model/FareTestConstants.java b/application/src/test-fixtures/java/org/opentripplanner/ext/fares/model/FareTestConstants.java index 8c4b451cd94..a80539f7394 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/ext/fares/model/FareTestConstants.java +++ b/application/src/test-fixtures/java/org/opentripplanner/ext/fares/model/FareTestConstants.java @@ -5,7 +5,7 @@ import static org.opentripplanner.transit.model._data.TransitRepositoryForTest.groupOfRoutes; import java.time.LocalTime; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.model.fare.FareProduct; import org.opentripplanner.model.fare.RiderCategory; diff --git a/application/src/test-fixtures/java/org/opentripplanner/graph_builder/module/islandpruning/TestNamer.java b/application/src/test-fixtures/java/org/opentripplanner/graph_builder/module/islandpruning/TestNamer.java index 438dd3c351a..035da42520c 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/graph_builder/module/islandpruning/TestNamer.java +++ b/application/src/test-fixtures/java/org/opentripplanner/graph_builder/module/islandpruning/TestNamer.java @@ -1,7 +1,7 @@ package org.opentripplanner.graph_builder.module.islandpruning; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.graph_builder.module.osm.EdgeNamer; import org.opentripplanner.graph_builder.module.osm.model.StreetEdgePair; import org.opentripplanner.graph_builder.module.osm.storage.OsmDatabase; diff --git a/application/src/test-fixtures/java/org/opentripplanner/gtfs/graphbuilder/GtfsModuleTestFactory.java b/application/src/test-fixtures/java/org/opentripplanner/gtfs/graphbuilder/GtfsModuleTestFactory.java index d5138128bd6..2b9d6bfa123 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/gtfs/graphbuilder/GtfsModuleTestFactory.java +++ b/application/src/test-fixtures/java/org/opentripplanner/gtfs/graphbuilder/GtfsModuleTestFactory.java @@ -1,7 +1,7 @@ package org.opentripplanner.gtfs.graphbuilder; import java.util.List; -import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.model.time.LocalDateRange; import org.opentripplanner.ext.fares.service.gtfs.v1.GtfsFareServiceFactory; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.service.streetdetails.internal.DefaultStreetDetailsRepository; diff --git a/application/src/test-fixtures/java/org/opentripplanner/model/plan/TestItinerary.java b/application/src/test-fixtures/java/org/opentripplanner/model/plan/TestItinerary.java index 923e71c742e..70ab3bc16a4 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/model/plan/TestItinerary.java +++ b/application/src/test-fixtures/java/org/opentripplanner/model/plan/TestItinerary.java @@ -1,7 +1,7 @@ package org.opentripplanner.model.plan; import java.util.List; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; public class TestItinerary { diff --git a/application/src/test-fixtures/java/org/opentripplanner/model/plan/TestTransitLegBuilder.java b/application/src/test-fixtures/java/org/opentripplanner/model/plan/TestTransitLegBuilder.java index 1b100e47996..330efe9d6d1 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/model/plan/TestTransitLegBuilder.java +++ b/application/src/test-fixtures/java/org/opentripplanner/model/plan/TestTransitLegBuilder.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.stream.Collectors; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.network.GroupOfRoutes; diff --git a/application/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleTypeFactory.java b/application/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleTypeFactory.java index 56e6f6aa39c..24030111e68 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleTypeFactory.java +++ b/application/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleTypeFactory.java @@ -1,7 +1,7 @@ package org.opentripplanner.service.vehiclerental.model; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.model.RentalFormFactor; public class RentalVehicleTypeFactory { diff --git a/application/src/test-fixtures/java/org/opentripplanner/standalone/api/TestServerContext.java b/application/src/test-fixtures/java/org/opentripplanner/standalone/api/TestServerContext.java index 1e3dc6202e3..e9f2ffe12f8 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/standalone/api/TestServerContext.java +++ b/application/src/test-fixtures/java/org/opentripplanner/standalone/api/TestServerContext.java @@ -5,9 +5,9 @@ import java.time.LocalDate; import java.util.List; import java.util.Optional; -import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; import org.opentripplanner.core.framework.transaction.internal.TransactionFactory; +import org.opentripplanner.core.model.transaction.RepositoryHandle; +import org.opentripplanner.core.model.transaction.RepositoryRegistry; import org.opentripplanner.ext.emission.internal.DefaultEmissionRepository; import org.opentripplanner.ext.emission.internal.DefaultEmissionService; import org.opentripplanner.ext.emission.internal.itinerary.EmissionItineraryDecorator; diff --git a/application/src/test-fixtures/java/org/opentripplanner/street/model/StreetModelForTest.java b/application/src/test-fixtures/java/org/opentripplanner/street/model/StreetModelForTest.java index 3949c079773..ce2a67ca2bf 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/street/model/StreetModelForTest.java +++ b/application/src/test-fixtures/java/org/opentripplanner/street/model/StreetModelForTest.java @@ -6,8 +6,8 @@ import java.util.Set; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.geometry.SphericalDistanceLibrary; diff --git a/application/src/test-fixtures/java/org/opentripplanner/street/model/vertex/SimpleVertex.java b/application/src/test-fixtures/java/org/opentripplanner/street/model/vertex/SimpleVertex.java index 22a105167d9..d78c9e5fe1f 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/street/model/vertex/SimpleVertex.java +++ b/application/src/test-fixtures/java/org/opentripplanner/street/model/vertex/SimpleVertex.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; public class SimpleVertex extends StreetVertex { diff --git a/application/src/test-fixtures/java/org/opentripplanner/street/search/state/TestStateBuilder.java b/application/src/test-fixtures/java/org/opentripplanner/street/search/state/TestStateBuilder.java index 5666bb5cd99..6a9f229d278 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/street/search/state/TestStateBuilder.java +++ b/application/src/test-fixtures/java/org/opentripplanner/street/search/state/TestStateBuilder.java @@ -6,8 +6,8 @@ import java.time.OffsetDateTime; import java.util.Arrays; import java.util.List; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressType; import org.opentripplanner.service.vehiclerental.model.TestFreeFloatingRentalVehicleBuilder; import org.opentripplanner.service.vehiclerental.model.TestVehicleRentalStationBuilder; diff --git a/application/src/test-fixtures/java/org/opentripplanner/transit/model/SiteRepositoryTestBuilder.java b/application/src/test-fixtures/java/org/opentripplanner/transit/model/SiteRepositoryTestBuilder.java index b7a7891aa19..7ea6f25de80 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/transit/model/SiteRepositoryTestBuilder.java +++ b/application/src/test-fixtures/java/org/opentripplanner/transit/model/SiteRepositoryTestBuilder.java @@ -7,7 +7,7 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Polygon; import org.opentripplanner._support.geometry.Coordinates; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.site.AreaStop; diff --git a/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitRepositoryTestBuilder.java b/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitRepositoryTestBuilder.java index 8aa80d098d8..b0df445ca0a 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitRepositoryTestBuilder.java +++ b/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitRepositoryTestBuilder.java @@ -11,7 +11,7 @@ import java.util.Optional; import java.util.function.Consumer; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.UnscheduledTrip; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.calendar.CalendarServiceData; diff --git a/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitTestEnvironment.java b/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitTestEnvironment.java index 5756b7b944e..5006564f25f 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitTestEnvironment.java +++ b/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitTestEnvironment.java @@ -6,11 +6,11 @@ import java.time.ZoneId; import java.util.concurrent.ExecutionException; import org.opentripplanner.LocalTimeParser; -import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; -import org.opentripplanner.core.domain.framework.transaction.UpdateManager; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; import org.opentripplanner.core.framework.transaction.internal.TransactionFactory; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; +import org.opentripplanner.core.model.transaction.RepositoryHandle; +import org.opentripplanner.core.model.transaction.RepositoryRegistry; +import org.opentripplanner.core.model.transaction.UpdateManager; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitData; import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.RaptorTransitDataMapper; import org.opentripplanner.routing.algorithm.raptoradapter.transit.request.DefaultTransitDataProviderFilterBuilder; diff --git a/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitTestEnvironmentBuilder.java b/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitTestEnvironmentBuilder.java index b6fdadc984a..abede8c0be0 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitTestEnvironmentBuilder.java +++ b/application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitTestEnvironmentBuilder.java @@ -4,7 +4,7 @@ import java.time.ZoneId; import java.util.Arrays; import java.util.function.Consumer; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transfer.regular.TransferServiceTestFactory; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.network.RouteBuilder; diff --git a/application/src/test-fixtures/java/org/opentripplanner/transit/model/TripInput.java b/application/src/test-fixtures/java/org/opentripplanner/transit/model/TripInput.java index 3a8266288a9..09c5b3bcb9a 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/transit/model/TripInput.java +++ b/application/src/test-fixtures/java/org/opentripplanner/transit/model/TripInput.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.stream.IntStream; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; import org.opentripplanner.transit.model.basic.TransitMode; diff --git a/application/src/test-fixtures/java/org/opentripplanner/transit/model/TripOnDateDataFetcher.java b/application/src/test-fixtures/java/org/opentripplanner/transit/model/TripOnDateDataFetcher.java index f630395cdde..26b9356c2d7 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/transit/model/TripOnDateDataFetcher.java +++ b/application/src/test-fixtures/java/org/opentripplanner/transit/model/TripOnDateDataFetcher.java @@ -2,7 +2,7 @@ import java.time.LocalDate; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripIdAndServiceDate; diff --git a/application/src/test-fixtures/java/org/opentripplanner/transit/model/site/TestStopLocation.java b/application/src/test-fixtures/java/org/opentripplanner/transit/model/site/TestStopLocation.java index 8855df12d77..1830c6d3a40 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/transit/model/site/TestStopLocation.java +++ b/application/src/test-fixtures/java/org/opentripplanner/transit/model/site/TestStopLocation.java @@ -4,8 +4,8 @@ import org.apache.commons.lang3.NotImplementedException; import org.jetbrains.annotations.Nullable; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; public class TestStopLocation implements StopLocation { diff --git a/application/src/test-fixtures/java/org/opentripplanner/transit/service/NoopSiteResolver.java b/application/src/test-fixtures/java/org/opentripplanner/transit/service/NoopSiteResolver.java index c395e772b55..06b795dba82 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/transit/service/NoopSiteResolver.java +++ b/application/src/test-fixtures/java/org/opentripplanner/transit/service/NoopSiteResolver.java @@ -1,7 +1,7 @@ package org.opentripplanner.transit.service; import org.apache.commons.lang3.NotImplementedException; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.SiteResolver; import org.opentripplanner.transit.model.site.Entrance; import org.opentripplanner.transit.model.site.RegularStop; diff --git a/application/src/test-fixtures/java/org/opentripplanner/updater/trip/gtfs/GtfsRtTestHelper.java b/application/src/test-fixtures/java/org/opentripplanner/updater/trip/gtfs/GtfsRtTestHelper.java index e8271113414..e2c21c59860 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/updater/trip/gtfs/GtfsRtTestHelper.java +++ b/application/src/test-fixtures/java/org/opentripplanner/updater/trip/gtfs/GtfsRtTestHelper.java @@ -6,7 +6,7 @@ import java.time.LocalDate; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; import org.opentripplanner.transit.model.TransitTestEnvironment; import org.opentripplanner.updater.spi.UpdateResult; import org.opentripplanner.updater.trip.UpdateIncrementality; diff --git a/application/src/test-fixtures/java/org/opentripplanner/updater/trip/siri/SiriTestHelper.java b/application/src/test-fixtures/java/org/opentripplanner/updater/trip/siri/SiriTestHelper.java index 2591d192c14..f958073b9dd 100644 --- a/application/src/test-fixtures/java/org/opentripplanner/updater/trip/siri/SiriTestHelper.java +++ b/application/src/test-fixtures/java/org/opentripplanner/updater/trip/siri/SiriTestHelper.java @@ -5,7 +5,7 @@ import java.time.LocalDate; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; import org.opentripplanner.transit.model.TransitTestEnvironment; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.updater.spi.UpdateResult; diff --git a/application/src/test/java/org/opentripplanner/ConstantsForTests.java b/application/src/test/java/org/opentripplanner/ConstantsForTests.java index 7e4f241ac6d..1492a2de01d 100644 --- a/application/src/test/java/org/opentripplanner/ConstantsForTests.java +++ b/application/src/test/java/org/opentripplanner/ConstantsForTests.java @@ -8,9 +8,9 @@ import java.util.List; import java.util.Map; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.LocalDateRange; import org.opentripplanner.datastore.api.CompositeDataSource; import org.opentripplanner.datastore.api.FileType; import org.opentripplanner.datastore.file.DirectoryDataSource; diff --git a/application/src/test/java/org/opentripplanner/GtfsTest.java b/application/src/test/java/org/opentripplanner/GtfsTest.java index 614a6a44db1..f9a366996ad 100644 --- a/application/src/test/java/org/opentripplanner/GtfsTest.java +++ b/application/src/test/java/org/opentripplanner/GtfsTest.java @@ -18,9 +18,9 @@ import java.util.ArrayList; import java.util.List; import org.junit.jupiter.api.BeforeEach; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.LocalDateRange; import org.opentripplanner.core.framework.transaction.internal.TransactionFactory; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.LocalDateRange; import org.opentripplanner.gtfs.graphbuilder.GtfsBundle; import org.opentripplanner.gtfs.graphbuilder.GtfsBundleTestFactory; import org.opentripplanner.gtfs.graphbuilder.GtfsModule; diff --git a/application/src/test/java/org/opentripplanner/OtpArchitectureModules.java b/application/src/test/java/org/opentripplanner/OtpArchitectureModules.java index a404590fa7e..72affb9c0a3 100644 --- a/application/src/test/java/org/opentripplanner/OtpArchitectureModules.java +++ b/application/src/test/java/org/opentripplanner/OtpArchitectureModules.java @@ -17,11 +17,8 @@ public interface OtpArchitectureModules { Package OTP_ROOT = Package.of("org.opentripplanner"); Package CORE = OTP_ROOT.subPackage("core"); - Package CORE_DOMAIN = CORE.subPackage("domain"); - Package CORE_DOMAIN_FRAMEWORK = CORE_DOMAIN.subPackage("framework"); - Package CORE_DOMAIN_FRAMEWORK_ALL = CORE_DOMAIN.subPackage("framework.."); - Package CORE_DOMAIN_MODEL = CORE_DOMAIN.subPackage("model"); - Package CORE_DOMAIN_MODEL_ALL = CORE_DOMAIN.subPackage("model.."); + Package CORE_MODEL = CORE.subPackage("model"); + Package CORE_MODEL_ALL = CORE.subPackage("model.."); Package UTILS_PACKAGE = OTP_ROOT.subPackage("utils"); Package DATASTORE = OTP_ROOT.subPackage("datastore"); @@ -54,8 +51,7 @@ public interface OtpArchitectureModules { Module FRAMEWORK_UTILS = Module.of( OTP_UTILS, - CORE_DOMAIN_MODEL_ALL, - CORE_DOMAIN_FRAMEWORK_ALL, + CORE_MODEL_ALL, FRAMEWORK.subPackage("application"), FRAMEWORK.subPackage("error"), FRAMEWORK.subPackage("i18n"), diff --git a/application/src/test/java/org/opentripplanner/_support/text/I18NStrings.java b/application/src/test/java/org/opentripplanner/_support/text/I18NStrings.java index 67989156e1a..e734580ba37 100644 --- a/application/src/test/java/org/opentripplanner/_support/text/I18NStrings.java +++ b/application/src/test/java/org/opentripplanner/_support/text/I18NStrings.java @@ -1,7 +1,7 @@ package org.opentripplanner._support.text; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.TranslatedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.TranslatedString; public class I18NStrings { diff --git a/application/src/test/java/org/opentripplanner/api/common/LocationStringParserTest.java b/application/src/test/java/org/opentripplanner/api/common/LocationStringParserTest.java index 8446e6be39e..abf4461538e 100644 --- a/application/src/test/java/org/opentripplanner/api/common/LocationStringParserTest.java +++ b/application/src/test/java/org/opentripplanner/api/common/LocationStringParserTest.java @@ -6,7 +6,7 @@ import java.util.Optional; import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.GenericLocation; public class LocationStringParserTest { diff --git a/application/src/test/java/org/opentripplanner/api/model/transit/DefaultFeedIdMapperTest.java b/application/src/test/java/org/opentripplanner/api/model/transit/DefaultFeedIdMapperTest.java index 9bce5244fdd..3e5c4b8e5d1 100644 --- a/application/src/test/java/org/opentripplanner/api/model/transit/DefaultFeedIdMapperTest.java +++ b/application/src/test/java/org/opentripplanner/api/model/transit/DefaultFeedIdMapperTest.java @@ -6,7 +6,7 @@ import java.util.Optional; import org.junit.jupiter.api.Test; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; class DefaultFeedIdMapperTest { diff --git a/application/src/test/java/org/opentripplanner/api/model/transit/FeedScopedIdMapperTest.java b/application/src/test/java/org/opentripplanner/api/model/transit/FeedScopedIdMapperTest.java index 2b28ddd0d37..f9c19be83e9 100644 --- a/application/src/test/java/org/opentripplanner/api/model/transit/FeedScopedIdMapperTest.java +++ b/application/src/test/java/org/opentripplanner/api/model/transit/FeedScopedIdMapperTest.java @@ -10,7 +10,7 @@ import org.apache.commons.lang3.NotImplementedException; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; class FeedScopedIdMapperTest { diff --git a/application/src/test/java/org/opentripplanner/api/model/transit/HideFeedIdMapperTest.java b/application/src/test/java/org/opentripplanner/api/model/transit/HideFeedIdMapperTest.java index f2611b39801..ae5b2fcb55c 100644 --- a/application/src/test/java/org/opentripplanner/api/model/transit/HideFeedIdMapperTest.java +++ b/application/src/test/java/org/opentripplanner/api/model/transit/HideFeedIdMapperTest.java @@ -4,7 +4,7 @@ import java.util.Optional; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; class HideFeedIdMapperTest { diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/CostScalarTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/CostScalarTest.java index 1e749715c13..9d70987192a 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/CostScalarTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/CostScalarTest.java @@ -10,7 +10,7 @@ import graphql.schema.CoercingSerializeException; import java.math.BigInteger; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; class CostScalarTest { 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 9518153fd5f..80905d112f9 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java @@ -43,12 +43,12 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.params.ParameterizedTest; import org.opentripplanner._support.text.I18NStrings; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.model.FeedInfoTestFactory; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.calendar.CalendarServiceData; diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/AlertsConnectionFilterMapperTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/AlertsConnectionFilterMapperTest.java index b94961680ef..cd1b626f8bf 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/AlertsConnectionFilterMapperTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/AlertsConnectionFilterMapperTest.java @@ -11,7 +11,7 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.alertpatch.AlertCause; import org.opentripplanner.routing.alertpatch.AlertEffect; import org.opentripplanner.routing.alertpatch.AlertSeverity; diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/CanceledTripsFilterMapperTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/CanceledTripsFilterMapperTest.java index f470d7015fa..61f90a021a8 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/CanceledTripsFilterMapperTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/CanceledTripsFilterMapperTest.java @@ -17,8 +17,8 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.apis.support.InvalidInputException; import org.opentripplanner.apis.support.graphql.DataFetchingSupport; -import org.opentripplanner.core.domain.model.time.LocalDateRange; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.transit.model.basic.MainAndSubMode; import org.opentripplanner.transit.model.basic.TransitMode; diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/AlertsFilterTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/AlertsFilterTest.java index aa4cc346bcc..8b94a4f69ba 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/AlertsFilterTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/AlertsFilterTest.java @@ -8,8 +8,8 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.alertpatch.AlertCause; import org.opentripplanner.routing.alertpatch.AlertEffect; import org.opentripplanner.routing.alertpatch.AlertSeverity; diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java index 72f0121d355..36bfc7026d9 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java @@ -31,7 +31,7 @@ import org.opentripplanner.apis.gtfs.TestRoutingService; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.apis.support.graphql.DataFetchingSupport; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.service.gtfs.v1.DefaultFareService; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.place.nearbystopfinder.StreetNearbyStopFinder; diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperBicycleTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperBicycleTest.java index cb005f67d2b..ce70d1ddcf9 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperBicycleTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperBicycleTest.java @@ -11,7 +11,7 @@ import java.util.Set; import org.junit.jupiter.api.Test; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.street.model.VehicleRoutingOptimizeType; class RouteRequestMapperBicycleTest { diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperCarTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperCarTest.java index 8baed8d8bf5..824bb27bf13 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperCarTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperCarTest.java @@ -11,7 +11,7 @@ import java.util.Set; import org.junit.jupiter.api.Test; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; class RouteRequestMapperCarTest { diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperScooterTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperScooterTest.java index cc29148a1e4..8dd6b5ea809 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperScooterTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperScooterTest.java @@ -9,7 +9,7 @@ import java.util.Set; import org.junit.jupiter.api.Test; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.street.model.VehicleRoutingOptimizeType; class RouteRequestMapperScooterTest { diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java index c623edeef51..407ea13be95 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java @@ -16,7 +16,7 @@ import java.util.Locale; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.plan.paging.cursor.PageCursor; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.preference.ItineraryFilterDebugProfile; diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTransitTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTransitTest.java index 898ccd706af..39e9867bc11 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTransitTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTransitTest.java @@ -8,7 +8,7 @@ import java.util.Locale; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.transit.model.basic.TransitMode; class RouteRequestMapperTransitTest { diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperWalkTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperWalkTest.java index f52f8509467..3ec71545064 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperWalkTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperWalkTest.java @@ -6,7 +6,7 @@ import java.util.Locale; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; class RouteRequestMapperWalkTest { diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/model/OffsetDateTimeRangeTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/model/OffsetDateTimeRangeTest.java index ee17b285b19..05e2a2443de 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/model/OffsetDateTimeRangeTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/model/OffsetDateTimeRangeTest.java @@ -7,7 +7,7 @@ import java.time.ZoneId; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.time.TimePeriod; class OffsetDateTimeRangeTest { diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/service/ApiTransitServiceTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/service/ApiTransitServiceTest.java index f63689a0c5d..42696503132 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/service/ApiTransitServiceTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/service/ApiTransitServiceTest.java @@ -16,8 +16,8 @@ import java.time.ZonedDateTime; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.time.LocalDateRange; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.model.plan.leg.ScheduledTransitLegBuilder; diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/support/sort/AlertsConnectionOrderingTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/support/sort/AlertsConnectionOrderingTest.java index 3c6c16c5470..53eb40b6f8f 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/support/sort/AlertsConnectionOrderingTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/support/sort/AlertsConnectionOrderingTest.java @@ -6,8 +6,8 @@ import java.util.List; import javax.annotation.Nullable; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.routing.alertpatch.AlertCalendar; import org.opentripplanner.routing.alertpatch.AlertSeverity; import org.opentripplanner.routing.alertpatch.TransitAlert; diff --git a/application/src/test/java/org/opentripplanner/apis/gtfs/support/time/OffsetDateTimeRangeUtilTest.java b/application/src/test/java/org/opentripplanner/apis/gtfs/support/time/OffsetDateTimeRangeUtilTest.java index 65a6adc03e1..73e486ca287 100644 --- a/application/src/test/java/org/opentripplanner/apis/gtfs/support/time/OffsetDateTimeRangeUtilTest.java +++ b/application/src/test/java/org/opentripplanner/apis/gtfs/support/time/OffsetDateTimeRangeUtilTest.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.apis.support.InvalidInputException; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.time.TimePeriod; class OffsetDateTimeRangeUtilTest { diff --git a/application/src/test/java/org/opentripplanner/apis/transmodel/mapping/FixedFeedIdGeneratorTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/mapping/FixedFeedIdGeneratorTest.java index bd1216999d3..277bf5818f8 100644 --- a/application/src/test/java/org/opentripplanner/apis/transmodel/mapping/FixedFeedIdGeneratorTest.java +++ b/application/src/test/java/org/opentripplanner/apis/transmodel/mapping/FixedFeedIdGeneratorTest.java @@ -5,7 +5,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.organization.Agency; diff --git a/application/src/test/java/org/opentripplanner/apis/transmodel/model/EnumTypesTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/model/EnumTypesTest.java index 8cbab163ec1..5cf5a570a5b 100644 --- a/application/src/test/java/org/opentripplanner/apis/transmodel/model/EnumTypesTest.java +++ b/application/src/test/java/org/opentripplanner/apis/transmodel/model/EnumTypesTest.java @@ -20,7 +20,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; import org.opentripplanner.apis.transmodel.mapping.RelativeDirectionMapper; -import org.opentripplanner.core.domain.model.doc.DocumentedEnum; +import org.opentripplanner.core.model.doc.DocumentedEnum; import org.opentripplanner.model.plan.walkstep.RelativeDirection; import org.opentripplanner.routing.api.response.RoutingErrorCode; import org.opentripplanner.transit.model.basic.TransitMode; diff --git a/application/src/test/java/org/opentripplanner/apis/transmodel/model/PlanResponseBuilderTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/model/PlanResponseBuilderTest.java index a53f46f2839..b3fb66cd0a5 100644 --- a/application/src/test/java/org/opentripplanner/apis/transmodel/model/PlanResponseBuilderTest.java +++ b/application/src/test/java/org/opentripplanner/apis/transmodel/model/PlanResponseBuilderTest.java @@ -9,7 +9,7 @@ import java.time.Instant; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.SortOrder; diff --git a/application/src/test/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostTypeTest.java b/application/src/test/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostTypeTest.java index afae8b2d892..e8b6fd5ce52 100644 --- a/application/src/test/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostTypeTest.java +++ b/application/src/test/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostTypeTest.java @@ -10,7 +10,7 @@ import graphql.language.StringValue; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; class RelaxCostTypeTest { 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 86b5f8c6f5d..80457aad874 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 @@ -5,7 +5,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.model.plan.ItineraryBuilder; import org.opentripplanner.model.plan.Place; diff --git a/application/src/test/java/org/opentripplanner/framework/FrameworkArchitectureTest.java b/application/src/test/java/org/opentripplanner/framework/FrameworkArchitectureTest.java index b3c0cba9c16..2fbd9d145ae 100644 --- a/application/src/test/java/org/opentripplanner/framework/FrameworkArchitectureTest.java +++ b/application/src/test/java/org/opentripplanner/framework/FrameworkArchitectureTest.java @@ -1,7 +1,6 @@ package org.opentripplanner.framework; -import static org.opentripplanner.OtpArchitectureModules.CORE_DOMAIN_FRAMEWORK; -import static org.opentripplanner.OtpArchitectureModules.CORE_DOMAIN_MODEL; +import static org.opentripplanner.OtpArchitectureModules.CORE_MODEL; import static org.opentripplanner.OtpArchitectureModules.FRAMEWORK; import static org.opentripplanner.OtpArchitectureModules.GNU_TROVE; import static org.opentripplanner.OtpArchitectureModules.OTP_UTILS; @@ -22,10 +21,10 @@ public class FrameworkArchitectureTest { private static final Package APPLICATION = FRAMEWORK.subPackage("application"); private static final Package COLLECTION = FRAMEWORK.subPackage("collection"); private static final Package FUNCTIONAL = FRAMEWORK.subPackage("functional"); - private static final Package I18N = CORE_DOMAIN_MODEL.subPackage("i18n"); + private static final Package I18N = CORE_MODEL.subPackage("i18n"); private static final Package IO = FRAMEWORK.subPackage("io"); private static final Package LOGGING = FRAMEWORK.subPackage("logging"); - private static final Package RESOURCES = CORE_DOMAIN_FRAMEWORK.subPackage("resources"); + private static final Package RESOURCES = CORE_MODEL.subPackage("resources"); private static final Package TIME = FRAMEWORK.subPackage("time"); @Test diff --git a/application/src/test/java/org/opentripplanner/framework/doc/DocumentedEnumTestHelper.java b/application/src/test/java/org/opentripplanner/framework/doc/DocumentedEnumTestHelper.java index 479de149bf9..3262b5fb6fe 100644 --- a/application/src/test/java/org/opentripplanner/framework/doc/DocumentedEnumTestHelper.java +++ b/application/src/test/java/org/opentripplanner/framework/doc/DocumentedEnumTestHelper.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import org.opentripplanner.core.domain.model.doc.DocumentedEnum; +import org.opentripplanner.core.model.doc.DocumentedEnum; public class DocumentedEnumTestHelper { diff --git a/application/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java b/application/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java index e7d2fd45912..00553dd691b 100644 --- a/application/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java +++ b/application/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java @@ -11,7 +11,7 @@ import java.util.Map; import org.junit.jupiter.api.Test; import org.opentripplanner.apis.support.graphql.DataFetchingSupport; -import org.opentripplanner.core.domain.model.i18n.TranslatedString; +import org.opentripplanner.core.model.i18n.TranslatedString; class GraphQLUtilsTest { diff --git a/application/src/test/java/org/opentripplanner/framework/graphql/scalar/CostScalarFactoryTest.java b/application/src/test/java/org/opentripplanner/framework/graphql/scalar/CostScalarFactoryTest.java index b925a53fa39..775b157dff4 100644 --- a/application/src/test/java/org/opentripplanner/framework/graphql/scalar/CostScalarFactoryTest.java +++ b/application/src/test/java/org/opentripplanner/framework/graphql/scalar/CostScalarFactoryTest.java @@ -10,7 +10,7 @@ import java.math.BigInteger; import java.util.Locale; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; class CostScalarFactoryTest { diff --git a/application/src/test/java/org/opentripplanner/framework/model/CostTest.java b/application/src/test/java/org/opentripplanner/framework/model/CostTest.java index 91ec879e101..c5e4da64db6 100644 --- a/application/src/test/java/org/opentripplanner/framework/model/CostTest.java +++ b/application/src/test/java/org/opentripplanner/framework/model/CostTest.java @@ -4,13 +4,13 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.opentripplanner.core.domain.model.basic.Cost.ONE_HOUR_WITH_TRANSIT; +import static org.opentripplanner.core.model.basic.Cost.ONE_HOUR_WITH_TRANSIT; import java.time.Duration; import java.util.List; import java.util.stream.Stream; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.core.testfixtures.lang.AssertEqualsAndHashCode; class CostTest { 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 472cb513dc4..c620c0d6e76 100644 --- a/application/src/test/java/org/opentripplanner/framework/model/TimeAndCostTest.java +++ b/application/src/test/java/org/opentripplanner/framework/model/TimeAndCostTest.java @@ -7,7 +7,7 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.utils.time.DurationUtils; class TimeAndCostTest { diff --git a/application/src/test/java/org/opentripplanner/gbfs/v2/GbfsFreeVehicleStatusMapperTest.java b/application/src/test/java/org/opentripplanner/gbfs/v2/GbfsFreeVehicleStatusMapperTest.java index ccfb6a90a7c..515c76b8d44 100644 --- a/application/src/test/java/org/opentripplanner/gbfs/v2/GbfsFreeVehicleStatusMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gbfs/v2/GbfsFreeVehicleStatusMapperTest.java @@ -5,8 +5,8 @@ import java.util.Map; import org.junit.jupiter.api.Test; import org.mobilitydata.gbfs.v2_3.free_bike_status.GBFSBike; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem; import org.opentripplanner.street.model.RentalFormFactor; diff --git a/application/src/test/java/org/opentripplanner/gbfs/v3/GbfsFeedMapperTest.java b/application/src/test/java/org/opentripplanner/gbfs/v3/GbfsFeedMapperTest.java index 460db63c573..2012beddba1 100644 --- a/application/src/test/java/org/opentripplanner/gbfs/v3/GbfsFeedMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gbfs/v3/GbfsFeedMapperTest.java @@ -13,7 +13,7 @@ import java.util.Set; import org.junit.jupiter.api.Test; import org.mobilitydata.gbfs.v3_0.vehicle_types.GBFSVehicleType; -import org.opentripplanner.core.domain.model.i18n.TranslatedString; +import org.opentripplanner.core.model.i18n.TranslatedString; import org.opentripplanner.framework.io.HttpHeaders; import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.gbfs.GbfsAutoConfiguration; diff --git a/application/src/test/java/org/opentripplanner/gbfs/v3/GbfsStationInformationMapperTest.java b/application/src/test/java/org/opentripplanner/gbfs/v3/GbfsStationInformationMapperTest.java index 3075005217e..f001956b7c4 100644 --- a/application/src/test/java/org/opentripplanner/gbfs/v3/GbfsStationInformationMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gbfs/v3/GbfsStationInformationMapperTest.java @@ -16,8 +16,8 @@ import org.mobilitydata.gbfs.v3_0.station_information.GBFSName; import org.mobilitydata.gbfs.v3_0.station_information.GBFSStation; import org.mobilitydata.gbfs.v3_0.station_information.GBFSVehicleTypesCapacity; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem; import org.opentripplanner.street.model.RentalFormFactor; diff --git a/application/src/test/java/org/opentripplanner/gbfs/v3/GbfsVehicleStatusMapperTest.java b/application/src/test/java/org/opentripplanner/gbfs/v3/GbfsVehicleStatusMapperTest.java index d863de17bd3..bc0c8630cc9 100644 --- a/application/src/test/java/org/opentripplanner/gbfs/v3/GbfsVehicleStatusMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gbfs/v3/GbfsVehicleStatusMapperTest.java @@ -5,8 +5,8 @@ import java.util.Map; import org.junit.jupiter.api.Test; import org.mobilitydata.gbfs.v3_0.vehicle_status.GBFSVehicle; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem; import org.opentripplanner.street.model.RentalFormFactor; diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java index 6f9b4340740..a01c0dfd506 100644 --- a/application/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java +++ b/application/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java @@ -16,8 +16,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.graph_builder.module.osm.OsmModuleTestFactory; import org.opentripplanner.osm.DefaultOsmProvider; import org.opentripplanner.routing.linking.VertexLinkerTestFactory; diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java index 20b7b92fe85..6ee289a4876 100644 --- a/application/src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java +++ b/application/src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; import org.opentripplanner.ext.flex.trip.UnscheduledTrip; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/geometry/CalculateWorldEnvelopeModuleTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/geometry/CalculateWorldEnvelopeModuleTest.java index b68d2198680..ed484e79bf3 100644 --- a/application/src/test/java/org/opentripplanner/graph_builder/module/geometry/CalculateWorldEnvelopeModuleTest.java +++ b/application/src/test/java/org/opentripplanner/graph_builder/module/geometry/CalculateWorldEnvelopeModuleTest.java @@ -4,7 +4,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.model.vertex.VertexLabel; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/geometry/GeometryProcessorTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/geometry/GeometryProcessorTest.java index c7bbc580245..e8aca728395 100644 --- a/application/src/test/java/org/opentripplanner/graph_builder/module/geometry/GeometryProcessorTest.java +++ b/application/src/test/java/org/opentripplanner/graph_builder/module/geometry/GeometryProcessorTest.java @@ -17,7 +17,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.locationtech.jts.geom.LineString; import org.opentest4j.AssertionFailedError; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.service.DefaultDataImportIssueStore; import org.opentripplanner.model.ShapePoint; import org.opentripplanner.model.impl.TransitDataImportBuilder; diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java index dbcef541f64..5b1b34cea81 100644 --- a/application/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java +++ b/application/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test; import org.opentripplanner._support.geometry.Coordinates; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.vertex.TransitStopVertex; import org.opentripplanner.street.model.vertex.TransitStopVertexBuilder; diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/ned/MissingElevationHandlerTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/ned/MissingElevationHandlerTest.java index 210b526c474..4ab143e7926 100644 --- a/application/src/test/java/org/opentripplanner/graph_builder/module/ned/MissingElevationHandlerTest.java +++ b/application/src/test/java/org/opentripplanner/graph_builder/module/ned/MissingElevationHandlerTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.impl.PackedCoordinateSequence; -import org.opentripplanner.core.domain.model.i18n.LocalizedStringFormat; +import org.opentripplanner.core.model.i18n.LocalizedStringFormat; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issue.service.DefaultDataImportIssueStore; import org.opentripplanner.street.model.StreetModelForTest; diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/osm/ParkingProcessorTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/ParkingProcessorTest.java index 2489532cf36..44c9c5aee4a 100644 --- a/application/src/test/java/org/opentripplanner/graph_builder/module/osm/ParkingProcessorTest.java +++ b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/ParkingProcessorTest.java @@ -8,7 +8,7 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.opentripplanner._support.geometry.Coordinates; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.osm.WayTestData; import org.opentripplanner.street.graph.Graph; diff --git a/application/src/test/java/org/opentripplanner/graph_builder/module/osm/moduletests/elevator/MultipleLevelsTest.java b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/moduletests/elevator/MultipleLevelsTest.java index 68b29a25086..567852b607c 100644 --- a/application/src/test/java/org/opentripplanner/graph_builder/module/osm/moduletests/elevator/MultipleLevelsTest.java +++ b/application/src/test/java/org/opentripplanner/graph_builder/module/osm/moduletests/elevator/MultipleLevelsTest.java @@ -10,7 +10,7 @@ import java.util.Set; import java.util.stream.StreamSupport; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.model.accessibility.Accessibility; import org.opentripplanner.graph_builder.module.osm.OsmModuleTestFactory; import org.opentripplanner.osm.TestOsmProvider; import org.opentripplanner.osm.model.NodeBuilder; diff --git a/application/src/test/java/org/opentripplanner/gtfs/GenerateTripPatternsOperationTest.java b/application/src/test/java/org/opentripplanner/gtfs/GenerateTripPatternsOperationTest.java index b7c4537cfbc..63631f79a7a 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/GenerateTripPatternsOperationTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/GenerateTripPatternsOperationTest.java @@ -12,7 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issue.service.DefaultDataImportIssueStore; diff --git a/application/src/test/java/org/opentripplanner/gtfs/graphbuilder/GtfsModuleTest.java b/application/src/test/java/org/opentripplanner/gtfs/graphbuilder/GtfsModuleTest.java index 52406a9a46c..95df63ac586 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/graphbuilder/GtfsModuleTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/graphbuilder/GtfsModuleTest.java @@ -12,7 +12,7 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.ConstantsForTests; -import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.model.time.LocalDateRange; import org.opentripplanner.street.graph.Graph; import org.opentripplanner.test.support.ResourceLoader; import org.opentripplanner.transit.service.SiteRepository; diff --git a/application/src/test/java/org/opentripplanner/gtfs/interlining/InterlineProcessorTest.java b/application/src/test/java/org/opentripplanner/gtfs/interlining/InterlineProcessorTest.java index 4964625a348..a5926e992df 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/interlining/InterlineProcessorTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/interlining/InterlineProcessorTest.java @@ -11,7 +11,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.gtfs.mapping.StaySeatedNotAllowed; diff --git a/application/src/test/java/org/opentripplanner/gtfs/mapping/BoardingAreaMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/BoardingAreaMapperTest.java index 1e767836988..5164c8d6c69 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/mapping/BoardingAreaMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/mapping/BoardingAreaMapperTest.java @@ -12,7 +12,7 @@ import org.junit.jupiter.api.Test; import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.Stop; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.model.accessibility.Accessibility; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.site.BoardingArea; import org.opentripplanner.transit.model.site.RegularStop; diff --git a/application/src/test/java/org/opentripplanner/gtfs/mapping/EntranceMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/EntranceMapperTest.java index becd2ba7779..4e5193fa89f 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/mapping/EntranceMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/mapping/EntranceMapperTest.java @@ -12,7 +12,7 @@ import org.junit.jupiter.api.Test; import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.Stop; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.model.accessibility.Accessibility; import org.opentripplanner.transit.model.site.Entrance; public class EntranceMapperTest { diff --git a/application/src/test/java/org/opentripplanner/gtfs/mapping/IdFactoryTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/IdFactoryTest.java index e230bbe9b2a..d5c20891592 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/mapping/IdFactoryTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/mapping/IdFactoryTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import org.onebusaway.gtfs.model.AgencyAndId; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; class IdFactoryTest { diff --git a/application/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java index 8dcd7f0acad..3137e5db3b2 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java @@ -9,7 +9,7 @@ import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.LocationGroup; import org.onebusaway.gtfs.model.Stop; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.service.SiteRepository; diff --git a/application/src/test/java/org/opentripplanner/gtfs/mapping/PathwayNodeMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/PathwayNodeMapperTest.java index 985f5fae8a9..f199959fade 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/mapping/PathwayNodeMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/mapping/PathwayNodeMapperTest.java @@ -12,7 +12,7 @@ import org.junit.jupiter.api.Test; import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.Stop; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.model.accessibility.Accessibility; import org.opentripplanner.transit.model.site.PathwayNode; public class PathwayNodeMapperTest { diff --git a/application/src/test/java/org/opentripplanner/gtfs/mapping/RouteMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/RouteMapperTest.java index 48aadd55a1c..ad81de9bf77 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/mapping/RouteMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/mapping/RouteMapperTest.java @@ -14,7 +14,7 @@ import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.Route; import org.onebusaway.gtfs.model.RouteNetworkAssignment; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/application/src/test/java/org/opentripplanner/gtfs/mapping/ShapePointMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/ShapePointMapperTest.java index afb8e228bbd..767060b2499 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/mapping/ShapePointMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/mapping/ShapePointMapperTest.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test; import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.ShapePoint; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; public class ShapePointMapperTest { diff --git a/application/src/test/java/org/opentripplanner/gtfs/mapping/StopMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/StopMapperTest.java index 13a15acc2d5..6fe4010855a 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/mapping/StopMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/mapping/StopMapperTest.java @@ -16,7 +16,7 @@ import org.junit.jupiter.api.Test; import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.Stop; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.model.accessibility.Accessibility; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.basic.TransitMode; diff --git a/application/src/test/java/org/opentripplanner/gtfs/mapping/TranslationHelperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/TranslationHelperTest.java index 0bdae633cbf..ac046142d66 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/mapping/TranslationHelperTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/mapping/TranslationHelperTest.java @@ -12,7 +12,7 @@ import org.onebusaway.gtfs.model.Stop; import org.onebusaway.gtfs.model.StopTime; import org.onebusaway.gtfs.model.Translation; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; public class TranslationHelperTest { diff --git a/application/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java index efaad9716c9..9a4cfad6318 100644 --- a/application/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java +++ b/application/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java @@ -16,7 +16,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.Trip; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.model.accessibility.Accessibility; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.transit.model.network.BikeAccess; import org.opentripplanner.transit.model.network.CarAccess; diff --git a/application/src/test/java/org/opentripplanner/inspector/vector/KeyValueTest.java b/application/src/test/java/org/opentripplanner/inspector/vector/KeyValueTest.java index 83e122518c1..5cc7f12021d 100644 --- a/application/src/test/java/org/opentripplanner/inspector/vector/KeyValueTest.java +++ b/application/src/test/java/org/opentripplanner/inspector/vector/KeyValueTest.java @@ -7,7 +7,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; class KeyValueTest { diff --git a/application/src/test/java/org/opentripplanner/inspector/vector/stop/AreaStopLayerBuilderTest.java b/application/src/test/java/org/opentripplanner/inspector/vector/stop/AreaStopLayerBuilderTest.java index b959ba6b1ab..7ab253bcfca 100644 --- a/application/src/test/java/org/opentripplanner/inspector/vector/stop/AreaStopLayerBuilderTest.java +++ b/application/src/test/java/org/opentripplanner/inspector/vector/stop/AreaStopLayerBuilderTest.java @@ -5,8 +5,8 @@ import java.util.Locale; import org.junit.jupiter.api.Test; import org.opentripplanner._support.geometry.Polygons; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.transit.model.site.AreaStop; import org.opentripplanner.transit.service.SiteRepository; diff --git a/application/src/test/java/org/opentripplanner/model/GenericLocationTest.java b/application/src/test/java/org/opentripplanner/model/GenericLocationTest.java index be193111426..b09f3e97073 100644 --- a/application/src/test/java/org/opentripplanner/model/GenericLocationTest.java +++ b/application/src/test/java/org/opentripplanner/model/GenericLocationTest.java @@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.testfixtures.lang.AssertEqualsAndHashCode; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/application/src/test/java/org/opentripplanner/model/TripPatternTest.java b/application/src/test/java/org/opentripplanner/model/TripPatternTest.java index b707e60c269..4ff9972d448 100644 --- a/application/src/test/java/org/opentripplanner/model/TripPatternTest.java +++ b/application/src/test/java/org/opentripplanner/model/TripPatternTest.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.network.StopPattern; 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 c6178426b1b..e618d706a89 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,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.opentripplanner.ConstantsForTests; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.gtfs.GtfsContext; import org.opentripplanner.gtfs.GtfsContextBuilder; diff --git a/application/src/test/java/org/opentripplanner/model/impl/DefaultTransitDataImportTest.java b/application/src/test/java/org/opentripplanner/model/impl/DefaultTransitDataImportTest.java index 35dc2706896..da06ac0747f 100644 --- a/application/src/test/java/org/opentripplanner/model/impl/DefaultTransitDataImportTest.java +++ b/application/src/test/java/org/opentripplanner/model/impl/DefaultTransitDataImportTest.java @@ -15,7 +15,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.opentripplanner.ConstantsForTests; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.gtfs.GtfsContextBuilder; import org.opentripplanner.model.FeedInfo; import org.opentripplanner.model.FeedInfoTestFactory; diff --git a/application/src/test/java/org/opentripplanner/model/impl/TransitDataImportBuilderLimitPeriodTest.java b/application/src/test/java/org/opentripplanner/model/impl/TransitDataImportBuilderLimitPeriodTest.java index 9207aa74cba..8ce809ddc84 100644 --- a/application/src/test/java/org/opentripplanner/model/impl/TransitDataImportBuilderLimitPeriodTest.java +++ b/application/src/test/java/org/opentripplanner/model/impl/TransitDataImportBuilderLimitPeriodTest.java @@ -10,9 +10,9 @@ import java.util.stream.Collectors; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; +import org.opentripplanner.core.model.time.LocalDateRange; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; diff --git a/application/src/test/java/org/opentripplanner/model/impl/TransitDataImportBuilderTest.java b/application/src/test/java/org/opentripplanner/model/impl/TransitDataImportBuilderTest.java index b8b8a9c12b4..2db75cd08ff 100644 --- a/application/src/test/java/org/opentripplanner/model/impl/TransitDataImportBuilderTest.java +++ b/application/src/test/java/org/opentripplanner/model/impl/TransitDataImportBuilderTest.java @@ -13,7 +13,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.opentripplanner.ConstantsForTests; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.model.FeedInfoTestFactory; import org.opentripplanner.model.Frequency; diff --git a/application/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java b/application/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java index b77c2030fcc..93b92ec1097 100644 --- a/application/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java +++ b/application/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java @@ -14,7 +14,7 @@ import java.util.List; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.model.SystemNotice; diff --git a/application/src/test/java/org/opentripplanner/model/plan/PlaceTest.java b/application/src/test/java/org/opentripplanner/model/plan/PlaceTest.java index 48d60c4b29c..529b1f30279 100644 --- a/application/src/test/java/org/opentripplanner/model/plan/PlaceTest.java +++ b/application/src/test/java/org/opentripplanner/model/plan/PlaceTest.java @@ -13,9 +13,9 @@ import org.junit.jupiter.params.provider.MethodSource; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.model.plan.leg.ViaLocationType; import org.opentripplanner.street.geometry.GeometryUtils; 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 ada64f0d611..34db7626b13 100644 --- a/application/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java +++ b/application/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java @@ -14,9 +14,9 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.basic.Cost; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.ext.flex.FlexibleTransitLeg; import org.opentripplanner.ext.flex.edgetype.FlexTripEdge; diff --git a/application/src/test/java/org/opentripplanner/model/plan/leg/ScheduledTransitLegTest.java b/application/src/test/java/org/opentripplanner/model/plan/leg/ScheduledTransitLegTest.java index e20d7697a72..6140c082c22 100644 --- a/application/src/test/java/org/opentripplanner/model/plan/leg/ScheduledTransitLegTest.java +++ b/application/src/test/java/org/opentripplanner/model/plan/leg/ScheduledTransitLegTest.java @@ -15,8 +15,8 @@ import java.util.Set; import org.junit.jupiter.api.Test; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.domain.model.basic.Cost; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.model.fare.FareProduct; import org.opentripplanner.model.plan.Emission; import org.opentripplanner.routing.alertpatch.TransitAlert; diff --git a/application/src/test/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializerTest.java b/application/src/test/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializerTest.java index 3f00d338e57..a3c781403cc 100644 --- a/application/src/test/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializerTest.java +++ b/application/src/test/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializerTest.java @@ -6,7 +6,7 @@ import java.time.LocalDate; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; class LegReferenceSerializerTest { diff --git a/application/src/test/java/org/opentripplanner/model/plan/legreference/ScheduledTransitLegReferenceTest.java b/application/src/test/java/org/opentripplanner/model/plan/legreference/ScheduledTransitLegReferenceTest.java index 06aac7861f0..2b9b0028cc8 100644 --- a/application/src/test/java/org/opentripplanner/model/plan/legreference/ScheduledTransitLegReferenceTest.java +++ b/application/src/test/java/org/opentripplanner/model/plan/legreference/ScheduledTransitLegReferenceTest.java @@ -11,7 +11,7 @@ import java.util.Map; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.model.calendar.CalendarServiceData; import org.opentripplanner.model.plan.leg.ScheduledTransitLeg; diff --git a/application/src/test/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCutTest.java b/application/src/test/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCutTest.java index 1c4b97a8c58..5a170e29ebc 100644 --- a/application/src/test/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCutTest.java +++ b/application/src/test/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCutTest.java @@ -4,8 +4,8 @@ import java.time.Instant; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; -import org.opentripplanner.core.domain.model.basic.NormalizedCost; +import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.model.basic.NormalizedCost; class DeduplicationPageCutTest { 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 793bbfcaa97..a678f97f854 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,7 +10,7 @@ import java.time.Duration; import java.time.Instant; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.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 fbe434feb0e..0505e4477f6 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 @@ -10,7 +10,7 @@ import java.time.Duration; import java.time.Instant; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.utils.time.DurationUtils; 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 0d1ae45f022..813bff0cdf4 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 @@ -24,7 +24,7 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.PlanTestConstants; diff --git a/application/src/test/java/org/opentripplanner/model/plan/walkstep/WalkStepTest.java b/application/src/test/java/org/opentripplanner/model/plan/walkstep/WalkStepTest.java index 52a0b5b86c4..538f17d8b53 100644 --- a/application/src/test/java/org/opentripplanner/model/plan/walkstep/WalkStepTest.java +++ b/application/src/test/java/org/opentripplanner/model/plan/walkstep/WalkStepTest.java @@ -8,7 +8,7 @@ import java.util.Optional; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.street.geometry.WgsCoordinate; public class WalkStepTest { diff --git a/application/src/test/java/org/opentripplanner/netex/NetexEpipBundleSmokeTest.java b/application/src/test/java/org/opentripplanner/netex/NetexEpipBundleSmokeTest.java index 85308c92c1e..25cdeb841ca 100644 --- a/application/src/test/java/org/opentripplanner/netex/NetexEpipBundleSmokeTest.java +++ b/application/src/test/java/org/opentripplanner/netex/NetexEpipBundleSmokeTest.java @@ -14,8 +14,8 @@ import java.util.stream.Collectors; import org.junit.jupiter.api.Test; import org.opentripplanner.ConstantsForTests; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.TransitDataImport; import org.opentripplanner.model.calendar.CalendarServiceData; diff --git a/application/src/test/java/org/opentripplanner/netex/NetexNordicBundleSmokeTest.java b/application/src/test/java/org/opentripplanner/netex/NetexNordicBundleSmokeTest.java index a8bdcf56250..cdd23b36dde 100644 --- a/application/src/test/java/org/opentripplanner/netex/NetexNordicBundleSmokeTest.java +++ b/application/src/test/java/org/opentripplanner/netex/NetexNordicBundleSmokeTest.java @@ -18,8 +18,8 @@ import java.util.stream.Collectors; import org.junit.jupiter.api.Test; import org.opentripplanner.ConstantsForTests; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.TransitDataImport; import org.opentripplanner.model.calendar.CalendarServiceData; diff --git a/application/src/test/java/org/opentripplanner/netex/mapping/FeedScopedIdFactoryTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/FeedScopedIdFactoryTest.java index 816424fe7ab..76228916960 100644 --- a/application/src/test/java/org/opentripplanner/netex/mapping/FeedScopedIdFactoryTest.java +++ b/application/src/test/java/org/opentripplanner/netex/mapping/FeedScopedIdFactoryTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; public class FeedScopedIdFactoryTest { diff --git a/application/src/test/java/org/opentripplanner/netex/mapping/NetexMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/NetexMapperTest.java index 352d3b0c0e3..f97fb054a36 100644 --- a/application/src/test/java/org/opentripplanner/netex/mapping/NetexMapperTest.java +++ b/application/src/test/java/org/opentripplanner/netex/mapping/NetexMapperTest.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssue; import org.opentripplanner.graph_builder.issue.service.DefaultDataImportIssueStore; import org.opentripplanner.model.impl.TransitDataImportBuilder; diff --git a/application/src/test/java/org/opentripplanner/netex/mapping/ServiceLinkMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/ServiceLinkMapperTest.java index 34334bc5233..1e065227c15 100644 --- a/application/src/test/java/org/opentripplanner/netex/mapping/ServiceLinkMapperTest.java +++ b/application/src/test/java/org/opentripplanner/netex/mapping/ServiceLinkMapperTest.java @@ -14,8 +14,8 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issue.service.DefaultDataImportIssueStore; import org.opentripplanner.netex.index.hierarchy.HierarchicalMap; diff --git a/application/src/test/java/org/opentripplanner/netex/mapping/StopAndStationMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/StopAndStationMapperTest.java index 7a9d1b4134a..c2a3d2805a9 100644 --- a/application/src/test/java/org/opentripplanner/netex/mapping/StopAndStationMapperTest.java +++ b/application/src/test/java/org/opentripplanner/netex/mapping/StopAndStationMapperTest.java @@ -18,7 +18,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.model.accessibility.Accessibility; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.netex.index.hierarchy.HierarchicalVersionMapById; import org.opentripplanner.transit.model.site.RegularStop; diff --git a/application/src/test/java/org/opentripplanner/netex/mapping/TripCalendarBuilderTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/TripCalendarBuilderTest.java index 91fecacbf7b..2e33e46294a 100644 --- a/application/src/test/java/org/opentripplanner/netex/mapping/TripCalendarBuilderTest.java +++ b/application/src/test/java/org/opentripplanner/netex/mapping/TripCalendarBuilderTest.java @@ -18,7 +18,7 @@ import java.util.Set; import java.util.stream.Collectors; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.calendar.ServiceCalendarDate; import org.opentripplanner.netex.index.hierarchy.HierarchicalMapById; diff --git a/application/src/test/java/org/opentripplanner/netex/mapping/TripMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/TripMapperTest.java index 3e045ae3ff8..38fefb9d652 100644 --- a/application/src/test/java/org/opentripplanner/netex/mapping/TripMapperTest.java +++ b/application/src/test/java/org/opentripplanner/netex/mapping/TripMapperTest.java @@ -10,8 +10,8 @@ import java.util.List; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.graph_builder.issue.api.DataImportIssue; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; diff --git a/application/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java index 105bbe47096..2c84b88e7f2 100644 --- a/application/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java +++ b/application/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java @@ -10,7 +10,7 @@ import java.util.Map; import java.util.Optional; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.netex.index.hierarchy.HierarchicalMap; diff --git a/application/src/test/java/org/opentripplanner/netex/mapping/calendar/CalendarServiceBuilderTest.java b/application/src/test/java/org/opentripplanner/netex/mapping/calendar/CalendarServiceBuilderTest.java index 48a4e9537c1..7dc3c4a220d 100644 --- a/application/src/test/java/org/opentripplanner/netex/mapping/calendar/CalendarServiceBuilderTest.java +++ b/application/src/test/java/org/opentripplanner/netex/mapping/calendar/CalendarServiceBuilderTest.java @@ -8,7 +8,7 @@ import java.util.Collection; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.model.calendar.ServiceCalendarDate; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; diff --git a/application/src/test/java/org/opentripplanner/osm/model/OsmEntityTest.java b/application/src/test/java/org/opentripplanner/osm/model/OsmEntityTest.java index 5d9aee453c0..7a583b61652 100644 --- a/application/src/test/java/org/opentripplanner/osm/model/OsmEntityTest.java +++ b/application/src/test/java/org/opentripplanner/osm/model/OsmEntityTest.java @@ -21,7 +21,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.model.accessibility.Accessibility; import org.opentripplanner.osm.WayTestData; public class OsmEntityTest { diff --git a/application/src/test/java/org/opentripplanner/place/nearbystopfinder/NearbyStopFinderVisitorTest.java b/application/src/test/java/org/opentripplanner/place/nearbystopfinder/NearbyStopFinderVisitorTest.java index 40ac894bec8..fdeb4a7dd43 100644 --- a/application/src/test/java/org/opentripplanner/place/nearbystopfinder/NearbyStopFinderVisitorTest.java +++ b/application/src/test/java/org/opentripplanner/place/nearbystopfinder/NearbyStopFinderVisitorTest.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.place.api.NearbyStop; import org.opentripplanner.street.model.StreetModelForTest; diff --git a/application/src/test/java/org/opentripplanner/place/placefinder/PlaceFinderTraverseVisitorTest.java b/application/src/test/java/org/opentripplanner/place/placefinder/PlaceFinderTraverseVisitorTest.java index f5e433b5c91..43e8a5c440d 100644 --- a/application/src/test/java/org/opentripplanner/place/placefinder/PlaceFinderTraverseVisitorTest.java +++ b/application/src/test/java/org/opentripplanner/place/placefinder/PlaceFinderTraverseVisitorTest.java @@ -10,7 +10,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.model.StopTime; import org.opentripplanner.place.api.PlaceAtDistance; import org.opentripplanner.place.api.PlaceType; diff --git a/application/src/test/java/org/opentripplanner/raptorlegacy/_data/transit/TestAccessEgress.java b/application/src/test/java/org/opentripplanner/raptorlegacy/_data/transit/TestAccessEgress.java index 230dc2132b1..0ab2428d030 100644 --- a/application/src/test/java/org/opentripplanner/raptorlegacy/_data/transit/TestAccessEgress.java +++ b/application/src/test/java/org/opentripplanner/raptorlegacy/_data/transit/TestAccessEgress.java @@ -3,7 +3,7 @@ import static org.opentripplanner.raptor.spi.RaptorCostConverter.toRaptorCost; import org.opentripplanner._support.geometry.Coordinates; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; diff --git a/application/src/test/java/org/opentripplanner/raptorlegacy/_data/transit/TestTripSchedule.java b/application/src/test/java/org/opentripplanner/raptorlegacy/_data/transit/TestTripSchedule.java index f40def79910..00295029c25 100644 --- a/application/src/test/java/org/opentripplanner/raptorlegacy/_data/transit/TestTripSchedule.java +++ b/application/src/test/java/org/opentripplanner/raptorlegacy/_data/transit/TestTripSchedule.java @@ -1,11 +1,11 @@ package org.opentripplanner.raptorlegacy._data.transit; -import static org.opentripplanner.core.domain.model.accessibility.Accessibility.NO_INFORMATION; +import static org.opentripplanner.core.model.accessibility.Accessibility.NO_INFORMATION; import static org.opentripplanner.raptorlegacy._data.RaptorTestConstants.createDeprecatedUnsupportedFeatureException; import java.time.LocalDate; import java.util.Arrays; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.model.accessibility.Accessibility; import org.opentripplanner.raptor.spi.RaptorTripSchedule; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripSchedule; import org.opentripplanner.transit.model.network.TripPattern; diff --git a/application/src/test/java/org/opentripplanner/routing/alertpatch/AlertCalendarTest.java b/application/src/test/java/org/opentripplanner/routing/alertpatch/AlertCalendarTest.java index 163e1960685..adc0f878d7d 100644 --- a/application/src/test/java/org/opentripplanner/routing/alertpatch/AlertCalendarTest.java +++ b/application/src/test/java/org/opentripplanner/routing/alertpatch/AlertCalendarTest.java @@ -8,7 +8,7 @@ import java.time.Instant; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.time.TimePeriod; class AlertCalendarTest { diff --git a/application/src/test/java/org/opentripplanner/routing/alertpatch/EntitySelectorTest.java b/application/src/test/java/org/opentripplanner/routing/alertpatch/EntitySelectorTest.java index 0b85d5ef087..1dacf7f1f11 100644 --- a/application/src/test/java/org/opentripplanner/routing/alertpatch/EntitySelectorTest.java +++ b/application/src/test/java/org/opentripplanner/routing/alertpatch/EntitySelectorTest.java @@ -6,7 +6,7 @@ import java.time.LocalDate; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; public class EntitySelectorTest { diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/FilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/FilterTest.java index 88dd61818d3..aa711f3a5c1 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/FilterTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/FilterTest.java @@ -8,7 +8,7 @@ import java.util.List; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.request.filter.SelectRequest; import org.opentripplanner.routing.api.request.request.filter.TransitFilterRequest; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/GraphRoutingTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/GraphRoutingTest.java index b0e79fccf45..ac78902c3f4 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/GraphRoutingTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/GraphRoutingTest.java @@ -11,10 +11,10 @@ import javax.annotation.Nullable; import org.locationtech.jts.geom.Coordinate; import org.opentripplanner.TestOtpModel; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; import org.opentripplanner.service.vehicleparking.model.VehicleParking; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/TestBanning.java b/application/src/test/java/org/opentripplanner/routing/algorithm/TestBanning.java index 7a92bb51ebb..8dfbf23f8d0 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/TestBanning.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/TestBanning.java @@ -7,7 +7,7 @@ import java.util.Collection; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.api.request.request.filter.SelectRequest; import org.opentripplanner.routing.api.request.request.filter.TransitFilterRequest; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilterTest.java index 5c2bfebf167..1fb7c0d435c 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilterTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilterTest.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Place; import org.opentripplanner.routing.algorithm.filterchain.filters.system.SingleCriteriaComparator; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/DecorateTransitAlertTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/DecorateTransitAlertTest.java index eb1358d35a2..209587e3b69 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/DecorateTransitAlertTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/DecorateTransitAlertTest.java @@ -7,7 +7,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.routing.alertpatch.AlertCalendar; import org.opentripplanner.routing.alertpatch.EntitySelector; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java index 1a06dfb8042..515730ebb42 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java @@ -8,7 +8,7 @@ import java.util.List; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilterTest.java index a5de7519bff..34bcf6cdf60 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilterTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilterTest.java @@ -7,7 +7,7 @@ import java.time.Duration; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; 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 c01fb871850..49ed9146ad2 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 @@ -19,7 +19,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.FlexAccessEgress; import org.opentripplanner.ext.flex.FlexPathDurations; import org.opentripplanner.framework.application.OTPFeature; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapperTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapperTest.java index 7f2e62cd850..0053ada394a 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapperTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/StatesToWalkStepsMapperTest.java @@ -14,8 +14,8 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.astar.model.GraphPath; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.plan.walkstep.RelativeDirection; import org.opentripplanner.model.plan.walkstep.WalkStep; import org.opentripplanner.model.plan.walkstep.WalkStepBuilder; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/TransitSnapshotTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/TransitSnapshotTest.java index 43caf1a88cb..c390a03eee5 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/TransitSnapshotTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/TransitSnapshotTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.street.model.StreetMode; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/_support/mapping/FeedScopedIdMapper.java b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/_support/mapping/FeedScopedIdMapper.java index 812d1edb21a..84ab1a99473 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/_support/mapping/FeedScopedIdMapper.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/_support/mapping/FeedScopedIdMapper.java @@ -1,6 +1,6 @@ package org.opentripplanner.routing.algorithm.mapping._support.mapping; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; @Deprecated class FeedScopedIdMapper { diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/_support/mapping/LegMapper.java b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/_support/mapping/LegMapper.java index 710fd7c63cf..db8279a2d2c 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/_support/mapping/LegMapper.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/_support/mapping/LegMapper.java @@ -9,7 +9,7 @@ import java.util.Locale; import org.opentripplanner.api.model.geometry.EncodedPolyline; import org.opentripplanner.apis.gtfs.mapping.LocalDateMapper; -import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; +import org.opentripplanner.core.model.i18n.I18NStringMapper; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.model.plan.TransitLeg; import org.opentripplanner.model.plan.leg.StreetLeg; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/_support/mapping/PlaceMapper.java b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/_support/mapping/PlaceMapper.java index 1e59605c2eb..c3496427f75 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/_support/mapping/PlaceMapper.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/mapping/_support/mapping/PlaceMapper.java @@ -8,7 +8,7 @@ import java.util.Locale; import java.util.Optional; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.i18n.I18NStringMapper; +import org.opentripplanner.core.model.i18n.I18NStringMapper; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.VehicleParkingWithEntrance; import org.opentripplanner.model.plan.leg.StopArrival; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouterTest.java index 8539ca9f367..a4e5176b0de 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouterTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouterTest.java @@ -9,7 +9,7 @@ import java.util.Set; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.place.api.NearbyStop; import org.opentripplanner.routing.algorithm.GraphRoutingTest; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressesTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressesTest.java index 70870a2fd9c..29ae80e6953 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressesTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressesTest.java @@ -5,7 +5,7 @@ import java.time.Duration; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java index 4262ec24efd..c3afb21b1c4 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java @@ -7,7 +7,7 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.raptor.spi.RaptorConstants; import org.opentripplanner.raptor.spi.RaptorCostConverter; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/PatternCostCalculatorTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/PatternCostCalculatorTest.java index 880f7b4d98d..326386297cf 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/PatternCostCalculatorTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/PatternCostCalculatorTest.java @@ -15,8 +15,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.domain.model.basic.Cost; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.raptor.spi.RaptorCostCalculator; import org.opentripplanner.raptor.spi.RaptorTransferConstraint; import org.opentripplanner.raptorlegacy._data.transit.TestTransitData; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostLinearFunctionTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostLinearFunctionTest.java index 721cc048b72..eace77ffe9d 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostLinearFunctionTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/RaptorCostLinearFunctionTest.java @@ -10,7 +10,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.test.support.TestTableParser; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculatorTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculatorTest.java index 2d952eb580d..5c765db5381 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculatorTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculatorTest.java @@ -6,7 +6,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.model.accessibility.Accessibility; import org.opentripplanner.raptor.spi.RaptorCostCalculator; import org.opentripplanner.raptor.spi.RaptorCostConverter; import org.opentripplanner.raptor.spi.RaptorTransferConstraint; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/GeneralizedCostParametersMapperTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/GeneralizedCostParametersMapperTest.java index 231dd222de0..f3c60584144 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/GeneralizedCostParametersMapperTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/GeneralizedCostParametersMapperTest.java @@ -10,7 +10,7 @@ import java.util.BitSet; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.raptorlegacy._data.transit.TestRoute; import org.opentripplanner.raptorlegacy._data.transit.TestTransitData; import org.opentripplanner.raptorlegacy._data.transit.TestTripPattern; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/LookupStopIndexCallbackTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/LookupStopIndexCallbackTest.java index 73f8f3d5c37..a21f011a0bc 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/LookupStopIndexCallbackTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/LookupStopIndexCallbackTest.java @@ -8,7 +8,7 @@ import java.util.Map; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.EntityNotFoundException; class LookupStopIndexCallbackTest { diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapperTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapperTest.java index c5b4c6cc34c..3dee83eeb50 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapperTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapperTest.java @@ -14,7 +14,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.api.request.RaptorRequest; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TestLookupStopIndexCallback.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TestLookupStopIndexCallback.java index 7c8d8f89272..dc9daf2294f 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TestLookupStopIndexCallback.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TestLookupStopIndexCallback.java @@ -2,7 +2,7 @@ import java.util.Map; import java.util.stream.IntStream; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.framework.EntityNotFoundException; import org.opentripplanner.transit.model.site.StopLocation; diff --git a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilterTest.java b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilterTest.java index 390b94fe38a..ed91a537ff7 100644 --- a/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilterTest.java +++ b/application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/DefaultTransitDataProviderFilterTest.java @@ -18,8 +18,8 @@ import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.ValueSource; import org.opentripplanner.apis.transmodel.model.TransmodelTransportSubmode; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.model.PickDrop; 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 6617c0c3569..0d383e65733 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 @@ -14,7 +14,7 @@ import java.util.Map; import org.junit.jupiter.api.Test; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.StopTime; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitData; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripPatternForDate; 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 8cc8f497cfb..6ae35a125fc 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 @@ -11,7 +11,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.model.StopTime; import org.opentripplanner.raptor.spi.RaptorTimeTable; diff --git a/application/src/test/java/org/opentripplanner/routing/api/DefaultRoutingServiceTest.java b/application/src/test/java/org/opentripplanner/routing/api/DefaultRoutingServiceTest.java index b249d7186d3..f1726032ca3 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/DefaultRoutingServiceTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/DefaultRoutingServiceTest.java @@ -10,7 +10,7 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Envelope; import org.opentripplanner.GtfsTest; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.SphericalDistanceLibrary; import org.opentripplanner.street.model.vertex.TransitStopVertex; import org.opentripplanner.street.model.vertex.Vertex; diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/TripLocationTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/TripLocationTest.java index bfe13dbb65e..c40815ba070 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/TripLocationTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/TripLocationTest.java @@ -7,7 +7,7 @@ import java.time.Instant; import java.time.LocalDate; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; class TripLocationTest { diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/TripOnDateReferenceTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/TripOnDateReferenceTest.java index 3c3df140318..683c3a8ab49 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/TripOnDateReferenceTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/TripOnDateReferenceTest.java @@ -5,7 +5,7 @@ import java.time.LocalDate; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; class TripOnDateReferenceTest { 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 a6993b4cb11..5d6329a9aec 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 @@ -12,7 +12,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.test.support.TestTableParser; import org.opentripplanner.utils.time.DurationUtils; 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 06e80441b7f..0536d1ba654 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 @@ -6,7 +6,7 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.utils.time.DurationUtils; diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java index 5eaafd874bb..97a4e944c85 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java @@ -6,7 +6,7 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; class CarPreferencesTest { diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/preference/DirectTransitPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/DirectTransitPreferencesTest.java index 09af7c6ea61..52a7a1d324e 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/preference/DirectTransitPreferencesTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/preference/DirectTransitPreferencesTest.java @@ -8,7 +8,7 @@ import java.time.Duration; import java.util.Optional; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.core.testfixtures.lang.AssertEqualsAndHashCode; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/preference/TransitPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/TransitPreferencesTest.java index 84092672fbd..3f23940624a 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/preference/TransitPreferencesTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/preference/TransitPreferencesTest.java @@ -9,7 +9,7 @@ import java.time.Duration; import java.util.Map; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.raptor.spi.SearchDirection; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.transit.model.basic.TransitMode; diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferencesTest.java index a8aa3c733e3..b4fc468ea15 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferencesTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferencesTest.java @@ -6,7 +6,7 @@ import java.time.Duration; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; class VehicleParkingPreferencesTest { diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferencesTest.java index a4efaa2f7de..4b7282492fd 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferencesTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferencesTest.java @@ -7,7 +7,7 @@ import java.time.Duration; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; class VehicleRentalPreferencesTest { diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferencesTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferencesTest.java index 095cdb3411f..ebc84a54af7 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferencesTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferencesTest.java @@ -5,7 +5,7 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; class VehicleWalkingPreferencesTest { diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/request/JourneyRequestTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/request/JourneyRequestTest.java index 62b13bc74aa..5d91f2bb7f9 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/request/JourneyRequestTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/request/JourneyRequestTest.java @@ -5,7 +5,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.testfixtures.lang.AssertEqualsAndHashCode; import org.opentripplanner.routing.api.request.RequestModes; import org.opentripplanner.routing.api.request.request.filter.SelectRequest; diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/request/TransitRequestTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/request/TransitRequestTest.java index 2667d82687f..004279f280e 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/request/TransitRequestTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/request/TransitRequestTest.java @@ -7,7 +7,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.testfixtures.lang.AssertEqualsAndHashCode; import org.opentripplanner.routing.api.request.DebugRaptor; import org.opentripplanner.routing.api.request.request.filter.SelectRequest; diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/request/filter/TransitGroupSelectTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/request/filter/TransitGroupSelectTest.java index 26ae3dcaf4b..69111abdb37 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/request/filter/TransitGroupSelectTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/request/filter/TransitGroupSelectTest.java @@ -4,7 +4,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.basic.TransitMode; class TransitGroupSelectTest { diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/via/PassThroughViaLocationTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/via/PassThroughViaLocationTest.java index 4bcb0c5a371..b98a6a9d53d 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/via/PassThroughViaLocationTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/via/PassThroughViaLocationTest.java @@ -6,7 +6,7 @@ import java.time.Duration; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.testfixtures.lang.AssertEqualsAndHashCode; class PassThroughViaLocationTest { diff --git a/application/src/test/java/org/opentripplanner/routing/api/request/via/VisitViaLocationTest.java b/application/src/test/java/org/opentripplanner/routing/api/request/via/VisitViaLocationTest.java index e8a0419ddc5..8ec46f13695 100644 --- a/application/src/test/java/org/opentripplanner/routing/api/request/via/VisitViaLocationTest.java +++ b/application/src/test/java/org/opentripplanner/routing/api/request/via/VisitViaLocationTest.java @@ -6,7 +6,7 @@ import java.time.Duration; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.testfixtures.lang.AssertEqualsAndHashCode; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/application/src/test/java/org/opentripplanner/routing/core/DistanceTest.java b/application/src/test/java/org/opentripplanner/routing/core/DistanceTest.java index 42738577d7d..e5caca62c2f 100644 --- a/application/src/test/java/org/opentripplanner/routing/core/DistanceTest.java +++ b/application/src/test/java/org/opentripplanner/routing/core/DistanceTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Distance; +import org.opentripplanner.core.model.basic.Distance; public class DistanceTest { diff --git a/application/src/test/java/org/opentripplanner/routing/core/RatioTest.java b/application/src/test/java/org/opentripplanner/routing/core/RatioTest.java index 65518a0dcd4..b34c6aebd1c 100644 --- a/application/src/test/java/org/opentripplanner/routing/core/RatioTest.java +++ b/application/src/test/java/org/opentripplanner/routing/core/RatioTest.java @@ -6,7 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Ratio; +import org.opentripplanner.core.model.basic.Ratio; public class RatioTest { diff --git a/application/src/test/java/org/opentripplanner/routing/core/RouteRequestTest.java b/application/src/test/java/org/opentripplanner/routing/core/RouteRequestTest.java index ba1f778679d..3c074238dfd 100644 --- a/application/src/test/java/org/opentripplanner/routing/core/RouteRequestTest.java +++ b/application/src/test/java/org/opentripplanner/routing/core/RouteRequestTest.java @@ -15,7 +15,7 @@ import java.time.ZoneOffset; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.testfixtures.lang.AssertEqualsAndHashCode; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.model.plan.SortOrder; diff --git a/application/src/test/java/org/opentripplanner/routing/graph/GraphSerializationTest.java b/application/src/test/java/org/opentripplanner/routing/graph/GraphSerializationTest.java index 048ac065d9f..409bc9eeab2 100644 --- a/application/src/test/java/org/opentripplanner/routing/graph/GraphSerializationTest.java +++ b/application/src/test/java/org/opentripplanner/routing/graph/GraphSerializationTest.java @@ -22,7 +22,7 @@ import org.locationtech.jts.geom.Polygon; import org.opentripplanner.ConstantsForTests; import org.opentripplanner.TestOtpModel; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.datastore.api.FileType; import org.opentripplanner.datastore.file.FileDataSource; import org.opentripplanner.ext.emission.EmissionRepository; diff --git a/application/src/test/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImplTest.java b/application/src/test/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImplTest.java index 0e26eb0f010..0e98b754b8a 100644 --- a/application/src/test/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImplTest.java +++ b/application/src/test/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImplTest.java @@ -4,7 +4,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.alertpatch.EntitySelector; import org.opentripplanner.routing.alertpatch.TransitAlert; diff --git a/application/src/test/java/org/opentripplanner/routing/impl/TransitAlertServiceImplTest.java b/application/src/test/java/org/opentripplanner/routing/impl/TransitAlertServiceImplTest.java index 426db838009..49f817136bb 100644 --- a/application/src/test/java/org/opentripplanner/routing/impl/TransitAlertServiceImplTest.java +++ b/application/src/test/java/org/opentripplanner/routing/impl/TransitAlertServiceImplTest.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.alertpatch.AlertCause; import org.opentripplanner.routing.alertpatch.EntitySelector; import org.opentripplanner.routing.alertpatch.TransitAlert; diff --git a/application/src/test/java/org/opentripplanner/routing/linking/LinkingContextFactoryTest.java b/application/src/test/java/org/opentripplanner/routing/linking/LinkingContextFactoryTest.java index e1201a87621..51d34090d48 100644 --- a/application/src/test/java/org/opentripplanner/routing/linking/LinkingContextFactoryTest.java +++ b/application/src/test/java/org/opentripplanner/routing/linking/LinkingContextFactoryTest.java @@ -17,7 +17,7 @@ import java.util.Set; import java.util.stream.Collectors; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.routing.api.response.InputField; import org.opentripplanner.routing.api.response.RoutingErrorCode; diff --git a/application/src/test/java/org/opentripplanner/routing/stoptimes/AlternativeLegsTest.java b/application/src/test/java/org/opentripplanner/routing/stoptimes/AlternativeLegsTest.java index 051282373fc..94283a495db 100644 --- a/application/src/test/java/org/opentripplanner/routing/stoptimes/AlternativeLegsTest.java +++ b/application/src/test/java/org/opentripplanner/routing/stoptimes/AlternativeLegsTest.java @@ -6,8 +6,8 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.opentripplanner.GtfsTest; -import org.opentripplanner.core.domain.model.basic.Cost; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.model.plan.leg.ScheduledTransitLeg; diff --git a/application/src/test/java/org/opentripplanner/routing/trippattern/FrequencyEntryTest.java b/application/src/test/java/org/opentripplanner/routing/trippattern/FrequencyEntryTest.java index e50ebed71cc..4ed6c3aa6ed 100644 --- a/application/src/test/java/org/opentripplanner/routing/trippattern/FrequencyEntryTest.java +++ b/application/src/test/java/org/opentripplanner/routing/trippattern/FrequencyEntryTest.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.model.Frequency; import org.opentripplanner.model.StopTime; diff --git a/application/src/test/java/org/opentripplanner/service/realtimevehicles/internal/DefaultRealtimeVehicleRepositoryTest.java b/application/src/test/java/org/opentripplanner/service/realtimevehicles/internal/DefaultRealtimeVehicleRepositoryTest.java index 9887a1c3709..d0de3aead02 100644 --- a/application/src/test/java/org/opentripplanner/service/realtimevehicles/internal/DefaultRealtimeVehicleRepositoryTest.java +++ b/application/src/test/java/org/opentripplanner/service/realtimevehicles/internal/DefaultRealtimeVehicleRepositoryTest.java @@ -8,7 +8,7 @@ import java.time.Instant; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.realtimevehicles.model.RealtimeVehicle; import org.opentripplanner.transit.model.TransitTestEnvironment; import org.opentripplanner.transit.model.TripInput; diff --git a/application/src/test/java/org/opentripplanner/service/vehicleparking/VehicleParkingTestUtil.java b/application/src/test/java/org/opentripplanner/service/vehicleparking/VehicleParkingTestUtil.java index 37c514a089e..7c53c92c6fd 100644 --- a/application/src/test/java/org/opentripplanner/service/vehicleparking/VehicleParkingTestUtil.java +++ b/application/src/test/java/org/opentripplanner/service/vehicleparking/VehicleParkingTestUtil.java @@ -1,7 +1,7 @@ package org.opentripplanner.service.vehicleparking; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehicleparking.model.VehicleParkingSpaces; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/application/src/test/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java b/application/src/test/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java index 5f62d100ad2..fa9596eda0c 100644 --- a/application/src/test/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java +++ b/application/src/test/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java @@ -7,11 +7,11 @@ import java.time.OffsetDateTime; import java.time.ZoneOffset; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.basic.Distance; -import org.opentripplanner.core.domain.model.basic.Ratio; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.basic.Distance; +import org.opentripplanner.core.model.basic.Ratio; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.model.RentalFormFactor; public class TestFreeFloatingRentalVehicleBuilder { diff --git a/application/src/test/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java b/application/src/test/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java index b52e427cae5..4ce982c1e22 100644 --- a/application/src/test/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java +++ b/application/src/test/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java @@ -2,9 +2,9 @@ import java.util.HashMap; import java.util.Map; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.model.RentalFormFactor; public class TestVehicleRentalStationBuilder { diff --git a/application/src/test/java/org/opentripplanner/standalone/config/framework/json/EnumMapperTest.java b/application/src/test/java/org/opentripplanner/standalone/config/framework/json/EnumMapperTest.java index db113788704..b2bfb5ee735 100644 --- a/application/src/test/java/org/opentripplanner/standalone/config/framework/json/EnumMapperTest.java +++ b/application/src/test/java/org/opentripplanner/standalone/config/framework/json/EnumMapperTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.doc.DocumentedEnum; +import org.opentripplanner.core.model.doc.DocumentedEnum; class EnumMapperTest { diff --git a/application/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java b/application/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java index 3e94f0b6e9b..41e1874343a 100644 --- a/application/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java +++ b/application/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java @@ -25,7 +25,7 @@ import java.util.Set; import org.junit.jupiter.api.Test; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.framework.application.OtpAppException; import org.opentripplanner.framework.model.Gram; diff --git a/application/src/test/java/org/opentripplanner/standalone/server/AlertMetricsTest.java b/application/src/test/java/org/opentripplanner/standalone/server/AlertMetricsTest.java index a1ed7323645..b387e50b1a0 100644 --- a/application/src/test/java/org/opentripplanner/standalone/server/AlertMetricsTest.java +++ b/application/src/test/java/org/opentripplanner/standalone/server/AlertMetricsTest.java @@ -8,7 +8,7 @@ import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.routing.alertpatch.EntitySelector; import org.opentripplanner.routing.alertpatch.TransitAlert; import org.opentripplanner.routing.alertpatch.TransitAlertBuilder; diff --git a/application/src/test/java/org/opentripplanner/street/integration/EdgeSplittingTest.java b/application/src/test/java/org/opentripplanner/street/integration/EdgeSplittingTest.java index 1a3c7796369..63ec174dcf3 100644 --- a/application/src/test/java/org/opentripplanner/street/integration/EdgeSplittingTest.java +++ b/application/src/test/java/org/opentripplanner/street/integration/EdgeSplittingTest.java @@ -14,7 +14,7 @@ import org.locationtech.jts.linearref.LinearLocation; import org.opentripplanner.astar.model.GraphPath; import org.opentripplanner.astar.model.ShortestPathTree; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.linking.LinkingContextFactory; diff --git a/application/src/test/java/org/opentripplanner/streetadapter/StreetSearchRequestMapperTest.java b/application/src/test/java/org/opentripplanner/streetadapter/StreetSearchRequestMapperTest.java index 4f977556dcc..9b5ca0d743a 100644 --- a/application/src/test/java/org/opentripplanner/streetadapter/StreetSearchRequestMapperTest.java +++ b/application/src/test/java/org/opentripplanner/streetadapter/StreetSearchRequestMapperTest.java @@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.opentripplanner.core.domain.model.basic.Cost.costOfSeconds; +import static org.opentripplanner.core.model.basic.Cost.costOfSeconds; import static org.opentripplanner.core.model.id.FeedScopedIdForTestFactory.id; import java.time.Duration; @@ -14,8 +14,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import org.opentripplanner.core.domain.model.basic.Cost; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.routing.api.request.RequestModes; diff --git a/application/src/test/java/org/opentripplanner/transfer/constrained/raptoradaptor/ConstrainedBoardingSearchTest.java b/application/src/test/java/org/opentripplanner/transfer/constrained/raptoradaptor/ConstrainedBoardingSearchTest.java index b252ba51847..bbe54de6c81 100644 --- a/application/src/test/java/org/opentripplanner/transfer/constrained/raptoradaptor/ConstrainedBoardingSearchTest.java +++ b/application/src/test/java/org/opentripplanner/transfer/constrained/raptoradaptor/ConstrainedBoardingSearchTest.java @@ -15,7 +15,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.raptor.spi.RaptorBoardOrAlightEvent; diff --git a/application/src/test/java/org/opentripplanner/transfer/constrained/raptoradaptor/TransferIndexGeneratorTest.java b/application/src/test/java/org/opentripplanner/transfer/constrained/raptoradaptor/TransferIndexGeneratorTest.java index f30b499cd36..384f09497db 100644 --- a/application/src/test/java/org/opentripplanner/transfer/constrained/raptoradaptor/TransferIndexGeneratorTest.java +++ b/application/src/test/java/org/opentripplanner/transfer/constrained/raptoradaptor/TransferIndexGeneratorTest.java @@ -11,7 +11,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.algorithm.raptoradapter.transit.request.TestRouteData; import org.opentripplanner.transfer.constrained.model.ConstrainedTransfer; import org.opentripplanner.transfer.constrained.model.StopTransferPoint; diff --git a/application/src/test/java/org/opentripplanner/transfer/regular/index/RaptorTransferIndexTest.java b/application/src/test/java/org/opentripplanner/transfer/regular/index/RaptorTransferIndexTest.java index 8530fa35c92..dd3da020ba5 100644 --- a/application/src/test/java/org/opentripplanner/transfer/regular/index/RaptorTransferIndexTest.java +++ b/application/src/test/java/org/opentripplanner/transfer/regular/index/RaptorTransferIndexTest.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.function.Consumer; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.model.StreetMode; import org.opentripplanner.street.search.request.StreetSearchRequest; import org.opentripplanner.transfer.regular.model.DefaultRaptorTransfer; diff --git a/application/src/test/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequestBuilderTest.java b/application/src/test/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequestBuilderTest.java index fd9028b3107..992fb2ee9d2 100644 --- a/application/src/test/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequestBuilderTest.java +++ b/application/src/test/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequestBuilderTest.java @@ -12,8 +12,8 @@ import java.time.LocalDate; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.LocalDateRange; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.filter.selector.FilterRequest; diff --git a/application/src/test/java/org/opentripplanner/transit/model/_data/PatternTestModel.java b/application/src/test/java/org/opentripplanner/transit/model/_data/PatternTestModel.java index d0a571413b7..1b07570b302 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/_data/PatternTestModel.java +++ b/application/src/test/java/org/opentripplanner/transit/model/_data/PatternTestModel.java @@ -2,7 +2,7 @@ import static org.opentripplanner.core.model.id.FeedScopedIdForTestFactory.id; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.network.StopPattern; import org.opentripplanner.transit.model.network.TripPattern; diff --git a/application/src/test/java/org/opentripplanner/transit/model/_data/TransitRepositoryForTest.java b/application/src/test/java/org/opentripplanner/transit/model/_data/TransitRepositoryForTest.java index b4238cfa516..8a4a6586b7c 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/_data/TransitRepositoryForTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/_data/TransitRepositoryForTest.java @@ -12,9 +12,9 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Polygon; import org.opentripplanner._support.geometry.Coordinates; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.flex.trip.ScheduledDeviatedTrip; import org.opentripplanner.ext.flex.trip.UnscheduledTrip; import org.opentripplanner.model.PickDrop; diff --git a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/RegularStopMatcherFactoryTest.java b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/RegularStopMatcherFactoryTest.java index cbc11ec1bc2..71728cc1687 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/RegularStopMatcherFactoryTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/RegularStopMatcherFactoryTest.java @@ -6,7 +6,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.site.RegularStop; class RegularStopMatcherFactoryTest { diff --git a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/RouteMatcherFactoryTest.java b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/RouteMatcherFactoryTest.java index 9645b9001ac..aae8c242e51 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/RouteMatcherFactoryTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/RouteMatcherFactoryTest.java @@ -7,8 +7,8 @@ import java.util.Set; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.api.model.FilterValues; import org.opentripplanner.transit.api.request.FindRoutesRequest; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/StopLocationMatcherFactoryTest.java b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/StopLocationMatcherFactoryTest.java index 6fe91888d34..a1506714570 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/StopLocationMatcherFactoryTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/StopLocationMatcherFactoryTest.java @@ -6,8 +6,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.api.request.FindStopLocationsRequest; import org.opentripplanner.transit.model.filter.expr.Matcher; import org.opentripplanner.transit.model.site.RegularStop; diff --git a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TransitAlertMatcherFactoryTest.java b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TransitAlertMatcherFactoryTest.java index dfbb27eb7b0..ad9373056fd 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TransitAlertMatcherFactoryTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TransitAlertMatcherFactoryTest.java @@ -9,8 +9,8 @@ import java.util.function.UnaryOperator; import javax.annotation.Nullable; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.routing.alertpatch.AlertCalendar; import org.opentripplanner.routing.alertpatch.AlertCause; import org.opentripplanner.routing.alertpatch.AlertEffect; diff --git a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripMatcherFactoryTest.java b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripMatcherFactoryTest.java index 2750362e31e..dfbd06d9675 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripMatcherFactoryTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripMatcherFactoryTest.java @@ -9,7 +9,7 @@ import java.util.Set; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.api.request.TripRequest; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.filter.expr.Matcher; diff --git a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactoryTest.java b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactoryTest.java index 9e25348da9a..44f9abc4e4b 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactoryTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripOnServiceDateMatcherFactoryTest.java @@ -12,8 +12,8 @@ import java.util.function.Function; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.time.LocalDateRange; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.time.LocalDateRange; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.transit.api.model.FilterValues; import org.opentripplanner.transit.api.request.TripOnServiceDateRequest; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripTimeOnDateMatcherFactoryTest.java b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripTimeOnDateMatcherFactoryTest.java index a5928e29da1..729d16ac123 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripTimeOnDateMatcherFactoryTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/filter/transit/TripTimeOnDateMatcherFactoryTest.java @@ -11,7 +11,7 @@ import java.util.List; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.transit.api.request.CancellationPolicy; import org.opentripplanner.transit.api.request.TripTimeOnDateRequest; diff --git a/application/src/test/java/org/opentripplanner/transit/model/framework/EntityByIdTest.java b/application/src/test/java/org/opentripplanner/transit/model/framework/EntityByIdTest.java index a0e100f34b3..be23c13f591 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/framework/EntityByIdTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/framework/EntityByIdTest.java @@ -6,7 +6,7 @@ import java.util.Collections; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; public class EntityByIdTest { diff --git a/application/src/test/java/org/opentripplanner/transit/model/framework/EntityNotFoundExceptionTest.java b/application/src/test/java/org/opentripplanner/transit/model/framework/EntityNotFoundExceptionTest.java index f16ab1580d1..3ca020a3151 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/framework/EntityNotFoundExceptionTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/framework/EntityNotFoundExceptionTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; class EntityNotFoundExceptionTest { diff --git a/application/src/test/java/org/opentripplanner/transit/model/network/RouteTest.java b/application/src/test/java/org/opentripplanner/transit/model/network/RouteTest.java index 1186590f89c..c683084280b 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/network/RouteTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/network/RouteTest.java @@ -7,8 +7,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.basic.SubMode; diff --git a/application/src/test/java/org/opentripplanner/transit/model/network/grouppriority/MatchersTest.java b/application/src/test/java/org/opentripplanner/transit/model/network/grouppriority/MatchersTest.java index 838860b0f77..5e031e3f55c 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/network/grouppriority/MatchersTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/network/grouppriority/MatchersTest.java @@ -6,7 +6,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.algorithm.raptoradapter.transit.request.TestRouteData; import org.opentripplanner.routing.api.request.request.filter.TransitGroupSelect; import org.opentripplanner.transit.model.basic.TransitMode; diff --git a/application/src/test/java/org/opentripplanner/transit/model/site/AreaStopTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/AreaStopTest.java index b4d8244200b..b13b0a191c7 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/site/AreaStopTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/site/AreaStopTest.java @@ -9,8 +9,8 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Geometry; import org.opentripplanner._support.geometry.Polygons; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/application/src/test/java/org/opentripplanner/transit/model/site/BoardingAreaTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/BoardingAreaTest.java index 3938da68bc0..8aa5022ff26 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/site/BoardingAreaTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/site/BoardingAreaTest.java @@ -7,8 +7,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/test/java/org/opentripplanner/transit/model/site/EntranceTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/EntranceTest.java index 3cb086961f6..1d0bb8f1054 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/site/EntranceTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/site/EntranceTest.java @@ -7,9 +7,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/test/java/org/opentripplanner/transit/model/site/GroupOfStationsTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/GroupOfStationsTest.java index 6a0b5254896..36b421c3b22 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/site/GroupOfStationsTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/site/GroupOfStationsTest.java @@ -7,8 +7,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/test/java/org/opentripplanner/transit/model/site/GroupStopTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/GroupStopTest.java index 9c9b2e5b355..81f4b2d1f17 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/site/GroupStopTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/site/GroupStopTest.java @@ -12,8 +12,8 @@ import org.locationtech.jts.geom.Geometry; import org.opentripplanner._support.geometry.Coordinates; import org.opentripplanner._support.geometry.Polygons; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.service.SiteRepository; diff --git a/application/src/test/java/org/opentripplanner/transit/model/site/MultiModalStationTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/MultiModalStationTest.java index 7e6e2749df9..e6b620eef97 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/site/MultiModalStationTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/site/MultiModalStationTest.java @@ -8,8 +8,8 @@ import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/test/java/org/opentripplanner/transit/model/site/PathwayNodeTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/PathwayNodeTest.java index dc68a790c3b..379be6a7c87 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/site/PathwayNodeTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/site/PathwayNodeTest.java @@ -7,9 +7,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/test/java/org/opentripplanner/transit/model/site/RegularStopTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/RegularStopTest.java index b4f9cbd0e7b..dd777a5c9de 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/site/RegularStopTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/site/RegularStopTest.java @@ -9,10 +9,10 @@ import java.time.ZoneId; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/test/java/org/opentripplanner/transit/model/site/StationTest.java b/application/src/test/java/org/opentripplanner/transit/model/site/StationTest.java index 0d5af537cec..033f2da2bc9 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/site/StationTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/site/StationTest.java @@ -8,8 +8,8 @@ import java.time.ZoneId; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; diff --git a/application/src/test/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimesTest.java b/application/src/test/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimesTest.java index bd789529841..4d0ba9aa080 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimesTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimesTest.java @@ -13,9 +13,9 @@ import java.util.List; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.StopTime; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.framework.DataValidationException; 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 7aaf9d00dd3..fe9a12d2523 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,8 +10,8 @@ import java.util.BitSet; import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.framework.DataValidationException; import org.opentripplanner.utils.time.TimeUtils; diff --git a/application/src/test/java/org/opentripplanner/transit/model/timetable/TripTest.java b/application/src/test/java/org/opentripplanner/transit/model/timetable/TripTest.java index 2bc41452c69..093dee04550 100644 --- a/application/src/test/java/org/opentripplanner/transit/model/timetable/TripTest.java +++ b/application/src/test/java/org/opentripplanner/transit/model/timetable/TripTest.java @@ -5,9 +5,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.basic.SubMode; diff --git a/application/src/test/java/org/opentripplanner/transit/repository/DefaultTimetableRepositoryTest.java b/application/src/test/java/org/opentripplanner/transit/repository/DefaultTimetableRepositoryTest.java index 350a179873c..27c6f330e73 100644 --- a/application/src/test/java/org/opentripplanner/transit/repository/DefaultTimetableRepositoryTest.java +++ b/application/src/test/java/org/opentripplanner/transit/repository/DefaultTimetableRepositoryTest.java @@ -23,7 +23,7 @@ import org.opentripplanner.ConstantsForTests; import org.opentripplanner.TestOtpModel; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.StopTime; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitDataTestFactory; import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.TimetableUpdateMapper; diff --git a/application/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java b/application/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java index f7bb4fec1c8..551238dd389 100644 --- a/application/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java +++ b/application/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java @@ -22,9 +22,9 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Envelope; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.model.calendar.CalendarServiceData; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitDataTestFactory; diff --git a/application/src/test/java/org/opentripplanner/transit/service/PatternByServiceDatesFilterTest.java b/application/src/test/java/org/opentripplanner/transit/service/PatternByServiceDatesFilterTest.java index fad0d9bc341..079c972288a 100644 --- a/application/src/test/java/org/opentripplanner/transit/service/PatternByServiceDatesFilterTest.java +++ b/application/src/test/java/org/opentripplanner/transit/service/PatternByServiceDatesFilterTest.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.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.model.time.LocalDateRange; import org.opentripplanner.transit.model._data.PatternTestModel; import org.opentripplanner.transit.model.network.TripPattern; diff --git a/application/src/test/java/org/opentripplanner/transit/service/SiteRepositoryTest.java b/application/src/test/java/org/opentripplanner/transit/service/SiteRepositoryTest.java index 4638c98ec60..19997c3be38 100644 --- a/application/src/test/java/org/opentripplanner/transit/service/SiteRepositoryTest.java +++ b/application/src/test/java/org/opentripplanner/transit/service/SiteRepositoryTest.java @@ -8,8 +8,8 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/application/src/test/java/org/opentripplanner/transit/service/StopTimesHelperTest.java b/application/src/test/java/org/opentripplanner/transit/service/StopTimesHelperTest.java index 105e8dd622e..adb32100742 100644 --- a/application/src/test/java/org/opentripplanner/transit/service/StopTimesHelperTest.java +++ b/application/src/test/java/org/opentripplanner/transit/service/StopTimesHelperTest.java @@ -13,7 +13,7 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.ConstantsForTests; import org.opentripplanner.TestOtpModel; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.StopTimesInPattern; import org.opentripplanner.model.TripTimeOnDate; import org.opentripplanner.transit.api.request.CancellationPolicy; diff --git a/application/src/test/java/org/opentripplanner/transit/service/TransitRepositoryTest.java b/application/src/test/java/org/opentripplanner/transit/service/TransitRepositoryTest.java index 7a1b870c8ac..a9d42283cd1 100644 --- a/application/src/test/java/org/opentripplanner/transit/service/TransitRepositoryTest.java +++ b/application/src/test/java/org/opentripplanner/transit/service/TransitRepositoryTest.java @@ -13,7 +13,7 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.ConstantsForTests; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.ext.fares.service.gtfs.v1.GtfsFareServiceFactory; import org.opentripplanner.graph_builder.module.TimeZoneAdjusterModule; import org.opentripplanner.street.graph.Graph; diff --git a/application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java b/application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java index bacbe3d88d8..0b591c74086 100644 --- a/application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java +++ b/application/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java @@ -11,9 +11,9 @@ import java.util.List; import java.util.Map; import java.util.function.Predicate; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; import org.opentripplanner.core.framework.transaction.internal.TransactionFactory; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.transaction.RepositoryHandle; import org.opentripplanner.framework.application.OtpAppException; import org.opentripplanner.framework.transaction.TimetableSnapshotParameters; import org.opentripplanner.gbfs.network.GbfsNetworkOverrides; diff --git a/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/io/TestCaseDefinitionCsvFile.java b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/io/TestCaseDefinitionCsvFile.java index 5a9e46d3635..19935ee5645 100644 --- a/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/io/TestCaseDefinitionCsvFile.java +++ b/application/src/test/java/org/opentripplanner/transit/speed_test/model/testcase/io/TestCaseDefinitionCsvFile.java @@ -5,7 +5,7 @@ import java.util.List; import javax.annotation.Nullable; import org.opentripplanner.api.parameter.QualifiedModeSet; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.routing.api.request.via.VisitViaLocation; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/application/src/test/java/org/opentripplanner/updater/alert/gtfs/AlertsUpdateHandlerTest.java b/application/src/test/java/org/opentripplanner/updater/alert/gtfs/AlertsUpdateHandlerTest.java index ae58cda7381..e424ea57ff1 100644 --- a/application/src/test/java/org/opentripplanner/updater/alert/gtfs/AlertsUpdateHandlerTest.java +++ b/application/src/test/java/org/opentripplanner/updater/alert/gtfs/AlertsUpdateHandlerTest.java @@ -19,7 +19,7 @@ import java.util.Optional; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.TranslatedString; +import org.opentripplanner.core.model.i18n.TranslatedString; import org.opentripplanner.routing.alertpatch.AlertCause; import org.opentripplanner.routing.alertpatch.AlertEffect; import org.opentripplanner.routing.alertpatch.AlertSeverity; diff --git a/application/src/test/java/org/opentripplanner/updater/alert/siri/SiriAlertsUpdateHandlerTest.java b/application/src/test/java/org/opentripplanner/updater/alert/siri/SiriAlertsUpdateHandlerTest.java index 2c410862d40..e0389a2b472 100644 --- a/application/src/test/java/org/opentripplanner/updater/alert/siri/SiriAlertsUpdateHandlerTest.java +++ b/application/src/test/java/org/opentripplanner/updater/alert/siri/SiriAlertsUpdateHandlerTest.java @@ -22,8 +22,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.opentripplanner.GtfsTest; -import org.opentripplanner.core.domain.model.id.FeedScopedId; -import org.opentripplanner.core.domain.model.time.TimePeriod; +import org.opentripplanner.core.model.id.FeedScopedId; +import org.opentripplanner.core.model.time.TimePeriod; import org.opentripplanner.routing.alertpatch.AlertSeverity; import org.opentripplanner.routing.alertpatch.AlertUrl; import org.opentripplanner.routing.alertpatch.EntityKey; diff --git a/application/src/test/java/org/opentripplanner/updater/spi/UpdateErrorTest.java b/application/src/test/java/org/opentripplanner/updater/spi/UpdateErrorTest.java index 1fcd663fdf8..40dc8719e90 100644 --- a/application/src/test/java/org/opentripplanner/updater/spi/UpdateErrorTest.java +++ b/application/src/test/java/org/opentripplanner/updater/spi/UpdateErrorTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; class UpdateErrorTest { diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/LegacyTimetableRepositoryIntegrationTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/LegacyTimetableRepositoryIntegrationTest.java index f451ace019b..cff2fe3ea67 100644 --- a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/LegacyTimetableRepositoryIntegrationTest.java +++ b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/LegacyTimetableRepositoryIntegrationTest.java @@ -22,7 +22,7 @@ import org.opentripplanner.ConstantsForTests; import org.opentripplanner.TestOtpModel; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitDataTestFactory; import org.opentripplanner.transit.model.calendar.TripCalendars; import org.opentripplanner.transit.model.framework.Deduplicator; diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/TripTimesUpdaterTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/TripTimesUpdaterTest.java index 43adb620571..6194ab5e140 100644 --- a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/TripTimesUpdaterTest.java +++ b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/TripTimesUpdaterTest.java @@ -31,8 +31,8 @@ import org.opentripplanner.ConstantsForTests; import org.opentripplanner.TestOtpModel; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.PickDrop; import org.opentripplanner.transit.model.framework.Deduplicator; import org.opentripplanner.transit.model.network.TripPattern; diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/interpolation/NoDataBackwardsEarlinessInterpolatorTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/interpolation/NoDataBackwardsEarlinessInterpolatorTest.java index 2b3744fe902..a5a5dd8f2d7 100644 --- a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/interpolation/NoDataBackwardsEarlinessInterpolatorTest.java +++ b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/interpolation/NoDataBackwardsEarlinessInterpolatorTest.java @@ -10,7 +10,7 @@ import java.util.List; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.timetable.ScheduledTripTimes; import org.opentripplanner.transit.model.timetable.Trip; diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/AddedTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/AddedTest.java index 4998c192606..138c5e4f84b 100644 --- a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/AddedTest.java +++ b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/AddedTest.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Objects; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.model.PickDrop; import org.opentripplanner.transit.model.TransitTestEnvironment; import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder; diff --git a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/ReplacementTest.java b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/ReplacementTest.java index eb24a8e9598..1e2ba836ab5 100644 --- a/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/ReplacementTest.java +++ b/application/src/test/java/org/opentripplanner/updater/trip/gtfs/moduletests/addition/ReplacementTest.java @@ -12,7 +12,7 @@ import static org.opentripplanner.updater.spi.UpdateResultAssertions.assertFailure; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.transit.model.TransitTestEnvironment; import org.opentripplanner.transit.model.TripInput; import org.opentripplanner.updater.trip.RealtimeTestConstants; diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/AddedTripBuilderTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/AddedTripBuilderTest.java index a9bc120d525..30fec6aa885 100644 --- a/application/src/test/java/org/opentripplanner/updater/trip/siri/AddedTripBuilderTest.java +++ b/application/src/test/java/org/opentripplanner/updater/trip/siri/AddedTripBuilderTest.java @@ -19,7 +19,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.calendar.CalendarServiceData; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitDataTestFactory; diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/EntityResolverTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/EntityResolverTest.java index 8524221b52c..968547ec042 100644 --- a/application/src/test/java/org/opentripplanner/updater/trip/siri/EntityResolverTest.java +++ b/application/src/test/java/org/opentripplanner/updater/trip/siri/EntityResolverTest.java @@ -9,7 +9,7 @@ import java.util.function.UnaryOperator; import org.junit.jupiter.api.Test; import org.opentripplanner.LocalTimeParser; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model._data.TransitRepositoryForTest; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.service.DefaultTransitService; diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/ModifiedTripBuilderTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/ModifiedTripBuilderTest.java index 87c8a33f62e..6de86c8f7e3 100644 --- a/application/src/test/java/org/opentripplanner/updater/trip/siri/ModifiedTripBuilderTest.java +++ b/application/src/test/java/org/opentripplanner/updater/trip/siri/ModifiedTripBuilderTest.java @@ -14,7 +14,7 @@ import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.calendar.CalendarServiceData; diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/TimetableHelperTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/TimetableHelperTest.java index 242912e6bec..ac5cce2cb76 100644 --- a/application/src/test/java/org/opentripplanner/updater/trip/siri/TimetableHelperTest.java +++ b/application/src/test/java/org/opentripplanner/updater/trip/siri/TimetableHelperTest.java @@ -11,8 +11,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.StopTime; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.Deduplicator; diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/extrajourney/ExtraJourneyTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/extrajourney/ExtraJourneyTest.java index 044ac325da6..4b593794c81 100644 --- a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/extrajourney/ExtraJourneyTest.java +++ b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/extrajourney/ExtraJourneyTest.java @@ -11,7 +11,7 @@ import static org.opentripplanner.updater.spi.UpdateResultAssertions.assertSuccess; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.model.PickDrop; import org.opentripplanner.transit.model.TransitTestEnvironment; import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder; diff --git a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/replacement/PartialReplacementTest.java b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/replacement/PartialReplacementTest.java index 1cbffd4e6c5..95e5897df7b 100644 --- a/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/replacement/PartialReplacementTest.java +++ b/application/src/test/java/org/opentripplanner/updater/trip/siri/moduletests/replacement/PartialReplacementTest.java @@ -6,7 +6,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.transit.model.TransitTestEnvironment; import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder; import org.opentripplanner.transit.model.TripInput; diff --git a/application/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingAvailabilityUpdaterTest.java b/application/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingAvailabilityUpdaterTest.java index 1631ecc905c..c69c014e694 100644 --- a/application/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingAvailabilityUpdaterTest.java +++ b/application/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingAvailabilityUpdaterTest.java @@ -8,8 +8,8 @@ import java.util.List; import java.util.concurrent.CompletableFuture; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehicleparking.VehicleParkingRepository; import org.opentripplanner.service.vehicleparking.internal.DefaultVehicleParkingRepository; import org.opentripplanner.service.vehicleparking.model.VehicleParking; diff --git a/application/src/test/java/org/opentripplanner/updater/vehicle_position/RealtimeVehicleMatcherTest.java b/application/src/test/java/org/opentripplanner/updater/vehicle_position/RealtimeVehicleMatcherTest.java index 934f37b2d0b..574ec41cfa4 100644 --- a/application/src/test/java/org/opentripplanner/updater/vehicle_position/RealtimeVehicleMatcherTest.java +++ b/application/src/test/java/org/opentripplanner/updater/vehicle_position/RealtimeVehicleMatcherTest.java @@ -29,7 +29,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.ValueSource; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory; import org.opentripplanner.model.StopTime; import org.opentripplanner.service.realtimevehicles.RealtimeVehicleRepository; diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/configure/StreetDomain.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/configure/StreetDomain.java index 2e808e958dc..03252789742 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/configure/StreetDomain.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/configure/StreetDomain.java @@ -5,8 +5,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; -import org.opentripplanner.core.domain.framework.transaction.UpdateManager; +import org.opentripplanner.core.model.transaction.RepositoryRegistry; +import org.opentripplanner.core.model.transaction.UpdateManager; /** * Qualifies the {@link RepositoryRegistry} and diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/configure/TransitDomain.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/configure/TransitDomain.java index fd885cfb6e9..1c25717c8c3 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/configure/TransitDomain.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/configure/TransitDomain.java @@ -5,8 +5,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; -import org.opentripplanner.core.domain.framework.transaction.UpdateManager; +import org.opentripplanner.core.model.transaction.RepositoryRegistry; +import org.opentripplanner.core.model.transaction.UpdateManager; /** * Qualifies the {@link RepositoryRegistry} and diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultRepositoryHandle.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultRepositoryHandle.java index 95b922004bb..68411092797 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultRepositoryHandle.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultRepositoryHandle.java @@ -1,7 +1,7 @@ package org.opentripplanner.core.framework.transaction.internal; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; -import org.opentripplanner.core.domain.framework.transaction.api.TransactionScope; +import org.opentripplanner.core.model.transaction.RepositoryHandle; +import org.opentripplanner.core.model.transaction.TransactionScope; /** * Package-private implementation of {@link RepositoryHandle} that additionally exposes diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultRepositoryRegistry.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultRepositoryRegistry.java index 3ba63a2e878..c26710767a0 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultRepositoryRegistry.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultRepositoryRegistry.java @@ -1,10 +1,10 @@ package org.opentripplanner.core.framework.transaction.internal; -import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; -import org.opentripplanner.core.domain.framework.transaction.UpdateManager; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryLifecycle; -import org.opentripplanner.core.domain.framework.transaction.api.TransactionScope; +import org.opentripplanner.core.model.transaction.RepositoryRegistry; +import org.opentripplanner.core.model.transaction.UpdateManager; +import org.opentripplanner.core.model.transaction.RepositoryHandle; +import org.opentripplanner.core.model.transaction.RepositoryLifecycle; +import org.opentripplanner.core.model.transaction.TransactionScope; /** * Default implementation of {@link RepositoryRegistry}. diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultTransactionScope.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultTransactionScope.java index 9e82d235ce4..5172ed80e19 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultTransactionScope.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultTransactionScope.java @@ -1,8 +1,8 @@ package org.opentripplanner.core.framework.transaction.internal; import java.util.Objects; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; -import org.opentripplanner.core.domain.framework.transaction.api.TransactionScope; +import org.opentripplanner.core.model.transaction.RepositoryHandle; +import org.opentripplanner.core.model.transaction.TransactionScope; /** * Default request-scoped implementation of {@link TransactionScope}. diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultUpdateManager.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultUpdateManager.java index 3770f21c1c7..45251cde660 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultUpdateManager.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultUpdateManager.java @@ -13,11 +13,11 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.framework.event.DomainEvent; -import org.opentripplanner.core.domain.framework.event.EventHandler; -import org.opentripplanner.core.domain.framework.transaction.UpdateManager; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; -import org.opentripplanner.core.domain.framework.transaction.api.WriteContext; +import org.opentripplanner.core.model.event.DomainEvent; +import org.opentripplanner.core.model.event.EventHandler; +import org.opentripplanner.core.model.transaction.UpdateManager; +import org.opentripplanner.core.model.transaction.RepositoryHandle; +import org.opentripplanner.core.model.transaction.WriteContext; /** * Default implementation of {@link UpdateManager}. diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultWriteContext.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultWriteContext.java index eb658907822..fc632660659 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultWriteContext.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultWriteContext.java @@ -3,9 +3,9 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import org.opentripplanner.core.domain.framework.event.DomainEvent; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; -import org.opentripplanner.core.domain.framework.transaction.api.WriteContext; +import org.opentripplanner.core.model.event.DomainEvent; +import org.opentripplanner.core.model.transaction.RepositoryHandle; +import org.opentripplanner.core.model.transaction.WriteContext; /** * Task-scoped implementation of {@link WriteContext}. diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/HandlerEntry.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/HandlerEntry.java index 55ad1db2c80..a3f32b8e124 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/HandlerEntry.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/HandlerEntry.java @@ -1,8 +1,8 @@ package org.opentripplanner.core.framework.transaction.internal; -import org.opentripplanner.core.domain.framework.event.DomainEvent; -import org.opentripplanner.core.domain.framework.event.EventHandler; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; +import org.opentripplanner.core.model.event.DomainEvent; +import org.opentripplanner.core.model.event.EventHandler; +import org.opentripplanner.core.model.transaction.RepositoryHandle; /** * Pairs a {@link EventHandler} with the {@link RepositoryHandle} whose mutable snapshot it writes diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/Transaction.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/Transaction.java index 9a49379b3b2..10e83073bac 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/Transaction.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/Transaction.java @@ -2,8 +2,8 @@ import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.domain.framework.transaction.UpdateManager; -import org.opentripplanner.core.domain.framework.transaction.api.TransactionScope; +import org.opentripplanner.core.model.transaction.UpdateManager; +import org.opentripplanner.core.model.transaction.TransactionScope; /** * An opaque identity token representing a single committed state of the repository set. diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionFactory.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionFactory.java index 48c4557f3b2..4b5f1d157c8 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionFactory.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionFactory.java @@ -2,8 +2,8 @@ import java.time.Duration; import java.util.concurrent.ThreadFactory; -import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; -import org.opentripplanner.core.domain.framework.transaction.UpdateManager; +import org.opentripplanner.core.model.transaction.RepositoryRegistry; +import org.opentripplanner.core.model.transaction.UpdateManager; /** * Factory for creating instances of the transaction framework. diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionalRepository.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionalRepository.java index 760a597f4ca..1a3c7014b05 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionalRepository.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/TransactionalRepository.java @@ -2,7 +2,7 @@ import java.util.Objects; import java.util.function.Supplier; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryLifecycle; +import org.opentripplanner.core.model.transaction.RepositoryLifecycle; class TransactionalRepository { diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/TransactionFrameworkTest.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/TransactionFrameworkTest.java index 039898f3340..9973f2fb6a9 100644 --- a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/TransactionFrameworkTest.java +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/TransactionFrameworkTest.java @@ -13,11 +13,11 @@ import java.util.function.Function; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; -import org.opentripplanner.core.domain.framework.transaction.UpdateManager; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; -import org.opentripplanner.core.domain.framework.transaction.api.TransactionScope; -import org.opentripplanner.core.domain.framework.transaction.api.WriteContext; +import org.opentripplanner.core.model.transaction.RepositoryRegistry; +import org.opentripplanner.core.model.transaction.UpdateManager; +import org.opentripplanner.core.model.transaction.RepositoryHandle; +import org.opentripplanner.core.model.transaction.TransactionScope; +import org.opentripplanner.core.model.transaction.WriteContext; import org.opentripplanner.core.framework.transaction.internal.TransactionFactory; import org.opentripplanner.core.framework.transaction.moduletest.candyshop.base.Entity; import org.opentripplanner.core.framework.transaction.moduletest.candyshop.base.EntityIdProvider; diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/internal/CustomerRepositoryLifecycle.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/internal/CustomerRepositoryLifecycle.java index a1d1b57693c..daf49ab788d 100644 --- a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/internal/CustomerRepositoryLifecycle.java +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/internal/CustomerRepositoryLifecycle.java @@ -1,6 +1,6 @@ package org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.internal; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryLifecycle; +import org.opentripplanner.core.model.transaction.RepositoryLifecycle; import org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.CustomerRepository; import org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.CustomerRepositorySnapshot; diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/CustomerEventHandler.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/CustomerEventHandler.java index 92017662ed0..974dd890bb7 100644 --- a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/CustomerEventHandler.java +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/CustomerEventHandler.java @@ -1,6 +1,6 @@ package org.opentripplanner.core.framework.transaction.moduletest.candyshop.event; -import org.opentripplanner.core.domain.framework.event.EventHandler; +import org.opentripplanner.core.model.event.EventHandler; import org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.CustomerRepository; import org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.model.Customer; diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/CustomerOrderDomainEvent.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/CustomerOrderDomainEvent.java index 1d421da6b78..93f7f362aee 100644 --- a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/CustomerOrderDomainEvent.java +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/CustomerOrderDomainEvent.java @@ -1,6 +1,6 @@ package org.opentripplanner.core.framework.transaction.moduletest.candyshop.event; -import org.opentripplanner.core.domain.framework.event.DomainEvent; +import org.opentripplanner.core.model.event.DomainEvent; public record CustomerOrderDomainEvent( int orderId, diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/OrderEventHandler.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/OrderEventHandler.java index 39ec99007b6..d5417e0db75 100644 --- a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/OrderEventHandler.java +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/OrderEventHandler.java @@ -1,6 +1,6 @@ package org.opentripplanner.core.framework.transaction.moduletest.candyshop.event; -import org.opentripplanner.core.domain.framework.event.EventHandler; +import org.opentripplanner.core.model.event.EventHandler; import org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.OrderRepository; import org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.model.Order; diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/internal/OrderRepositoryLifecycle.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/internal/OrderRepositoryLifecycle.java index 4bc8c093588..9ae7e7e29fb 100644 --- a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/internal/OrderRepositoryLifecycle.java +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/internal/OrderRepositoryLifecycle.java @@ -1,6 +1,6 @@ package org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.internal; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryLifecycle; +import org.opentripplanner.core.model.transaction.RepositoryLifecycle; import org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.OrderRepository; import org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.OrderService; diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/model/accessibility/Accessibility.java b/core/model/src/main/java/org/opentripplanner/core/model/accessibility/Accessibility.java similarity index 85% rename from core/model/src/main/java/org/opentripplanner/core/domain/model/accessibility/Accessibility.java rename to core/model/src/main/java/org/opentripplanner/core/model/accessibility/Accessibility.java index 2bdf0ad5c6b..a9cc673f55d 100644 --- a/core/model/src/main/java/org/opentripplanner/core/domain/model/accessibility/Accessibility.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/accessibility/Accessibility.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.model.accessibility; +package org.opentripplanner.core.model.accessibility; /** * Use this class to describe if a feature is accessible {@code POSSIBLE}, not accessible diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/model/basic/Cost.java b/core/model/src/main/java/org/opentripplanner/core/model/basic/Cost.java similarity index 98% rename from core/model/src/main/java/org/opentripplanner/core/domain/model/basic/Cost.java rename to core/model/src/main/java/org/opentripplanner/core/model/basic/Cost.java index 762df2259a3..2908c696bbf 100644 --- a/core/model/src/main/java/org/opentripplanner/core/domain/model/basic/Cost.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/basic/Cost.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.model.basic; +package org.opentripplanner.core.model.basic; import java.io.Serializable; import java.time.Duration; diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/model/basic/Distance.java b/core/model/src/main/java/org/opentripplanner/core/model/basic/Distance.java similarity index 98% rename from core/model/src/main/java/org/opentripplanner/core/domain/model/basic/Distance.java rename to core/model/src/main/java/org/opentripplanner/core/model/basic/Distance.java index c2fcc8f889c..71a19e0c3e6 100644 --- a/core/model/src/main/java/org/opentripplanner/core/domain/model/basic/Distance.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/basic/Distance.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.model.basic; +package org.opentripplanner.core.model.basic; import java.util.Optional; import java.util.function.Consumer; diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/model/basic/NormalizedCost.java b/core/model/src/main/java/org/opentripplanner/core/model/basic/NormalizedCost.java similarity index 92% rename from core/model/src/main/java/org/opentripplanner/core/domain/model/basic/NormalizedCost.java rename to core/model/src/main/java/org/opentripplanner/core/model/basic/NormalizedCost.java index 5d686b8a8ca..05246d2e1ee 100644 --- a/core/model/src/main/java/org/opentripplanner/core/domain/model/basic/NormalizedCost.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/basic/NormalizedCost.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.model.basic; +package org.opentripplanner.core.model.basic; /// A type safe normalized representation of a cost, like generalized-cost. A cost unit is /// equivalent of riding transit for 1 seconds. Note! The resolution of the normalized cost is diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/model/basic/Ratio.java b/core/model/src/main/java/org/opentripplanner/core/model/basic/Ratio.java similarity index 97% rename from core/model/src/main/java/org/opentripplanner/core/domain/model/basic/Ratio.java rename to core/model/src/main/java/org/opentripplanner/core/model/basic/Ratio.java index 52354ecc0b5..b273d23069b 100644 --- a/core/model/src/main/java/org/opentripplanner/core/domain/model/basic/Ratio.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/basic/Ratio.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.model.basic; +package org.opentripplanner.core.model.basic; import java.util.Optional; import java.util.function.Consumer; diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorNoop.java b/core/model/src/main/java/org/opentripplanner/core/model/deduplicator/DeduplicatorNoop.java similarity index 94% rename from core/model/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorNoop.java rename to core/model/src/main/java/org/opentripplanner/core/model/deduplicator/DeduplicatorNoop.java index c716c159429..6c76cf20f00 100644 --- a/core/model/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorNoop.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/deduplicator/DeduplicatorNoop.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.framework.deduplicator; +package org.opentripplanner.core.model.deduplicator; import java.util.BitSet; import java.util.List; diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorService.java b/core/model/src/main/java/org/opentripplanner/core/model/deduplicator/DeduplicatorService.java similarity index 95% rename from core/model/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorService.java rename to core/model/src/main/java/org/opentripplanner/core/model/deduplicator/DeduplicatorService.java index b7bde4d191f..30f5db464d0 100644 --- a/core/model/src/main/java/org/opentripplanner/core/domain/framework/deduplicator/DeduplicatorService.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/deduplicator/DeduplicatorService.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.framework.deduplicator; +package org.opentripplanner.core.model.deduplicator; import java.util.BitSet; import java.util.List; diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/framework/di/TransitServicePeriod.java b/core/model/src/main/java/org/opentripplanner/core/model/di/TransitServicePeriod.java similarity index 84% rename from core/model/src/main/java/org/opentripplanner/core/domain/framework/di/TransitServicePeriod.java rename to core/model/src/main/java/org/opentripplanner/core/model/di/TransitServicePeriod.java index a5123866934..827dd84639f 100644 --- a/core/model/src/main/java/org/opentripplanner/core/domain/framework/di/TransitServicePeriod.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/di/TransitServicePeriod.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.framework.di; +package org.opentripplanner.core.model.di; import java.lang.annotation.ElementType; import java.lang.annotation.Target; diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/model/doc/DocumentedEnum.java b/core/model/src/main/java/org/opentripplanner/core/model/doc/DocumentedEnum.java similarity index 93% rename from core/model/src/main/java/org/opentripplanner/core/domain/model/doc/DocumentedEnum.java rename to core/model/src/main/java/org/opentripplanner/core/model/doc/DocumentedEnum.java index 7a4fa807efd..59ea5ff22b7 100644 --- a/core/model/src/main/java/org/opentripplanner/core/domain/model/doc/DocumentedEnum.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/doc/DocumentedEnum.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.model.doc; +package org.opentripplanner.core.model.doc; /** * This interface is used to allow the enum documentation to be written in one place, and reused in diff --git a/core/model/src/main/java/org/opentripplanner/core/model/event/DomainEvent.java b/core/model/src/main/java/org/opentripplanner/core/model/event/DomainEvent.java index 05e26b6aefc..3687b2aa55a 100644 --- a/core/model/src/main/java/org/opentripplanner/core/model/event/DomainEvent.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/event/DomainEvent.java @@ -1,3 +1,3 @@ -package org.opentripplanner.core.domain.framework.event; +package org.opentripplanner.core.model.event; public interface DomainEvent {} diff --git a/core/model/src/main/java/org/opentripplanner/core/model/event/EventHandler.java b/core/model/src/main/java/org/opentripplanner/core/model/event/EventHandler.java index f1f3fcd2975..21e53ff6618 100644 --- a/core/model/src/main/java/org/opentripplanner/core/model/event/EventHandler.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/event/EventHandler.java @@ -1,6 +1,6 @@ -package org.opentripplanner.core.domain.framework.event; +package org.opentripplanner.core.model.event; -import org.opentripplanner.core.domain.framework.transaction.api.WriteContext; +import org.opentripplanner.core.model.transaction.WriteContext; /** * A write-side event handler that receives a mutable repository at dispatch time. diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NString.java b/core/model/src/main/java/org/opentripplanner/core/model/i18n/I18NString.java similarity index 96% rename from core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NString.java rename to core/model/src/main/java/org/opentripplanner/core/model/i18n/I18NString.java index dbea079850e..380805b6e3a 100644 --- a/core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NString.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/i18n/I18NString.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.model.i18n; +package org.opentripplanner.core.model.i18n; import java.util.Locale; import javax.annotation.Nullable; diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NStringMapper.java b/core/model/src/main/java/org/opentripplanner/core/model/i18n/I18NStringMapper.java similarity index 91% rename from core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NStringMapper.java rename to core/model/src/main/java/org/opentripplanner/core/model/i18n/I18NStringMapper.java index a558b085376..f4fb3f5819a 100644 --- a/core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/I18NStringMapper.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/i18n/I18NStringMapper.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.model.i18n; +package org.opentripplanner.core.model.i18n; import java.util.Locale; import javax.annotation.Nullable; diff --git a/core/model/src/main/java/org/opentripplanner/core/model/i18n/LocalizedString.java b/core/model/src/main/java/org/opentripplanner/core/model/i18n/LocalizedString.java index 852687fd45e..293c18e7d2d 100644 --- a/core/model/src/main/java/org/opentripplanner/core/model/i18n/LocalizedString.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/i18n/LocalizedString.java @@ -1,11 +1,11 @@ -package org.opentripplanner.core.domain.model.i18n; +package org.opentripplanner.core.model.i18n; import java.io.Serializable; import java.util.Arrays; import java.util.Locale; import java.util.Objects; import java.util.regex.Pattern; -import org.opentripplanner.core.domain.framework.resources.ResourceBundleSingleton; +import org.opentripplanner.core.model.resources.ResourceBundleSingleton; /** * This is used to localize strings for which localization are known beforehand. Those are local diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringFormat.java b/core/model/src/main/java/org/opentripplanner/core/model/i18n/LocalizedStringFormat.java similarity index 95% rename from core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringFormat.java rename to core/model/src/main/java/org/opentripplanner/core/model/i18n/LocalizedStringFormat.java index eb0cc7061eb..00a934d77bd 100644 --- a/core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/LocalizedStringFormat.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/i18n/LocalizedStringFormat.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.model.i18n; +package org.opentripplanner.core.model.i18n; import java.io.Serializable; import java.util.Arrays; diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/NonLocalizedString.java b/core/model/src/main/java/org/opentripplanner/core/model/i18n/NonLocalizedString.java similarity index 98% rename from core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/NonLocalizedString.java rename to core/model/src/main/java/org/opentripplanner/core/model/i18n/NonLocalizedString.java index bb7b4d8db11..9a0d9b22c38 100644 --- a/core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/NonLocalizedString.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/i18n/NonLocalizedString.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.model.i18n; +package org.opentripplanner.core.model.i18n; import java.io.Serializable; import java.util.Locale; diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/TranslatedString.java b/core/model/src/main/java/org/opentripplanner/core/model/i18n/TranslatedString.java similarity index 99% rename from core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/TranslatedString.java rename to core/model/src/main/java/org/opentripplanner/core/model/i18n/TranslatedString.java index 538b495dddd..7c044f27729 100644 --- a/core/model/src/main/java/org/opentripplanner/core/domain/model/i18n/TranslatedString.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/i18n/TranslatedString.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.model.i18n; +package org.opentripplanner.core.model.i18n; import java.io.Serializable; import java.util.ArrayList; diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/model/id/FeedScopedId.java b/core/model/src/main/java/org/opentripplanner/core/model/id/FeedScopedId.java similarity index 99% rename from core/model/src/main/java/org/opentripplanner/core/domain/model/id/FeedScopedId.java rename to core/model/src/main/java/org/opentripplanner/core/model/id/FeedScopedId.java index f67c6051fa2..a05e845a2c4 100644 --- a/core/model/src/main/java/org/opentripplanner/core/domain/model/id/FeedScopedId.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/id/FeedScopedId.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.model.id; +package org.opentripplanner.core.model.id; import static org.opentripplanner.utils.lang.StringUtils.assertHasValue; diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleAdaptor.java b/core/model/src/main/java/org/opentripplanner/core/model/resources/ResourceBundleAdaptor.java similarity index 95% rename from core/model/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleAdaptor.java rename to core/model/src/main/java/org/opentripplanner/core/model/resources/ResourceBundleAdaptor.java index f6afb77d5ef..43f076ca65d 100644 --- a/core/model/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleAdaptor.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/resources/ResourceBundleAdaptor.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.framework.resources; +package org.opentripplanner.core.model.resources; import java.util.Locale; import java.util.MissingResourceException; diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleSingleton.java b/core/model/src/main/java/org/opentripplanner/core/model/resources/ResourceBundleSingleton.java similarity index 95% rename from core/model/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleSingleton.java rename to core/model/src/main/java/org/opentripplanner/core/model/resources/ResourceBundleSingleton.java index 829e221003d..7ee7b2f644f 100644 --- a/core/model/src/main/java/org/opentripplanner/core/domain/framework/resources/ResourceBundleSingleton.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/resources/ResourceBundleSingleton.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.framework.resources; +package org.opentripplanner.core.model.resources; import java.util.Locale; import java.util.MissingResourceException; diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/model/time/LocalDateRange.java b/core/model/src/main/java/org/opentripplanner/core/model/time/LocalDateRange.java similarity index 99% rename from core/model/src/main/java/org/opentripplanner/core/domain/model/time/LocalDateRange.java rename to core/model/src/main/java/org/opentripplanner/core/model/time/LocalDateRange.java index 4a1e4b52a7c..bd97234d632 100644 --- a/core/model/src/main/java/org/opentripplanner/core/domain/model/time/LocalDateRange.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/time/LocalDateRange.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.model.time; +package org.opentripplanner.core.model.time; import static java.time.LocalDate.MAX; import static java.time.LocalDate.MIN; diff --git a/core/model/src/main/java/org/opentripplanner/core/domain/model/time/TimePeriod.java b/core/model/src/main/java/org/opentripplanner/core/model/time/TimePeriod.java similarity index 98% rename from core/model/src/main/java/org/opentripplanner/core/domain/model/time/TimePeriod.java rename to core/model/src/main/java/org/opentripplanner/core/model/time/TimePeriod.java index 6add1614867..be644bf7d2a 100644 --- a/core/model/src/main/java/org/opentripplanner/core/domain/model/time/TimePeriod.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/time/TimePeriod.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.model.time; +package org.opentripplanner.core.model.time; import java.time.Instant; import java.util.Objects; diff --git a/core/model/src/main/java/org/opentripplanner/core/model/transaction/RepositoryHandle.java b/core/model/src/main/java/org/opentripplanner/core/model/transaction/RepositoryHandle.java index 939f3eadee7..340944d5870 100644 --- a/core/model/src/main/java/org/opentripplanner/core/model/transaction/RepositoryHandle.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/transaction/RepositoryHandle.java @@ -1,6 +1,4 @@ -package org.opentripplanner.core.domain.framework.transaction.api; - -import org.opentripplanner.core.domain.framework.transaction.UpdateManager; +package org.opentripplanner.core.model.transaction; /** * Application-scoped handle for a transactional repository. Obtained once at wiring time via diff --git a/core/model/src/main/java/org/opentripplanner/core/model/transaction/RepositoryLifecycle.java b/core/model/src/main/java/org/opentripplanner/core/model/transaction/RepositoryLifecycle.java index dc4d1493a95..5b080cd27a1 100644 --- a/core/model/src/main/java/org/opentripplanner/core/model/transaction/RepositoryLifecycle.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/transaction/RepositoryLifecycle.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.framework.transaction.api; +package org.opentripplanner.core.model.transaction; /** * Strategy for the copy-on-write / freeze lifecycle of a repository snapshot. diff --git a/core/model/src/main/java/org/opentripplanner/core/model/transaction/RepositoryRegistry.java b/core/model/src/main/java/org/opentripplanner/core/model/transaction/RepositoryRegistry.java index 6f7b266bbad..756f673ece6 100644 --- a/core/model/src/main/java/org/opentripplanner/core/model/transaction/RepositoryRegistry.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/transaction/RepositoryRegistry.java @@ -1,9 +1,6 @@ -package org.opentripplanner.core.domain.framework.transaction; +package org.opentripplanner.core.model.transaction; import java.util.function.Consumer; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryLifecycle; -import org.opentripplanner.core.domain.framework.transaction.api.TransactionScope; /** * Application-scoped registry for transactional repositories. diff --git a/core/model/src/main/java/org/opentripplanner/core/model/transaction/TransactionScope.java b/core/model/src/main/java/org/opentripplanner/core/model/transaction/TransactionScope.java index 9e376fb3ef0..4bc7084dfe7 100644 --- a/core/model/src/main/java/org/opentripplanner/core/model/transaction/TransactionScope.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/transaction/TransactionScope.java @@ -1,6 +1,4 @@ -package org.opentripplanner.core.domain.framework.transaction.api; - -import org.opentripplanner.core.domain.framework.transaction.RepositoryRegistry; +package org.opentripplanner.core.model.transaction; /** * Request-scoped consistent view over one or more repositories. diff --git a/core/model/src/main/java/org/opentripplanner/core/model/transaction/UpdateManager.java b/core/model/src/main/java/org/opentripplanner/core/model/transaction/UpdateManager.java index e3aa0a92790..3cb78251b15 100644 --- a/core/model/src/main/java/org/opentripplanner/core/model/transaction/UpdateManager.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/transaction/UpdateManager.java @@ -1,12 +1,10 @@ -package org.opentripplanner.core.domain.framework.transaction; +package org.opentripplanner.core.model.transaction; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import java.util.function.Consumer; -import org.opentripplanner.core.domain.framework.event.DomainEvent; -import org.opentripplanner.core.domain.framework.event.EventHandler; -import org.opentripplanner.core.domain.framework.transaction.api.RepositoryHandle; -import org.opentripplanner.core.domain.framework.transaction.api.WriteContext; +import org.opentripplanner.core.model.event.DomainEvent; +import org.opentripplanner.core.model.event.EventHandler; /** * Application-scoped manager for write operations against transactional repositories. diff --git a/core/model/src/main/java/org/opentripplanner/core/model/transaction/WriteContext.java b/core/model/src/main/java/org/opentripplanner/core/model/transaction/WriteContext.java index 242eea61e0d..9778db4223e 100644 --- a/core/model/src/main/java/org/opentripplanner/core/model/transaction/WriteContext.java +++ b/core/model/src/main/java/org/opentripplanner/core/model/transaction/WriteContext.java @@ -1,8 +1,7 @@ -package org.opentripplanner.core.domain.framework.transaction.api; +package org.opentripplanner.core.model.transaction; -import org.opentripplanner.core.domain.framework.event.DomainEvent; -import org.opentripplanner.core.domain.framework.event.EventHandler; -import org.opentripplanner.core.domain.framework.transaction.UpdateManager; +import org.opentripplanner.core.model.event.DomainEvent; +import org.opentripplanner.core.model.event.EventHandler; /** * Task-scoped coordination point for write access during a single update. diff --git a/core/model/src/test/java/org/opentripplanner/core/model/i18n/I18NStringTest.java b/core/model/src/test/java/org/opentripplanner/core/model/i18n/I18NStringTest.java index 23322d27949..8556ba24685 100644 --- a/core/model/src/test/java/org/opentripplanner/core/model/i18n/I18NStringTest.java +++ b/core/model/src/test/java/org/opentripplanner/core/model/i18n/I18NStringTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.model.i18n; +package org.opentripplanner.core.model.i18n; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/core/model/src/test/java/org/opentripplanner/core/model/i18n/LocalizedStringTest.java b/core/model/src/test/java/org/opentripplanner/core/model/i18n/LocalizedStringTest.java index 362f68e5d2f..36d4edb0c81 100644 --- a/core/model/src/test/java/org/opentripplanner/core/model/i18n/LocalizedStringTest.java +++ b/core/model/src/test/java/org/opentripplanner/core/model/i18n/LocalizedStringTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.model.i18n; +package org.opentripplanner.core.model.i18n; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/core/model/src/test/java/org/opentripplanner/core/model/i18n/TranslatedStringTest.java b/core/model/src/test/java/org/opentripplanner/core/model/i18n/TranslatedStringTest.java index 18eabbdcf7f..70a094ced10 100644 --- a/core/model/src/test/java/org/opentripplanner/core/model/i18n/TranslatedStringTest.java +++ b/core/model/src/test/java/org/opentripplanner/core/model/i18n/TranslatedStringTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.model.i18n; +package org.opentripplanner.core.model.i18n; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; diff --git a/core/model/src/test/java/org/opentripplanner/core/model/id/FeedScopedIdTest.java b/core/model/src/test/java/org/opentripplanner/core/model/id/FeedScopedIdTest.java index a78f749c2cc..cb9ea68fd09 100644 --- a/core/model/src/test/java/org/opentripplanner/core/model/id/FeedScopedIdTest.java +++ b/core/model/src/test/java/org/opentripplanner/core/model/id/FeedScopedIdTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.model.id; +package org.opentripplanner.core.model.id; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/core/model/src/test/java/org/opentripplanner/core/model/time/LocalDateRangeTest.java b/core/model/src/test/java/org/opentripplanner/core/model/time/LocalDateRangeTest.java index 7dfd051bd6e..570f04152e1 100644 --- a/core/model/src/test/java/org/opentripplanner/core/model/time/LocalDateRangeTest.java +++ b/core/model/src/test/java/org/opentripplanner/core/model/time/LocalDateRangeTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.model.time; +package org.opentripplanner.core.model.time; import static com.google.common.truth.Truth.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/core/model/src/test/java/org/opentripplanner/core/model/time/TimePeriodTest.java b/core/model/src/test/java/org/opentripplanner/core/model/time/TimePeriodTest.java index 03575146e61..5e923906e8a 100644 --- a/core/model/src/test/java/org/opentripplanner/core/model/time/TimePeriodTest.java +++ b/core/model/src/test/java/org/opentripplanner/core/model/time/TimePeriodTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.core.domain.model.time; +package org.opentripplanner.core.model.time; import static com.google.common.truth.Truth.assertThat; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParking.java b/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParking.java index bc1456efb90..d4dd988d2c0 100644 --- a/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParking.java +++ b/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParking.java @@ -7,8 +7,8 @@ import java.util.Objects; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.street.model.openinghours.OHCalendar; import org.opentripplanner.street.search.TraverseMode; diff --git a/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParkingEntrance.java b/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParkingEntrance.java index 0cf1f89b409..363ba7cc014 100644 --- a/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParkingEntrance.java +++ b/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParkingEntrance.java @@ -3,8 +3,8 @@ import java.io.Serializable; import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.street.model.vertex.StreetVertex; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParkingGroup.java b/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParkingGroup.java index 34626e0dff7..c92d9c2adaa 100644 --- a/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParkingGroup.java +++ b/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParkingGroup.java @@ -2,8 +2,8 @@ import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParkingGroupBuilder.java b/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParkingGroupBuilder.java index 8c675a156c2..5f209dc6859 100644 --- a/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParkingGroupBuilder.java +++ b/street/src/main/java/org/opentripplanner/service/vehicleparking/model/VehicleParkingGroupBuilder.java @@ -1,7 +1,7 @@ package org.opentripplanner.service.vehicleparking.model; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; public class VehicleParkingGroupBuilder { diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/VehicleRentalRepository.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/VehicleRentalRepository.java index cd8ee704aeb..ddb732f9a10 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/VehicleRentalRepository.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/VehicleRentalRepository.java @@ -1,7 +1,7 @@ package org.opentripplanner.service.vehiclerental; import java.util.Collection; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/VehicleRentalService.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/VehicleRentalService.java index d05887f4c3e..e7d31058b41 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/VehicleRentalService.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/VehicleRentalService.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.List; import org.locationtech.jts.geom.Envelope; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation; import org.opentripplanner.service.vehiclerental.model.VehicleRentalVehicle; diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/internal/DefaultVehicleRentalRepository.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/internal/DefaultVehicleRentalRepository.java index d8281bc22c5..da233503c74 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/internal/DefaultVehicleRentalRepository.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/internal/DefaultVehicleRentalRepository.java @@ -9,7 +9,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.GeofencingZoneService; import org.opentripplanner.service.vehiclerental.VehicleRentalRepository; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/internal/DefaultVehicleRentalService.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/internal/DefaultVehicleRentalService.java index 3ebf6597d21..0522a69d013 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/internal/DefaultVehicleRentalService.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/internal/DefaultVehicleRentalService.java @@ -9,7 +9,7 @@ import java.util.stream.Stream; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Envelope; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.VehicleRentalRepository; import org.opentripplanner.service.vehiclerental.VehicleRentalService; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/GeofencingZone.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/GeofencingZone.java index 8c030996674..bdf3edf9db0 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/GeofencingZone.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/GeofencingZone.java @@ -7,8 +7,8 @@ import java.util.function.Function; import javax.annotation.Nullable; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; /** * A geofencing zone describing restrictions for traversing with a rental vehicle or dropping it off diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleFuel.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleFuel.java index 2e9522b9931..013abb935d2 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleFuel.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleFuel.java @@ -2,8 +2,8 @@ import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.basic.Distance; -import org.opentripplanner.core.domain.model.basic.Ratio; +import org.opentripplanner.core.model.basic.Distance; +import org.opentripplanner.core.model.basic.Ratio; import org.opentripplanner.utils.tostring.ToStringBuilder; /** diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleType.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleType.java index 9337408f42b..5bad8aed132 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleType.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleType.java @@ -5,8 +5,8 @@ import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.model.RentalFormFactor; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalPlace.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalPlace.java index cb41207cfb8..af192729860 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalPlace.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalPlace.java @@ -1,8 +1,8 @@ package org.opentripplanner.service.vehiclerental.model; import java.util.Set; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.model.RentalFormFactor; import org.opentripplanner.street.search.request.RentalRequest; diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStation.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStation.java index 95c31ac0dd6..060ff12bff4 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStation.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStation.java @@ -11,8 +11,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.model.RentalFormFactor; import org.opentripplanner.utils.collection.SetUtils; diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStationBuilder.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStationBuilder.java index 23cf02a5490..67647f26c33 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStationBuilder.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStationBuilder.java @@ -2,8 +2,8 @@ import java.util.Map; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; public class VehicleRentalStationBuilder { diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalSystem.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalSystem.java index 93a95f62fcc..52c721227e8 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalSystem.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalSystem.java @@ -2,7 +2,7 @@ import java.util.Objects; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.utils.tostring.ToStringBuilder; /** diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalVehicle.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalVehicle.java index 0ed26199ef6..7598c1001e2 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalVehicle.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalVehicle.java @@ -6,8 +6,8 @@ import java.util.Set; import java.util.function.Consumer; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.model.RentalFormFactor; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/street/StreetVehicleRentalLink.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/street/StreetVehicleRentalLink.java index 0abbc9540f9..53453afd275 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/street/StreetVehicleRentalLink.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/street/StreetVehicleRentalLink.java @@ -1,7 +1,7 @@ package org.opentripplanner.service.vehiclerental.street; import java.util.List; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.vertex.StreetVertex; import org.opentripplanner.street.model.vertex.Vertex; diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalEdge.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalEdge.java index 13c812b978e..b9c6fa3c89f 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalEdge.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalEdge.java @@ -4,7 +4,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType.PropulsionType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; diff --git a/street/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalPlaceVertex.java b/street/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalPlaceVertex.java index 7812da60e8c..fd9d273edb7 100644 --- a/street/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalPlaceVertex.java +++ b/street/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalPlaceVertex.java @@ -2,7 +2,7 @@ import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; import org.opentripplanner.street.model.vertex.Vertex; diff --git a/street/src/main/java/org/opentripplanner/street/graph/Graph.java b/street/src/main/java/org/opentripplanner/street/graph/Graph.java index 8507f9c051d..4a65faa9ce3 100644 --- a/street/src/main/java/org/opentripplanner/street/graph/Graph.java +++ b/street/src/main/java/org/opentripplanner/street/graph/Graph.java @@ -15,7 +15,7 @@ import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; import org.opentripplanner.street.Scope; import org.opentripplanner.street.geometry.CompactElevationProfile; diff --git a/street/src/main/java/org/opentripplanner/street/graph/StreetIndex.java b/street/src/main/java/org/opentripplanner/street/graph/StreetIndex.java index 15065ce3dfe..e231425d74b 100644 --- a/street/src/main/java/org/opentripplanner/street/graph/StreetIndex.java +++ b/street/src/main/java/org/opentripplanner/street/graph/StreetIndex.java @@ -10,7 +10,7 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.Scope; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.geometry.HashGridSpatialIndex; diff --git a/street/src/main/java/org/opentripplanner/street/graph/summary/StreetSummarizer.java b/street/src/main/java/org/opentripplanner/street/graph/summary/StreetSummarizer.java index 815d5b0af03..7315f4fe61a 100644 --- a/street/src/main/java/org/opentripplanner/street/graph/summary/StreetSummarizer.java +++ b/street/src/main/java/org/opentripplanner/street/graph/summary/StreetSummarizer.java @@ -6,7 +6,7 @@ import java.util.Locale; import java.util.stream.Collectors; import org.apache.commons.lang3.NotImplementedException; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.edge.ElevatorAlightEdge; import org.opentripplanner.street.model.edge.ElevatorBoardEdge; diff --git a/street/src/main/java/org/opentripplanner/street/linking/AreaEdgeProperties.java b/street/src/main/java/org/opentripplanner/street/linking/AreaEdgeProperties.java index 5e319b4ad48..d3cd29321fb 100644 --- a/street/src/main/java/org/opentripplanner/street/linking/AreaEdgeProperties.java +++ b/street/src/main/java/org/opentripplanner/street/linking/AreaEdgeProperties.java @@ -1,7 +1,7 @@ package org.opentripplanner.street.linking; import java.util.List; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.edge.Area; diff --git a/street/src/main/java/org/opentripplanner/street/model/StreetMode.java b/street/src/main/java/org/opentripplanner/street/model/StreetMode.java index e30d498781f..e8343f9f84a 100644 --- a/street/src/main/java/org/opentripplanner/street/model/StreetMode.java +++ b/street/src/main/java/org/opentripplanner/street/model/StreetMode.java @@ -2,7 +2,7 @@ import java.util.EnumSet; import java.util.Set; -import org.opentripplanner.core.domain.model.doc.DocumentedEnum; +import org.opentripplanner.core.model.doc.DocumentedEnum; public enum StreetMode implements DocumentedEnum { /** diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/Area.java b/street/src/main/java/org/opentripplanner/street/model/edge/Area.java index 06bd0db109a..9346ce5f0f0 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/Area.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/Area.java @@ -2,7 +2,7 @@ import java.io.Serializable; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.street.model.StreetTraversalPermission; /** diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/Edge.java b/street/src/main/java/org/opentripplanner/street/model/edge/Edge.java index dce3ccc1c27..b8def7cd5cc 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/Edge.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/Edge.java @@ -8,7 +8,7 @@ import javax.annotation.Nullable; import org.locationtech.jts.geom.LineString; import org.opentripplanner.astar.spi.AStarEdge; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.state.State; import org.slf4j.Logger; diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/ElevatorAlightEdge.java b/street/src/main/java/org/opentripplanner/street/model/edge/ElevatorAlightEdge.java index b8a96286d2f..3d88869cb9d 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/ElevatorAlightEdge.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/ElevatorAlightEdge.java @@ -2,8 +2,8 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.LocalizedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.LocalizedString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.vertex.ElevatorHopVertex; import org.opentripplanner.street.model.vertex.Vertex; diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/ElevatorBoardEdge.java b/street/src/main/java/org/opentripplanner/street/model/edge/ElevatorBoardEdge.java index 8b8258c4913..122d7354d6b 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/ElevatorBoardEdge.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/ElevatorBoardEdge.java @@ -1,8 +1,8 @@ package org.opentripplanner.street.model.edge; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.vertex.ElevatorHopVertex; import org.opentripplanner.street.model.vertex.Vertex; diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/ElevatorHopEdge.java b/street/src/main/java/org/opentripplanner/street/model/edge/ElevatorHopEdge.java index 491040584db..8c8855b3ae0 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/ElevatorHopEdge.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/ElevatorHopEdge.java @@ -2,8 +2,8 @@ import java.time.Duration; import java.util.Optional; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.TraverseMode; diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/EscalatorEdge.java b/street/src/main/java/org/opentripplanner/street/model/edge/EscalatorEdge.java index 72c2a212a05..5e36f3226e0 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/EscalatorEdge.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/EscalatorEdge.java @@ -4,8 +4,8 @@ import java.util.Optional; import javax.annotation.Nullable; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.LocalizedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.LocalizedString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.TraverseMode; diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/FreeEdge.java b/street/src/main/java/org/opentripplanner/street/model/edge/FreeEdge.java index 915137b371e..2ed4f6502ee 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/FreeEdge.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/FreeEdge.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.model.edge; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.state.State; import org.opentripplanner.street.search.state.StateEditor; diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/PathwayEdge.java b/street/src/main/java/org/opentripplanner/street/model/edge/PathwayEdge.java index eae04c9a55b..314708d4de9 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/PathwayEdge.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/PathwayEdge.java @@ -5,8 +5,8 @@ import javax.annotation.Nullable; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.TraverseMode; diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java b/street/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java index 56fa72dd9d7..601983c51bb 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java @@ -7,7 +7,7 @@ import java.util.Optional; import org.locationtech.jts.geom.LineString; import org.locationtech.jts.geom.impl.PackedCoordinateSequence; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType.PropulsionType; import org.opentripplanner.service.vehiclerental.street.geofencing.GeofencingInterceptor; import org.opentripplanner.street.geometry.DirectionUtils; diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeBuilder.java b/street/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeBuilder.java index 3461300410b..805ce6926be 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeBuilder.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeBuilder.java @@ -13,8 +13,8 @@ import static org.opentripplanner.street.model.edge.StreetEdge.WHEELCHAIR_ACCESSIBLE_FLAG_INDEX; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.vertex.StreetVertex; import org.opentripplanner.street.search.TraverseMode; diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java b/street/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java index 17bad321b25..5f681898902 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java @@ -2,8 +2,8 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.vertex.StreetVertex; import org.opentripplanner.street.model.vertex.Vertex; diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntranceLink.java b/street/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntranceLink.java index 6948f4d58db..c5a3243292d 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntranceLink.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntranceLink.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.model.edge; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.model.vertex.StreetVertex; import org.opentripplanner.street.model.vertex.TransitEntranceVertex; diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLink.java b/street/src/main/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLink.java index ef3537c6508..06a2cfc8441 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLink.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLink.java @@ -1,7 +1,7 @@ package org.opentripplanner.street.model.edge; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.vertex.StreetVertex; diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/VehicleParkingEdge.java b/street/src/main/java/org/opentripplanner/street/model/edge/VehicleParkingEdge.java index 07d1cad5bb3..3505f9a2ac9 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/VehicleParkingEdge.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/VehicleParkingEdge.java @@ -1,8 +1,8 @@ package org.opentripplanner.street.model.edge; import java.time.Duration; -import org.opentripplanner.core.domain.model.basic.Cost; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.street.model.StreetMode; import org.opentripplanner.street.model.vertex.VehicleParkingEntranceVertex; diff --git a/street/src/main/java/org/opentripplanner/street/model/openinghours/OHCalendarBuilder.java b/street/src/main/java/org/opentripplanner/street/model/openinghours/OHCalendarBuilder.java index 7cc0dbf12b7..6019b0b3bab 100644 --- a/street/src/main/java/org/opentripplanner/street/model/openinghours/OHCalendarBuilder.java +++ b/street/src/main/java/org/opentripplanner/street/model/openinghours/OHCalendarBuilder.java @@ -13,7 +13,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; public class OHCalendarBuilder { diff --git a/street/src/main/java/org/opentripplanner/street/model/openinghours/OpeningHoursCalendarService.java b/street/src/main/java/org/opentripplanner/street/model/openinghours/OpeningHoursCalendarService.java index 0abb6fb916f..28bf4257bc9 100644 --- a/street/src/main/java/org/opentripplanner/street/model/openinghours/OpeningHoursCalendarService.java +++ b/street/src/main/java/org/opentripplanner/street/model/openinghours/OpeningHoursCalendarService.java @@ -5,9 +5,9 @@ import java.time.LocalDate; import java.time.ZoneId; import java.util.Objects; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; -import org.opentripplanner.core.domain.framework.di.TransitServicePeriod; -import org.opentripplanner.core.domain.model.time.LocalDateRange; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.di.TransitServicePeriod; +import org.opentripplanner.core.model.time.LocalDateRange; public class OpeningHoursCalendarService implements Serializable { diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/BarrierVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/BarrierVertex.java index 88590dec01e..c94790d45fb 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/BarrierVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/BarrierVertex.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.model.accessibility.Accessibility; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.edge.StreetEdge; diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/ElevatorHopVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/ElevatorHopVertex.java index c4db06c3ea9..fa39205b485 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/ElevatorHopVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/ElevatorHopVertex.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; public class ElevatorHopVertex extends StreetVertex { diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/LabelledIntersectionVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/LabelledIntersectionVertex.java index 050cf993d7d..2b76a3c0534 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/LabelledIntersectionVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/LabelledIntersectionVertex.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; /** * An intersection vertex that has a label that is generated outside of it rather than diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/OsmBoardingLocationVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/OsmBoardingLocationVertex.java index e56166e80fb..c9e2406dba7 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/OsmBoardingLocationVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/OsmBoardingLocationVertex.java @@ -4,7 +4,7 @@ import java.util.Objects; import java.util.Set; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.utils.tostring.ToStringBuilder; /** diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/OsmVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/OsmVertex.java index 7de3a951196..dfe5a891608 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/OsmVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/OsmVertex.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; /** * A vertex coming from OpenStreetMap. diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/SplitterVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/SplitterVertex.java index f50e00c8bda..bbecce06365 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/SplitterVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/SplitterVertex.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; /** * A vertex representing a place along a street between two intersections that is not derived from diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/StationCentroidVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/StationCentroidVertex.java index b413a6cc2d6..85dcdd408ec 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/StationCentroidVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/StationCentroidVertex.java @@ -1,7 +1,7 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; /** diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/StationElementVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/StationElementVertex.java index a3ca995f6c5..8db06e6dd69 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/StationElementVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/StationElementVertex.java @@ -1,8 +1,8 @@ package org.opentripplanner.street.model.vertex; import java.util.Objects; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; public abstract class StationElementVertex extends Vertex { diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/StationEntranceVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/StationEntranceVertex.java index 5bede0983c7..5d115906ed0 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/StationEntranceVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/StationEntranceVertex.java @@ -1,8 +1,8 @@ package org.opentripplanner.street.model.vertex; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.utils.tostring.ToStringBuilder; /** diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/StreetLocation.java b/street/src/main/java/org/opentripplanner/street/model/vertex/StreetLocation.java index 2a6d5319b1b..e3e0a4d5858 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/StreetLocation.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/StreetLocation.java @@ -1,7 +1,7 @@ package org.opentripplanner.street.model.vertex; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.utils.lang.DoubleUtils; /** diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/StreetVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/StreetVertex.java index d3fec265e47..b565c04a92a 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/StreetVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/StreetVertex.java @@ -8,9 +8,9 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.LocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.LocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.edge.StreetEdge; import org.opentripplanner.street.search.TraverseMode; diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/SubsidiaryVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/SubsidiaryVertex.java index 8da2c4b0b29..74c0848a6a4 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/SubsidiaryVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/SubsidiaryVertex.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; /** * When applying turn restrictions to a graph makes copies of an IntersectionVertex, diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/TemporaryStreetLocation.java b/street/src/main/java/org/opentripplanner/street/model/vertex/TemporaryStreetLocation.java index e970a96d9bb..691e7250353 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/TemporaryStreetLocation.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/TemporaryStreetLocation.java @@ -2,7 +2,7 @@ import java.util.concurrent.atomic.AtomicLong; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.edge.TemporaryEdge; diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/TransitBoardingAreaVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/TransitBoardingAreaVertex.java index 4f9aa46cea6..52441f0c838 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/TransitBoardingAreaVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/TransitBoardingAreaVertex.java @@ -1,7 +1,7 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; public class TransitBoardingAreaVertex extends StationElementVertex { diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/TransitEntranceVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/TransitEntranceVertex.java index 38aad6452bd..15218f12195 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/TransitEntranceVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/TransitEntranceVertex.java @@ -1,8 +1,8 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; public class TransitEntranceVertex extends StationElementVertex { diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/TransitPathwayNodeVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/TransitPathwayNodeVertex.java index 6e012d03665..1a168a3d9d5 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/TransitPathwayNodeVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/TransitPathwayNodeVertex.java @@ -1,7 +1,7 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; public class TransitPathwayNodeVertex extends StationElementVertex { diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertex.java index 957c9f00380..9f5a2335504 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertex.java @@ -4,9 +4,9 @@ import static org.opentripplanner.street.search.TraverseMode.WALK; import java.util.Objects; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.edge.PathwayEdge; diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertexBuilder.java b/street/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertexBuilder.java index ab4cf322767..8d01d4dd542 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertexBuilder.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertexBuilder.java @@ -1,8 +1,8 @@ package org.opentripplanner.street.model.vertex; import org.locationtech.jts.geom.Point; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.WgsCoordinate; public class TransitStopVertexBuilder { diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java index 099f928bf0b..291e71b8a66 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java @@ -2,7 +2,7 @@ import java.util.Collection; import java.util.Objects; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehicleparking.model.VehicleParkingEntrance; import org.opentripplanner.street.model.edge.Edge; diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/Vertex.java b/street/src/main/java/org/opentripplanner/street/model/vertex/Vertex.java index ff72e195970..6b97eaa6dc4 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/Vertex.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/Vertex.java @@ -12,8 +12,8 @@ import java.util.function.Predicate; import org.locationtech.jts.geom.Coordinate; import org.opentripplanner.astar.spi.AStarVertex; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; import org.opentripplanner.service.vehiclerental.street.geofencing.GeofencingBoundaryExtension; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/street/src/main/java/org/opentripplanner/street/model/vertex/VertexLabel.java b/street/src/main/java/org/opentripplanner/street/model/vertex/VertexLabel.java index c6fc903c52b..b5a09ea7d62 100644 --- a/street/src/main/java/org/opentripplanner/street/model/vertex/VertexLabel.java +++ b/street/src/main/java/org/opentripplanner/street/model/vertex/VertexLabel.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; /** * A label for a vertex so it can be identified when finding vertices in the graph. diff --git a/street/src/main/java/org/opentripplanner/street/search/request/AccessibilityRequest.java b/street/src/main/java/org/opentripplanner/street/search/request/AccessibilityRequest.java index 91d9da1b9cd..ad76cb7acfa 100644 --- a/street/src/main/java/org/opentripplanner/street/search/request/AccessibilityRequest.java +++ b/street/src/main/java/org/opentripplanner/street/search/request/AccessibilityRequest.java @@ -2,7 +2,7 @@ import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.utils.tostring.ToStringBuilder; /** diff --git a/street/src/main/java/org/opentripplanner/street/search/request/CarRequest.java b/street/src/main/java/org/opentripplanner/street/search/request/CarRequest.java index 6c287954bb9..6234c6a4475 100644 --- a/street/src/main/java/org/opentripplanner/street/search/request/CarRequest.java +++ b/street/src/main/java/org/opentripplanner/street/search/request/CarRequest.java @@ -5,7 +5,7 @@ import java.time.Duration; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.utils.lang.DoubleUtils; import org.opentripplanner.utils.lang.Units; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/street/src/main/java/org/opentripplanner/street/search/request/ElevatorRequest.java b/street/src/main/java/org/opentripplanner/street/search/request/ElevatorRequest.java index 7bd8e7a8030..89dcd9f6c20 100644 --- a/street/src/main/java/org/opentripplanner/street/search/request/ElevatorRequest.java +++ b/street/src/main/java/org/opentripplanner/street/search/request/ElevatorRequest.java @@ -4,7 +4,7 @@ import java.time.Duration; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.utils.lang.Units; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/street/src/main/java/org/opentripplanner/street/search/request/ParkingRequest.java b/street/src/main/java/org/opentripplanner/street/search/request/ParkingRequest.java index 4a0bee0ee95..8d7ea8a354e 100644 --- a/street/src/main/java/org/opentripplanner/street/search/request/ParkingRequest.java +++ b/street/src/main/java/org/opentripplanner/street/search/request/ParkingRequest.java @@ -5,7 +5,7 @@ import java.time.Duration; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.street.search.request.filter.ParkingFilter; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/street/src/main/java/org/opentripplanner/street/search/request/RentalRequest.java b/street/src/main/java/org/opentripplanner/street/search/request/RentalRequest.java index b0e9e6cf1cd..2a94807a883 100644 --- a/street/src/main/java/org/opentripplanner/street/search/request/RentalRequest.java +++ b/street/src/main/java/org/opentripplanner/street/search/request/RentalRequest.java @@ -6,7 +6,7 @@ import java.util.Objects; import java.util.Set; import java.util.function.Consumer; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.utils.tostring.ToStringBuilder; /** diff --git a/street/src/main/java/org/opentripplanner/street/search/request/VehicleWalkingRequest.java b/street/src/main/java/org/opentripplanner/street/search/request/VehicleWalkingRequest.java index 306ce3a6a2b..e09221898a0 100644 --- a/street/src/main/java/org/opentripplanner/street/search/request/VehicleWalkingRequest.java +++ b/street/src/main/java/org/opentripplanner/street/search/request/VehicleWalkingRequest.java @@ -3,7 +3,7 @@ import java.time.Duration; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.utils.lang.Units; import org.opentripplanner.utils.tostring.ToStringBuilder; diff --git a/street/src/test-fixtures/java/org/opentripplanner/core/model/id/FeedScopedIdFactory.java b/street/src/test-fixtures/java/org/opentripplanner/core/model/id/FeedScopedIdFactory.java index e99ea50c017..dac6711a5c9 100644 --- a/street/src/test-fixtures/java/org/opentripplanner/core/model/id/FeedScopedIdFactory.java +++ b/street/src/test-fixtures/java/org/opentripplanner/core/model/id/FeedScopedIdFactory.java @@ -1,7 +1,5 @@ package org.opentripplanner.core.model.id; -import org.opentripplanner.core.domain.model.id.FeedScopedId; - public class FeedScopedIdFactory { public static FeedScopedId id(String id) { diff --git a/street/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java b/street/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java index 5f62d100ad2..fa9596eda0c 100644 --- a/street/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java +++ b/street/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java @@ -7,11 +7,11 @@ import java.time.OffsetDateTime; import java.time.ZoneOffset; import javax.annotation.Nullable; -import org.opentripplanner.core.domain.model.basic.Distance; -import org.opentripplanner.core.domain.model.basic.Ratio; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.basic.Distance; +import org.opentripplanner.core.model.basic.Ratio; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.model.RentalFormFactor; public class TestFreeFloatingRentalVehicleBuilder { diff --git a/street/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/TestGeofencingZoneBuilder.java b/street/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/TestGeofencingZoneBuilder.java index a8c844bd7f4..53b93cbdff0 100644 --- a/street/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/TestGeofencingZoneBuilder.java +++ b/street/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/TestGeofencingZoneBuilder.java @@ -3,8 +3,8 @@ import java.util.List; import javax.annotation.Nullable; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; /** * Test builder for {@link GeofencingZone}. Provides readable test zone construction without diff --git a/street/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java b/street/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java index b52e427cae5..4ce982c1e22 100644 --- a/street/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java +++ b/street/src/test-fixtures/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java @@ -2,9 +2,9 @@ import java.util.HashMap; import java.util.Map; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.model.RentalFormFactor; public class TestVehicleRentalStationBuilder { diff --git a/street/src/test-fixtures/java/org/opentripplanner/street/linking/LinkingEnvironment.java b/street/src/test-fixtures/java/org/opentripplanner/street/linking/LinkingEnvironment.java index ad7e863a276..48f742cc593 100644 --- a/street/src/test-fixtures/java/org/opentripplanner/street/linking/LinkingEnvironment.java +++ b/street/src/test-fixtures/java/org/opentripplanner/street/linking/LinkingEnvironment.java @@ -7,7 +7,7 @@ import java.util.Objects; import javax.annotation.Nullable; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.service.vehiclerental.GeofencingZoneService; import org.opentripplanner.street.graph.Graph; import org.opentripplanner.street.graph.summary.DisposableEdgeDataFetcher; diff --git a/street/src/test-fixtures/java/org/opentripplanner/street/model/StreetModelFactory.java b/street/src/test-fixtures/java/org/opentripplanner/street/model/StreetModelFactory.java index afee0029ef9..9f735da0943 100644 --- a/street/src/test-fixtures/java/org/opentripplanner/street/model/StreetModelFactory.java +++ b/street/src/test-fixtures/java/org/opentripplanner/street/model/StreetModelFactory.java @@ -5,8 +5,8 @@ import java.time.Instant; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehiclerental.model.TestFreeFloatingRentalVehicleBuilder; import org.opentripplanner.service.vehiclerental.street.VehicleRentalPlaceVertex; diff --git a/street/src/test-fixtures/java/org/opentripplanner/street/model/edge/SimpleConcreteEdge.java b/street/src/test-fixtures/java/org/opentripplanner/street/model/edge/SimpleConcreteEdge.java index 6d410138407..de8a86400c5 100644 --- a/street/src/test-fixtures/java/org/opentripplanner/street/model/edge/SimpleConcreteEdge.java +++ b/street/src/test-fixtures/java/org/opentripplanner/street/model/edge/SimpleConcreteEdge.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.model.edge; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.state.State; diff --git a/street/src/test-fixtures/java/org/opentripplanner/street/model/edge/TestAreaGroupBuilder.java b/street/src/test-fixtures/java/org/opentripplanner/street/model/edge/TestAreaGroupBuilder.java index 8be2c278ab6..8e8ba5729a0 100644 --- a/street/src/test-fixtures/java/org/opentripplanner/street/model/edge/TestAreaGroupBuilder.java +++ b/street/src/test-fixtures/java/org/opentripplanner/street/model/edge/TestAreaGroupBuilder.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Set; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.vertex.IntersectionVertex; diff --git a/street/src/test-fixtures/java/org/opentripplanner/street/model/edge/TestEdge.java b/street/src/test-fixtures/java/org/opentripplanner/street/model/edge/TestEdge.java index 3a816e418bb..c8b31e004e8 100644 --- a/street/src/test-fixtures/java/org/opentripplanner/street/model/edge/TestEdge.java +++ b/street/src/test-fixtures/java/org/opentripplanner/street/model/edge/TestEdge.java @@ -2,7 +2,7 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.state.State; diff --git a/street/src/test-fixtures/java/org/opentripplanner/street/model/vertex/SimpleVertex.java b/street/src/test-fixtures/java/org/opentripplanner/street/model/vertex/SimpleVertex.java index 22a105167d9..d78c9e5fe1f 100644 --- a/street/src/test-fixtures/java/org/opentripplanner/street/model/vertex/SimpleVertex.java +++ b/street/src/test-fixtures/java/org/opentripplanner/street/model/vertex/SimpleVertex.java @@ -1,6 +1,6 @@ package org.opentripplanner.street.model.vertex; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; public class SimpleVertex extends StreetVertex { diff --git a/street/src/test-fixtures/java/org/opentripplanner/street/search/state/TestStateBuilder.java b/street/src/test-fixtures/java/org/opentripplanner/street/search/state/TestStateBuilder.java index 6b83228b110..ab3235af408 100644 --- a/street/src/test-fixtures/java/org/opentripplanner/street/search/state/TestStateBuilder.java +++ b/street/src/test-fixtures/java/org/opentripplanner/street/search/state/TestStateBuilder.java @@ -7,8 +7,8 @@ import java.util.Arrays; import java.util.List; import java.util.function.Consumer; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.service.vehiclerental.model.TestFreeFloatingRentalVehicleBuilder; import org.opentripplanner.service.vehiclerental.model.TestVehicleRentalStationBuilder; import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; diff --git a/street/src/test/java/org/opentripplanner/service/vehiclerental/street/geofencing/PreResolveVertexZonesTest.java b/street/src/test/java/org/opentripplanner/service/vehiclerental/street/geofencing/PreResolveVertexZonesTest.java index 3bf3bb3e581..875c9377ef9 100644 --- a/street/src/test/java/org/opentripplanner/service/vehiclerental/street/geofencing/PreResolveVertexZonesTest.java +++ b/street/src/test/java/org/opentripplanner/service/vehiclerental/street/geofencing/PreResolveVertexZonesTest.java @@ -5,8 +5,8 @@ import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.internal.DefaultVehicleRentalRepository; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; diff --git a/street/src/test/java/org/opentripplanner/street/graph/StreetIndexTest.java b/street/src/test/java/org/opentripplanner/street/graph/StreetIndexTest.java index 17fa31ff540..ddbc39ad9b8 100644 --- a/street/src/test/java/org/opentripplanner/street/graph/StreetIndexTest.java +++ b/street/src/test/java/org/opentripplanner/street/graph/StreetIndexTest.java @@ -5,8 +5,8 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.street.model.vertex.StationCentroidVertex; diff --git a/street/src/test/java/org/opentripplanner/street/integration/BikeRentalTest.java b/street/src/test/java/org/opentripplanner/street/integration/BikeRentalTest.java index 4229afbfb66..a979e5e5571 100644 --- a/street/src/test/java/org/opentripplanner/street/integration/BikeRentalTest.java +++ b/street/src/test/java/org/opentripplanner/street/integration/BikeRentalTest.java @@ -1,7 +1,7 @@ package org.opentripplanner.street.integration; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.core.domain.model.basic.Cost.costOfSeconds; +import static org.opentripplanner.core.model.basic.Cost.costOfSeconds; import java.time.Duration; import java.util.List; diff --git a/street/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java b/street/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java index fa303c1ecb5..5991b3d62e4 100644 --- a/street/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java +++ b/street/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java @@ -1,7 +1,7 @@ package org.opentripplanner.street.integration; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.core.domain.model.basic.Cost.costOfSeconds; +import static org.opentripplanner.core.model.basic.Cost.costOfSeconds; import java.time.Duration; import java.util.List; diff --git a/street/src/test/java/org/opentripplanner/street/integration/GraphRoutingTest.java b/street/src/test/java/org/opentripplanner/street/integration/GraphRoutingTest.java index e9ecebd0477..03b01f685a1 100644 --- a/street/src/test/java/org/opentripplanner/street/integration/GraphRoutingTest.java +++ b/street/src/test/java/org/opentripplanner/street/integration/GraphRoutingTest.java @@ -6,10 +6,10 @@ import java.util.List; import java.util.Map; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.accessibility.Accessibility; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehicleparking.model.VehicleParking.VehicleParkingEntranceCreator; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; diff --git a/street/src/test/java/org/opentripplanner/street/integration/ParkAndRideTest.java b/street/src/test/java/org/opentripplanner/street/integration/ParkAndRideTest.java index dbaa9f41f95..d6e44254e71 100644 --- a/street/src/test/java/org/opentripplanner/street/integration/ParkAndRideTest.java +++ b/street/src/test/java/org/opentripplanner/street/integration/ParkAndRideTest.java @@ -8,7 +8,7 @@ import java.util.Locale; import java.util.Set; import java.util.stream.Collectors; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.street.graph.Graph; import org.opentripplanner.street.model.StreetMode; import org.opentripplanner.street.model.vertex.StreetVertex; diff --git a/street/src/test/java/org/opentripplanner/street/integration/ScooterRentalGeofencingTest.java b/street/src/test/java/org/opentripplanner/street/integration/ScooterRentalGeofencingTest.java index be96c099c11..fd771635fee 100644 --- a/street/src/test/java/org/opentripplanner/street/integration/ScooterRentalGeofencingTest.java +++ b/street/src/test/java/org/opentripplanner/street/integration/ScooterRentalGeofencingTest.java @@ -11,9 +11,9 @@ import java.util.stream.Collectors; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.TestGeofencingZoneBuilder; diff --git a/street/src/test/java/org/opentripplanner/street/linking/AreaEdgePropertiesTest.java b/street/src/test/java/org/opentripplanner/street/linking/AreaEdgePropertiesTest.java index 3a770e850ff..28ba17d6dbc 100644 --- a/street/src/test/java/org/opentripplanner/street/linking/AreaEdgePropertiesTest.java +++ b/street/src/test/java/org/opentripplanner/street/linking/AreaEdgePropertiesTest.java @@ -6,7 +6,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.edge.Area; diff --git a/street/src/test/java/org/opentripplanner/street/linking/FlexLinkingTest.java b/street/src/test/java/org/opentripplanner/street/linking/FlexLinkingTest.java index a36ee468bb7..00c7ef74502 100644 --- a/street/src/test/java/org/opentripplanner/street/linking/FlexLinkingTest.java +++ b/street/src/test/java/org/opentripplanner/street/linking/FlexLinkingTest.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.core.model.id.FeedScopedIdFactory; import org.opentripplanner.street.model.StreetModelFactory; import org.opentripplanner.street.model.vertex.StreetVertex; diff --git a/street/src/test/java/org/opentripplanner/street/linking/PlatformLinkingTest.java b/street/src/test/java/org/opentripplanner/street/linking/PlatformLinkingTest.java index a98f19b9278..21b79acc961 100644 --- a/street/src/test/java/org/opentripplanner/street/linking/PlatformLinkingTest.java +++ b/street/src/test/java/org/opentripplanner/street/linking/PlatformLinkingTest.java @@ -16,8 +16,8 @@ import org.locationtech.jts.geom.GeometryFactory; import org.locationtech.jts.geom.LineString; import org.locationtech.jts.geom.Polygon; -import org.opentripplanner.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.LocalizedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.LocalizedString; import org.opentripplanner.service.vehiclerental.GeofencingZoneService; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.graph.Graph; diff --git a/street/src/test/java/org/opentripplanner/street/linking/PreparedAreaGroupTest.java b/street/src/test/java/org/opentripplanner/street/linking/PreparedAreaGroupTest.java index f95062e6538..f0e3d1c19a6 100644 --- a/street/src/test/java/org/opentripplanner/street/linking/PreparedAreaGroupTest.java +++ b/street/src/test/java/org/opentripplanner/street/linking/PreparedAreaGroupTest.java @@ -11,7 +11,7 @@ import org.locationtech.jts.geom.GeometryFactory; import org.locationtech.jts.geom.LinearRing; import org.locationtech.jts.geom.Polygon; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.edge.Area; diff --git a/street/src/test/java/org/opentripplanner/street/linking/TemporaryVerticesContainerTest.java b/street/src/test/java/org/opentripplanner/street/linking/TemporaryVerticesContainerTest.java index 98ac8fa379f..7371f678bd2 100644 --- a/street/src/test/java/org/opentripplanner/street/linking/TemporaryVerticesContainerTest.java +++ b/street/src/test/java/org/opentripplanner/street/linking/TemporaryVerticesContainerTest.java @@ -6,7 +6,7 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.service.vehiclerental.GeofencingZoneService; import org.opentripplanner.street.graph.Graph; import org.opentripplanner.street.model.StreetModelFactory; diff --git a/street/src/test/java/org/opentripplanner/street/linking/VehicleParkingHelperTest.java b/street/src/test/java/org/opentripplanner/street/linking/VehicleParkingHelperTest.java index 774ceca3fb9..ce545d486c7 100644 --- a/street/src/test/java/org/opentripplanner/street/linking/VehicleParkingHelperTest.java +++ b/street/src/test/java/org/opentripplanner/street/linking/VehicleParkingHelperTest.java @@ -7,8 +7,8 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.id.FeedScopedId; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehicleparking.model.VehicleParking.VehicleParkingEntranceCreator; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/street/src/test/java/org/opentripplanner/street/linking/VertexLinkerGeofencingTest.java b/street/src/test/java/org/opentripplanner/street/linking/VertexLinkerGeofencingTest.java index e826f40b247..eccf345f826 100644 --- a/street/src/test/java/org/opentripplanner/street/linking/VertexLinkerGeofencingTest.java +++ b/street/src/test/java/org/opentripplanner/street/linking/VertexLinkerGeofencingTest.java @@ -13,7 +13,7 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Polygon; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.service.vehiclerental.GeofencingZoneService; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; import org.opentripplanner.service.vehiclerental.model.TestGeofencingZoneBuilder; diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/AreaEdgeBuilderTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/AreaEdgeBuilderTest.java index e1e335b92ed..de0470e084c 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/AreaEdgeBuilderTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/AreaEdgeBuilderTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.StreetModelFactory; import org.opentripplanner.street.model.StreetTraversalPermission; diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/ElevatorHopEdgeTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/ElevatorHopEdgeTest.java index 4e8ccf945a6..15a00c04e24 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/ElevatorHopEdgeTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/ElevatorHopEdgeTest.java @@ -11,7 +11,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.model.accessibility.Accessibility; import org.opentripplanner.street.model.StreetMode; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.vertex.Vertex; diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java index 2138f7e0c48..c4c79471b34 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.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.core.domain.model.i18n.I18NString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.street.model.StreetMode; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.request.StreetSearchRequest; diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeBuilderTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeBuilderTest.java index 38e75566e96..2ea2cb4e095 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeBuilderTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeBuilderTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.StreetModelFactory; import org.opentripplanner.street.model.StreetTraversalPermission; diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeSplittingTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeSplittingTest.java index 6bf3da88536..878d7459199 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeSplittingTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeSplittingTest.java @@ -9,7 +9,7 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.GeometryFactory; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.geometry.SphericalDistanceLibrary; import org.opentripplanner.street.model.StreetTraversalPermission; diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java index 12750e7c5bc..15addcad09f 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java @@ -19,8 +19,8 @@ import org.locationtech.jts.geom.GeometryFactory; import org.locationtech.jts.geom.LineString; import org.locationtech.jts.geom.impl.PackedCoordinateSequence; -import org.opentripplanner.core.domain.model.basic.Cost; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.StreetMode; import org.opentripplanner.street.model.StreetModelFactory; diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/StreetTransitEntityLinkTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/StreetTransitEntityLinkTest.java index 2eb991081d0..f89cfd4a11c 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/StreetTransitEntityLinkTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/StreetTransitEntityLinkTest.java @@ -3,9 +3,9 @@ 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.core.domain.model.accessibility.Accessibility.NOT_POSSIBLE; -import static org.opentripplanner.core.domain.model.accessibility.Accessibility.NO_INFORMATION; -import static org.opentripplanner.core.domain.model.accessibility.Accessibility.POSSIBLE; +import static org.opentripplanner.core.model.accessibility.Accessibility.NOT_POSSIBLE; +import static org.opentripplanner.core.model.accessibility.Accessibility.NO_INFORMATION; +import static org.opentripplanner.core.model.accessibility.Accessibility.POSSIBLE; import static org.opentripplanner.core.model.id.FeedScopedIdFactory.id; import java.util.List; @@ -16,7 +16,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Point; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.model.accessibility.Accessibility; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.StreetMode; import org.opentripplanner.street.model.StreetModelFactory; diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java index 2c94914e18f..bba2e535865 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java @@ -14,8 +14,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.domain.model.basic.Cost; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehicleparking.model.VehicleParkingEntrance; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeBuilderTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeBuilderTest.java index 5e4a01f9f4e..d44843abd76 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeBuilderTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeBuilderTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.StreetModelFactory; import org.opentripplanner.street.model.StreetTraversalPermission; diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeTest.java index a645e8475b1..80cf41bf7f5 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdgeTest.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.StreetMode; import org.opentripplanner.street.model.StreetModelFactory; diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingEdgeTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingEdgeTest.java index 105c758af46..684d30d28c6 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingEdgeTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingEdgeTest.java @@ -6,7 +6,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.service.vehicleparking.model.VehicleParking; import org.opentripplanner.service.vehicleparking.model.VehicleParkingSpaces; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingPreferredTagsTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingPreferredTagsTest.java index 17675edcdd0..c738de4783a 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingPreferredTagsTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingPreferredTagsTest.java @@ -9,8 +9,8 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.core.domain.model.basic.Cost; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.basic.Cost; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.service.vehicleparking.model.VehicleParkingEntrance; import org.opentripplanner.service.vehicleparking.model.VehicleParkingSpaces; import org.opentripplanner.street.geometry.WgsCoordinate; diff --git a/street/src/test/java/org/opentripplanner/street/model/openinghours/OHCalendarTest.java b/street/src/test/java/org/opentripplanner/street/model/openinghours/OHCalendarTest.java index 0a0108d83ff..09e077b87c0 100644 --- a/street/src/test/java/org/opentripplanner/street/model/openinghours/OHCalendarTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/openinghours/OHCalendarTest.java @@ -12,7 +12,7 @@ import java.time.Month; import java.time.ZoneId; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.framework.deduplicator.DeduplicatorService; +import org.opentripplanner.core.model.deduplicator.DeduplicatorService; class OHCalendarTest { diff --git a/street/src/test/java/org/opentripplanner/street/model/vertex/BarrierVertexTest.java b/street/src/test/java/org/opentripplanner/street/model/vertex/BarrierVertexTest.java index cdee7495678..0c3b18d4f8f 100644 --- a/street/src/test/java/org/opentripplanner/street/model/vertex/BarrierVertexTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/vertex/BarrierVertexTest.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.accessibility.Accessibility; +import org.opentripplanner.core.model.accessibility.Accessibility; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.StreetModelFactory; import org.opentripplanner.street.model.StreetTraversalPermission; diff --git a/street/src/test/java/org/opentripplanner/street/model/vertex/OsmVertexTest.java b/street/src/test/java/org/opentripplanner/street/model/vertex/OsmVertexTest.java index 60263ba1ab3..4ef0f6f4f23 100644 --- a/street/src/test/java/org/opentripplanner/street/model/vertex/OsmVertexTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/vertex/OsmVertexTest.java @@ -7,7 +7,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.id.FeedScopedId; +import org.opentripplanner.core.model.id.FeedScopedId; class OsmVertexTest { diff --git a/street/src/test/java/org/opentripplanner/street/model/vertex/TemporaryVertexDisposeTest.java b/street/src/test/java/org/opentripplanner/street/model/vertex/TemporaryVertexDisposeTest.java index 769a5ce2e3b..c4f3c936f41 100644 --- a/street/src/test/java/org/opentripplanner/street/model/vertex/TemporaryVertexDisposeTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/vertex/TemporaryVertexDisposeTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.i18n.I18NString; +import org.opentripplanner.core.model.i18n.I18NString; import org.opentripplanner.street.model.edge.FreeEdge; public class TemporaryVertexDisposeTest { diff --git a/street/src/test/java/org/opentripplanner/street/search/intersection_model/SimpleIntersectionTraversalCalculatorTest.java b/street/src/test/java/org/opentripplanner/street/search/intersection_model/SimpleIntersectionTraversalCalculatorTest.java index 803469df648..b415db9926a 100644 --- a/street/src/test/java/org/opentripplanner/street/search/intersection_model/SimpleIntersectionTraversalCalculatorTest.java +++ b/street/src/test/java/org/opentripplanner/street/search/intersection_model/SimpleIntersectionTraversalCalculatorTest.java @@ -13,7 +13,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.core.domain.model.i18n.NonLocalizedString; +import org.opentripplanner.core.model.i18n.NonLocalizedString; import org.opentripplanner.street.geometry.GeometryUtils; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.edge.StreetEdge; diff --git a/street/src/test/java/org/opentripplanner/street/search/request/BikeRequestTest.java b/street/src/test/java/org/opentripplanner/street/search/request/BikeRequestTest.java index 83d993dc193..b60a03f4f65 100644 --- a/street/src/test/java/org/opentripplanner/street/search/request/BikeRequestTest.java +++ b/street/src/test/java/org/opentripplanner/street/search/request/BikeRequestTest.java @@ -6,7 +6,7 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.street.model.VehicleRoutingOptimizeType; class BikeRequestTest { diff --git a/street/src/test/java/org/opentripplanner/street/search/request/CarRequestTest.java b/street/src/test/java/org/opentripplanner/street/search/request/CarRequestTest.java index 9c505085753..07848406f87 100644 --- a/street/src/test/java/org/opentripplanner/street/search/request/CarRequestTest.java +++ b/street/src/test/java/org/opentripplanner/street/search/request/CarRequestTest.java @@ -6,7 +6,7 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; class CarRequestTest { diff --git a/street/src/test/java/org/opentripplanner/street/search/request/ParkingRequestTest.java b/street/src/test/java/org/opentripplanner/street/search/request/ParkingRequestTest.java index 0c990f393dc..6d577a49ee0 100644 --- a/street/src/test/java/org/opentripplanner/street/search/request/ParkingRequestTest.java +++ b/street/src/test/java/org/opentripplanner/street/search/request/ParkingRequestTest.java @@ -1,13 +1,13 @@ package org.opentripplanner.street.search.request; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.core.domain.model.basic.Cost.costOfSeconds; +import static org.opentripplanner.core.model.basic.Cost.costOfSeconds; import static org.opentripplanner.street.search.request.ImmutableRequestAsserts.assertEqualsAndHashCode; import java.time.Duration; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; import org.opentripplanner.street.search.request.filter.ParkingFilter; import org.opentripplanner.street.search.request.filter.ParkingSelect.TagsSelect; diff --git a/street/src/test/java/org/opentripplanner/street/search/request/RentalRequestTest.java b/street/src/test/java/org/opentripplanner/street/search/request/RentalRequestTest.java index 6de9cad754a..65f3c0a4c6f 100644 --- a/street/src/test/java/org/opentripplanner/street/search/request/RentalRequestTest.java +++ b/street/src/test/java/org/opentripplanner/street/search/request/RentalRequestTest.java @@ -2,13 +2,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; -import static org.opentripplanner.core.domain.model.basic.Cost.costOfSeconds; +import static org.opentripplanner.core.model.basic.Cost.costOfSeconds; import static org.opentripplanner.street.search.request.ImmutableRequestAsserts.assertEqualsAndHashCode; import java.time.Duration; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; class RentalRequestTest { diff --git a/street/src/test/java/org/opentripplanner/street/search/request/VehicleWalkingRequestTest.java b/street/src/test/java/org/opentripplanner/street/search/request/VehicleWalkingRequestTest.java index 7b12b4b01ff..5557d62b5ba 100644 --- a/street/src/test/java/org/opentripplanner/street/search/request/VehicleWalkingRequestTest.java +++ b/street/src/test/java/org/opentripplanner/street/search/request/VehicleWalkingRequestTest.java @@ -5,7 +5,7 @@ import java.time.Duration; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.domain.model.basic.Cost; +import org.opentripplanner.core.model.basic.Cost; class VehicleWalkingRequestTest { From 3b17d205e05a726ae02f7822aa116be3d33492d3 Mon Sep 17 00:00:00 2001 From: Ville Pihlava Date: Tue, 22 Sep 2026 11:29:37 +0300 Subject: [PATCH 46/68] Rename steps variable to stairCount. --- .../street/model/edge/PathwayEdge.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/street/src/main/java/org/opentripplanner/street/model/edge/PathwayEdge.java b/street/src/main/java/org/opentripplanner/street/model/edge/PathwayEdge.java index c89097543e0..cc045d720e9 100644 --- a/street/src/main/java/org/opentripplanner/street/model/edge/PathwayEdge.java +++ b/street/src/main/java/org/opentripplanner/street/model/edge/PathwayEdge.java @@ -25,7 +25,7 @@ public class PathwayEdge extends Edge implements BikeWalkableEdge, WheelchairTra private final int traversalTime; private final double distance; - private final int steps; + private final int stairCount; private final double slope; private final boolean wheelchairAccessible; @@ -36,21 +36,21 @@ private PathwayEdge( @Nullable I18NString signpostedAs, int traversalTime, double distance, - int steps, + int stairCount, double slope, boolean wheelchairAccessible ) { super(fromv, tov); this.signpostedAs = signpostedAs; this.traversalTime = traversalTime; - this.steps = steps; + this.stairCount = stairCount; this.slope = slope; this.wheelchairAccessible = wheelchairAccessible; this.distance = distance; } /** - * Create a PathwayEdge that doesn't have a traversal time, distance or steps. + * Create a PathwayEdge that doesn't have a traversal time, distance or stairCount. *

    * These are for edges which have an implied cost of almost zero just like a FreeEdge has. */ @@ -68,7 +68,7 @@ public static PathwayEdge createPathwayEdge( I18NString signpostedAs, int traversalTime, double distance, - int steps, + int stairCount, double slope, boolean wheelchairAccessible ) { @@ -79,7 +79,7 @@ public static PathwayEdge createPathwayEdge( signpostedAs, traversalTime, distance, - steps, + stairCount, slope, wheelchairAccessible ) @@ -102,7 +102,7 @@ public State[] traverse(State s0) { time_ms = (long) ((1000.0 * distance) / request.walk().speed()); } else if (isStairs()) { // 1 step corresponds to 20cm, doubling that to compensate for elevation; - time_ms = (long) ((1000.0 * 0.4 * Math.abs(steps)) / request.walk().speed()); + time_ms = (long) ((1000.0 * 0.4 * Math.abs(stairCount)) / request.walk().speed()); } } @@ -126,7 +126,7 @@ public State[] traverse(State s0) { s1.incrementTimeInMilliseconds(time_ms); s1.incrementWeight(weight); } else { - // elevators often don't have a traversal time, distance or steps, so we need to add + // elevators often don't have a traversal time, distance or stairCount, so we need to add // _some_ cost. the real cost is added in ElevatorHopEdge. // adding a cost of 1 is analogous to FreeEdge s1.incrementWeight(1); @@ -174,8 +174,8 @@ public double getEffectiveWalkDistance() { } } - public int getSteps() { - return steps; + public int getStairCount() { + return stairCount; } @Override @@ -184,6 +184,6 @@ public boolean isWheelchairAccessible() { } private boolean isStairs() { - return steps != 0; + return stairCount != 0; } } From 067a083da3fd66da86989d110459757631f40a73 Mon Sep 17 00:00:00 2001 From: Ville Pihlava Date: Tue, 22 Sep 2026 11:29:51 +0300 Subject: [PATCH 47/68] Extract test constant and fix format. --- .../street/model/edge/PathwayEdgeTest.java | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java index 82fc062bee3..4dfff1de1b1 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java @@ -21,18 +21,19 @@ class PathwayEdgeTest { + private static final NonLocalizedString PATHWAY_NAME = new NonLocalizedString("pathway"); + Vertex from = intersectionVertex(10, 10); Vertex to = intersectionVertex(10.001, 10.001); @Test void zeroLength() { - // if elevators have a traversal time and distance of 0 we cannot interpolate - // the distance + // if elevators have a traversal time and distance of 0 we cannot interpolate the distance // from the vertices as they most likely have identical coordinates var edge = PathwayEdge.createPathwayEdge( from, to, - new NonLocalizedString("pathway"), + PATHWAY_NAME, 0, 0, 0, @@ -48,7 +49,7 @@ void zeroLengthWithSteps() { var edge = PathwayEdge.createPathwayEdge( from, to, - new NonLocalizedString("pathway"), + PATHWAY_NAME, 0, 0, 2, @@ -64,7 +65,7 @@ void traversalTime() { var edge = PathwayEdge.createPathwayEdge( from, to, - new NonLocalizedString("pathway"), + PATHWAY_NAME, 60, 0, 0, @@ -82,7 +83,7 @@ void traversalTimeOverridesLength() { var edge = PathwayEdge.createPathwayEdge( from, to, - new NonLocalizedString("pathway"), + PATHWAY_NAME, 60, 1000, 0, @@ -102,7 +103,7 @@ void distance() { var edge = PathwayEdge.createPathwayEdge( from, to, - new NonLocalizedString("pathway"), + PATHWAY_NAME, 0, 60, 0, @@ -120,7 +121,7 @@ void wheelchair() { var edge = PathwayEdge.createPathwayEdge( from, to, - new NonLocalizedString("pathway"), + PATHWAY_NAME, 0, 60, 0, @@ -138,7 +139,7 @@ void wheelchairNegativeStepsTreatedAsStairs() { var down = PathwayEdge.createPathwayEdge( from, to, - new NonLocalizedString("pathway"), + PATHWAY_NAME, 0, 0, -10, @@ -148,7 +149,7 @@ void wheelchairNegativeStepsTreatedAsStairs() { var up = PathwayEdge.createPathwayEdge( from, to, - new NonLocalizedString("pathway"), + PATHWAY_NAME, 0, 0, 10, @@ -180,13 +181,10 @@ static Stream slopeCases() { } /** - * This makes sure that when you exceed the max slope in a wheelchair there - * isn't a hard cut-off - * but rather the cost increases proportional to how much you go over the - * maximum. + * This makes sure that when you exceed the max slope in a wheelchair there isn't a hard cut-off + * but rather the cost increases proportional to how much you go over the maximum. *

    - * In other words: 0.1 % over the limit only has a small cost but 2% over - * increases it + * In other words: 0.1 % over the limit only has a small cost but 2% over increases it * dramatically to the point where it's only used as a last resort. */ @ParameterizedTest(name = "slope of {0} should lead to traversal costs of {1}") @@ -195,7 +193,7 @@ void shouldScaleCostWithMaxSlope(double slope, long expectedCost) { var edge = PathwayEdge.createPathwayEdge( from, to, - new NonLocalizedString("pathway"), + PATHWAY_NAME, 60, 100, 0, From e662e72c6d37265006a494fc19f303a35b9f7364 Mon Sep 17 00:00:00 2001 From: Ville Pihlava Date: Tue, 22 Sep 2026 11:34:44 +0300 Subject: [PATCH 48/68] Fix format. --- .../street/model/edge/PathwayEdgeTest.java | 99 ++----------------- 1 file changed, 9 insertions(+), 90 deletions(-) diff --git a/street/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java b/street/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java index 4dfff1de1b1..a0f88a111b8 100644 --- a/street/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java +++ b/street/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java @@ -30,48 +30,21 @@ class PathwayEdgeTest { void zeroLength() { // if elevators have a traversal time and distance of 0 we cannot interpolate the distance // from the vertices as they most likely have identical coordinates - var edge = PathwayEdge.createPathwayEdge( - from, - to, - PATHWAY_NAME, - 0, - 0, - 0, - 0, - true - ); + var edge = PathwayEdge.createPathwayEdge(from, to, PATHWAY_NAME, 0, 0, 0, 0, true); assertThatEdgeIsTraversable(edge); } @Test void zeroLengthWithSteps() { - var edge = PathwayEdge.createPathwayEdge( - from, - to, - PATHWAY_NAME, - 0, - 0, - 2, - 0, - true - ); + var edge = PathwayEdge.createPathwayEdge(from, to, PATHWAY_NAME, 0, 0, 2, 0, true); assertThatEdgeIsTraversable(edge); } @Test void traversalTime() { - var edge = PathwayEdge.createPathwayEdge( - from, - to, - PATHWAY_NAME, - 60, - 0, - 0, - 0, - true - ); + var edge = PathwayEdge.createPathwayEdge(from, to, PATHWAY_NAME, 60, 0, 0, 0, true); var state = assertThatEdgeIsTraversable(edge); assertEquals(60, state.getElapsedTimeSeconds()); @@ -80,16 +53,7 @@ void traversalTime() { @Test void traversalTimeOverridesLength() { - var edge = PathwayEdge.createPathwayEdge( - from, - to, - PATHWAY_NAME, - 60, - 1000, - 0, - 0, - true - ); + var edge = PathwayEdge.createPathwayEdge(from, to, PATHWAY_NAME, 60, 1000, 0, 0, true); assertEquals(1000, edge.getDistanceMeters()); @@ -100,16 +64,7 @@ void traversalTimeOverridesLength() { @Test void distance() { - var edge = PathwayEdge.createPathwayEdge( - from, - to, - PATHWAY_NAME, - 0, - 60, - 0, - 0, - true - ); + var edge = PathwayEdge.createPathwayEdge(from, to, PATHWAY_NAME, 0, 60, 0, 0, true); var state = assertThatEdgeIsTraversable(edge); assertEquals(6, state.getElapsedTimeSeconds()); @@ -118,16 +73,7 @@ void distance() { @Test void wheelchair() { - var edge = PathwayEdge.createPathwayEdge( - from, - to, - PATHWAY_NAME, - 0, - 60, - 0, - 0, - false - ); + var edge = PathwayEdge.createPathwayEdge(from, to, PATHWAY_NAME, 0, 60, 0, 0, false); var state = assertThatEdgeIsTraversable(edge, true); assertEquals(6, state.getElapsedTimeSeconds()); @@ -136,26 +82,8 @@ void wheelchair() { @Test void wheelchairNegativeStepsTreatedAsStairs() { - var down = PathwayEdge.createPathwayEdge( - from, - to, - PATHWAY_NAME, - 0, - 0, - -10, - 0, - true - ); - var up = PathwayEdge.createPathwayEdge( - from, - to, - PATHWAY_NAME, - 0, - 0, - 10, - 0, - true - ); + var down = PathwayEdge.createPathwayEdge(from, to, PATHWAY_NAME, 0, 0, -10, 0, true); + var up = PathwayEdge.createPathwayEdge(from, to, PATHWAY_NAME, 0, 0, 10, 0, true); var downState = assertThatEdgeIsTraversable(down, true); var upState = assertThatEdgeIsTraversable(up, true); @@ -190,16 +118,7 @@ static Stream slopeCases() { @ParameterizedTest(name = "slope of {0} should lead to traversal costs of {1}") @MethodSource("slopeCases") void shouldScaleCostWithMaxSlope(double slope, long expectedCost) { - var edge = PathwayEdge.createPathwayEdge( - from, - to, - PATHWAY_NAME, - 60, - 100, - 0, - slope, - true - ); + var edge = PathwayEdge.createPathwayEdge(from, to, PATHWAY_NAME, 60, 100, 0, slope, true); var state = assertThatEdgeIsTraversable(edge, true); assertEquals(60, state.getElapsedTimeSeconds()); From 9d6ce3db950a1a89e172c7dfc25727fe4d78830a Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Tue, 22 Sep 2026 09:49:25 +0000 Subject: [PATCH 49/68] Add changelog entry for #8027 [ci skip] --- doc/user/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/Changelog.md b/doc/user/Changelog.md index 81cd2ef5eec..218f1ec8736 100644 --- a/doc/user/Changelog.md +++ b/doc/user/Changelog.md @@ -15,6 +15,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Decode OSM PBF data in parallel [#8008](https://github.com/opentripplanner/OpenTripPlanner/pull/8008) - Verify who labeled the PRs merged by the custom release script [#8018](https://github.com/opentripplanner/OpenTripPlanner/pull/8018) - Use custom collections to speed up island pruning [#7990](https://github.com/opentripplanner/OpenTripPlanner/pull/7990) +- Treat negative `stair_count` as stairs in `PathwayEdge` [#8027](https://github.com/opentripplanner/OpenTripPlanner/pull/8027) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.10.0 (2026-09-09) From b679bf4e78458b2bef74882b64f72ac99ef099c8 Mon Sep 17 00:00:00 2001 From: OTP Serialization Version Bot Date: Tue, 22 Sep 2026 09:49:55 +0000 Subject: [PATCH 50/68] Bump serialization version id for #8027 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d190b38db2b..0cf9b6608eb 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ - 278 + 279 34.5 From 4fdc192cd06aeb773dfe6728cd8b3a0d86ae6ae0 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Tue, 22 Sep 2026 12:21:55 +0200 Subject: [PATCH 51/68] fix: update stale core.domain package reference in graphql-codegen.yml --- .../org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml b/application/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml index 8140a2bc39d..3d21729de59 100644 --- a/application/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml +++ b/application/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml @@ -27,7 +27,7 @@ config: GeoJson: org.locationtech.jts.geom.Geometry Grams: org.opentripplanner.framework.model.Gram Duration: java.time.Duration - Cost: org.opentripplanner.core.domain.model.basic.Cost + Cost: org.opentripplanner.core.model.basic.Cost CoordinateValue: Double Locale: java.util.Locale OffsetDateTime: java.time.OffsetDateTime From b2e3a1b50ba4dabbeb57c943e4718e33d43ab501 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Tue, 22 Sep 2026 14:44:07 +0200 Subject: [PATCH 52/68] fix: configure Spotless in core/framework and raptor/data --- core/framework/pom.xml | 4 ++-- .../internal/DefaultRepositoryRegistry.java | 4 ++-- .../transaction/internal/DefaultUpdateManager.java | 2 +- .../framework/transaction/internal/Transaction.java | 2 +- .../moduletest/TransactionFrameworkTest.java | 10 +++++----- .../customer/internal/CustomerRepositoryLifecycle.java | 2 +- .../candyshop/event/CustomerEventHandler.java | 2 +- .../moduletest/candyshop/event/OrderEventHandler.java | 2 +- .../order/internal/OrderRepositoryLifecycle.java | 2 +- raptor/data/pom.xml | 4 ++-- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/core/framework/pom.xml b/core/framework/pom.xml index ce4b9fcd92a..e6d6df7e934 100644 --- a/core/framework/pom.xml +++ b/core/framework/pom.xml @@ -16,8 +16,8 @@ - com.hubspot.maven.plugins - prettier-maven-plugin + com.diffplug.spotless + spotless-maven-plugin diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultRepositoryRegistry.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultRepositoryRegistry.java index c26710767a0..0d17f4915d4 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultRepositoryRegistry.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultRepositoryRegistry.java @@ -1,10 +1,10 @@ package org.opentripplanner.core.framework.transaction.internal; -import org.opentripplanner.core.model.transaction.RepositoryRegistry; -import org.opentripplanner.core.model.transaction.UpdateManager; import org.opentripplanner.core.model.transaction.RepositoryHandle; import org.opentripplanner.core.model.transaction.RepositoryLifecycle; +import org.opentripplanner.core.model.transaction.RepositoryRegistry; import org.opentripplanner.core.model.transaction.TransactionScope; +import org.opentripplanner.core.model.transaction.UpdateManager; /** * Default implementation of {@link RepositoryRegistry}. diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultUpdateManager.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultUpdateManager.java index 45251cde660..a2c17a5ba61 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultUpdateManager.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/DefaultUpdateManager.java @@ -15,8 +15,8 @@ import javax.annotation.Nullable; import org.opentripplanner.core.model.event.DomainEvent; import org.opentripplanner.core.model.event.EventHandler; -import org.opentripplanner.core.model.transaction.UpdateManager; import org.opentripplanner.core.model.transaction.RepositoryHandle; +import org.opentripplanner.core.model.transaction.UpdateManager; import org.opentripplanner.core.model.transaction.WriteContext; /** diff --git a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/Transaction.java b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/Transaction.java index 10e83073bac..090c082d8d5 100644 --- a/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/Transaction.java +++ b/core/framework/src/main/java/org/opentripplanner/core/framework/transaction/internal/Transaction.java @@ -2,8 +2,8 @@ import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.core.model.transaction.UpdateManager; import org.opentripplanner.core.model.transaction.TransactionScope; +import org.opentripplanner.core.model.transaction.UpdateManager; /** * An opaque identity token representing a single committed state of the repository set. diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/TransactionFrameworkTest.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/TransactionFrameworkTest.java index 9973f2fb6a9..deb65975371 100644 --- a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/TransactionFrameworkTest.java +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/TransactionFrameworkTest.java @@ -13,11 +13,6 @@ import java.util.function.Function; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.core.model.transaction.RepositoryRegistry; -import org.opentripplanner.core.model.transaction.UpdateManager; -import org.opentripplanner.core.model.transaction.RepositoryHandle; -import org.opentripplanner.core.model.transaction.TransactionScope; -import org.opentripplanner.core.model.transaction.WriteContext; import org.opentripplanner.core.framework.transaction.internal.TransactionFactory; import org.opentripplanner.core.framework.transaction.moduletest.candyshop.base.Entity; import org.opentripplanner.core.framework.transaction.moduletest.candyshop.base.EntityIdProvider; @@ -34,6 +29,11 @@ import org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.internal.DefaultOrderRepository; import org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.internal.OrderRepositoryLifecycle; import org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.model.Order; +import org.opentripplanner.core.model.transaction.RepositoryHandle; +import org.opentripplanner.core.model.transaction.RepositoryRegistry; +import org.opentripplanner.core.model.transaction.TransactionScope; +import org.opentripplanner.core.model.transaction.UpdateManager; +import org.opentripplanner.core.model.transaction.WriteContext; /** * This test demonstrates how the snapshot framework can be used with two repositories. The example diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/internal/CustomerRepositoryLifecycle.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/internal/CustomerRepositoryLifecycle.java index daf49ab788d..fa93e1a203f 100644 --- a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/internal/CustomerRepositoryLifecycle.java +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/customer/internal/CustomerRepositoryLifecycle.java @@ -1,8 +1,8 @@ package org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.internal; -import org.opentripplanner.core.model.transaction.RepositoryLifecycle; import org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.CustomerRepository; import org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.CustomerRepositorySnapshot; +import org.opentripplanner.core.model.transaction.RepositoryLifecycle; /** * This life-cycle will create a new mutable repository for each transaction and freeze it into a diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/CustomerEventHandler.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/CustomerEventHandler.java index 974dd890bb7..70ca179ded8 100644 --- a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/CustomerEventHandler.java +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/CustomerEventHandler.java @@ -1,8 +1,8 @@ package org.opentripplanner.core.framework.transaction.moduletest.candyshop.event; -import org.opentripplanner.core.model.event.EventHandler; import org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.CustomerRepository; import org.opentripplanner.core.framework.transaction.moduletest.candyshop.customer.model.Customer; +import org.opentripplanner.core.model.event.EventHandler; public class CustomerEventHandler implements EventHandler diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/OrderEventHandler.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/OrderEventHandler.java index d5417e0db75..0dfc4758dd4 100644 --- a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/OrderEventHandler.java +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/event/OrderEventHandler.java @@ -1,8 +1,8 @@ package org.opentripplanner.core.framework.transaction.moduletest.candyshop.event; -import org.opentripplanner.core.model.event.EventHandler; import org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.OrderRepository; import org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.model.Order; +import org.opentripplanner.core.model.event.EventHandler; public class OrderEventHandler implements EventHandler { diff --git a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/internal/OrderRepositoryLifecycle.java b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/internal/OrderRepositoryLifecycle.java index 9ae7e7e29fb..9f8aea7fb62 100644 --- a/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/internal/OrderRepositoryLifecycle.java +++ b/core/framework/src/test/java/org/opentripplanner/core/framework/transaction/moduletest/candyshop/order/internal/OrderRepositoryLifecycle.java @@ -1,8 +1,8 @@ package org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.internal; -import org.opentripplanner.core.model.transaction.RepositoryLifecycle; import org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.OrderRepository; import org.opentripplanner.core.framework.transaction.moduletest.candyshop.order.OrderService; +import org.opentripplanner.core.model.transaction.RepositoryLifecycle; /** * This lifecycle implements the {@link RepositoryLifecycle} interface, but does not create a new diff --git a/raptor/data/pom.xml b/raptor/data/pom.xml index 0a6a7cb31f1..dfb526b814a 100644 --- a/raptor/data/pom.xml +++ b/raptor/data/pom.xml @@ -15,8 +15,8 @@ - com.hubspot.maven.plugins - prettier-maven-plugin + com.diffplug.spotless + spotless-maven-plugin From 161c13d0c48aec78b468fccd97b2f4d40cc7039f Mon Sep 17 00:00:00 2001 From: OTP Serialization Version Bot Date: Tue, 22 Sep 2026 13:18:05 +0000 Subject: [PATCH 53/68] Bump serialization version id for #8020 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 101d4e5775a..638f7be1cea 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ - 279 + 280 34.5 From 3d0467fd4e14d376ef8b7ac49b4db1c7e6c7a41d Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Fri, 18 Sep 2026 18:03:23 +0200 Subject: [PATCH 54/68] perf(graph): avoid counting edges when logging graph load status Graph.countEdges() walks all 4.3M vertices of the Norwegian graph and dereferences every outgoing edge array, only to format the |E| value of the "Graph loaded." log line. Measured on 8 tst pods, this takes 248-306 ms (median 265 ms) on the main thread during startup, with 218 of 218 JFR samples in that window landing in countEdges(). The deserialized edge collection is already at hand in SerializedGraphObject, and its size is by construction the same number, so use it instead. The log method only reads state of the object it is called on, so make it an instance method. --- .../routing/graph/SerializedGraphObject.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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 e9f1c6e33f4..fbf769d27d2 100644 --- a/application/src/main/java/org/opentripplanner/routing/graph/SerializedGraphObject.java +++ b/application/src/main/java/org/opentripplanner/routing/graph/SerializedGraphObject.java @@ -215,7 +215,7 @@ private static SerializedGraphObject load(InputStream inputStream, String source serObj.reconstructEdgeLists(); serObj.transitRepository.getSiteRepository().reindexAfterDeserialization(); serObj.transitRepository.index(); - logSerializationCompleteStatus(serObj.graph, serObj.transitRepository); + serObj.logSerializationCompleteStatus(); return serObj; } catch (IOException e) { LOG.error("IO exception while loading graph: {}", e.getLocalizedMessage(), e); @@ -286,10 +286,7 @@ private void save(OutputStream outputStream, String graphName, long size) { // ((InstanceCountingClassResolver) kryo.getClassResolver()).summarize(); } - private static void logSerializationCompleteStatus( - Graph graph, - TransitRepository transitRepository - ) { + private void logSerializationCompleteStatus() { var f = new OtpNumberFormat(); var nStops = f.formatNumber(transitRepository.getSiteRepository().stopIndexSize()); var nTransfers = f.formatNumber( @@ -297,7 +294,7 @@ private static void logSerializationCompleteStatus( ); var nPatterns = f.formatNumber(transitRepository.getAllTripPatterns().size()); var nVertices = f.formatNumber(graph.countVertices()); - var nEdges = f.formatNumber(graph.countEdges()); + var nEdges = f.formatNumber(edges.size()); LOG.info("Graph loaded. |V|={} |E|={}", nVertices, nEdges); LOG.info( From a4c1964b71a023124299f3657fadc92cb4351614 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Thu, 24 Sep 2026 13:16:29 +0000 Subject: [PATCH 55/68] Add changelog entry for #7257 [ci skip] --- doc/user/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/Changelog.md b/doc/user/Changelog.md index 218f1ec8736..77a3172bf81 100644 --- a/doc/user/Changelog.md +++ b/doc/user/Changelog.md @@ -16,6 +16,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Verify who labeled the PRs merged by the custom release script [#8018](https://github.com/opentripplanner/OpenTripPlanner/pull/8018) - Use custom collections to speed up island pruning [#7990](https://github.com/opentripplanner/OpenTripPlanner/pull/7990) - Treat negative `stair_count` as stairs in `PathwayEdge` [#8027](https://github.com/opentripplanner/OpenTripPlanner/pull/8027) +- Update NeTEx Java Model to v2.0.16 [#7257](https://github.com/opentripplanner/OpenTripPlanner/pull/7257) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.10.0 (2026-09-09) From bae38e66db411fffb08f7f1a5dc118ad894bfcf4 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 24 Sep 2026 16:07:29 +0200 Subject: [PATCH 56/68] Fix container image build --- application/pom.xml | 7 +++++++ pom.xml | 2 ++ 2 files changed, 9 insertions(+) diff --git a/application/pom.xml b/application/pom.xml index 14e62504b40..7740395e805 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -425,6 +425,13 @@ + + com.google.cloud.tools + jib-maven-plugin + + false + + org.apache.maven.plugins maven-compiler-plugin diff --git a/pom.xml b/pom.xml index 3b70f821d1c..464733e032c 100644 --- a/pom.xml +++ b/pom.xml @@ -518,6 +518,8 @@ jib-maven-plugin 3.5.2 + + true org.opentripplanner.standalone.OTPMain /docker-entrypoint.sh From 7be65dc6854d46653857510f8ad9d706690cd9a2 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Thu, 24 Sep 2026 14:22:44 +0000 Subject: [PATCH 57/68] Add changelog entry for #8041 [ci skip] --- doc/user/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/Changelog.md b/doc/user/Changelog.md index 77a3172bf81..bcbe13639de 100644 --- a/doc/user/Changelog.md +++ b/doc/user/Changelog.md @@ -17,6 +17,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Use custom collections to speed up island pruning [#7990](https://github.com/opentripplanner/OpenTripPlanner/pull/7990) - Treat negative `stair_count` as stairs in `PathwayEdge` [#8027](https://github.com/opentripplanner/OpenTripPlanner/pull/8027) - Update NeTEx Java Model to v2.0.16 [#7257](https://github.com/opentripplanner/OpenTripPlanner/pull/7257) +- Only build the container image from the application module [#8041](https://github.com/opentripplanner/OpenTripPlanner/pull/8041) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.10.0 (2026-09-09) From ee1e29136c5c74517ac847079881bd8fc7990478 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Thu, 24 Sep 2026 15:07:01 +0000 Subject: [PATCH 58/68] Add changelog entry for #8037 [ci skip] --- doc/user/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/Changelog.md b/doc/user/Changelog.md index bcbe13639de..40bd0241c08 100644 --- a/doc/user/Changelog.md +++ b/doc/user/Changelog.md @@ -18,6 +18,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Treat negative `stair_count` as stairs in `PathwayEdge` [#8027](https://github.com/opentripplanner/OpenTripPlanner/pull/8027) - Update NeTEx Java Model to v2.0.16 [#7257](https://github.com/opentripplanner/OpenTripPlanner/pull/7257) - Only build the container image from the application module [#8041](https://github.com/opentripplanner/OpenTripPlanner/pull/8041) +- Avoid counting edges when logging the graph load status [#8037](https://github.com/opentripplanner/OpenTripPlanner/pull/8037) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.10.0 (2026-09-09) From cadfae06baaeb37ef00bee4d5d726d75b8f998c6 Mon Sep 17 00:00:00 2001 From: danielhep Date: Tue, 9 Jun 2026 11:16:34 -0600 Subject: [PATCH 59/68] add monorail fares back in (cherry picked from commit 7e6063c5f8597d2cbb19ede7ad6142352fa7630d) --- .../gtfs/v1/custom/OrcaFareServiceTest.java | 35 ++++++++----------- .../gtfs/v1/custom/OrcaFareService.java | 3 +- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java index bd3c6425b0a..3a40e3133aa 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java @@ -576,40 +576,33 @@ void testNonOrcaAgencies() { calculateFare(rides, FareType.electronicRegular, ZERO_USD); } - /** - * We explicitly do not calculate monorail fares - */ - @Test - void calculateMonorailFares() { - List rides = List.of(getLeg(MONORAIL_AGENCY_ID, 0)); - - calculateFare(rides, regular, usDollars(0.00f)); - calculateFare(rides, FareType.senior, usDollars(0.00f)); - calculateFare(rides, FareType.youth, usDollars(0.00f)); - calculateFare(rides, FareType.electronicSpecial, usDollars(0.00f)); - calculateFare(rides, FareType.electronicRegular, usDollars(0.00f)); - calculateFare(rides, FareType.electronicSenior, usDollars(0.00f)); - calculateFare(rides, FareType.electronicYouth, usDollars(0.00f)); - } - /** * Test monorail fares with transfers to ensure transfer logic works correctly - * with monorail's unique fare structure. Update: we now exclude monorail from fare calcs + * with monorail's unique fare structure. Update: monorail doesn't accept transfers anymore */ @Test void calculateMonorailFaresWithTransfers() { List rides = List.of( - getLeg(MONORAIL_AGENCY_ID, 0), - getLeg(KC_METRO_AGENCY_ID, 30), + getLeg(KC_METRO_AGENCY_ID, 0), + getLeg(MONORAIL_AGENCY_ID, 30), getLeg(COMM_TRANS_AGENCY_ID, 60) ); - calculateFare(rides, regular, THREE_DOLLARS.plus(usDollars(2.50f))); + calculateFare(rides, regular, THREE_DOLLARS.plus(usDollars(2.50f).plus(usDollars(4.00f)))); calculateFare(rides, FareType.youth, ZERO_USD); - calculateFare(rides, FareType.electronicRegular, usDollars(3.00f)); + calculateFare(rides, FareType.electronicRegular, usDollars(3.00f).plus(usDollars(4.00f))); calculateFare(rides, FareType.electronicSenior, usDollars(1.00f)); calculateFare(rides, FareType.electronicYouth, usDollars(0.00f)); calculateFare(rides, FareType.electronicSpecial, usDollars(1.00f)); + + var fares = orcaFareService.calculateFaresForType(USD, FareType.electronicRegular, rides, null); + + // KC Metro is charged its normal fare + assertLegFareEquals(300, rides.get(0), fares, false); + // Monorail doesn't accept or give transfers + assertLegFareEquals(400, rides.get(1), fares, false); + // CommTrans still gets a free transfer from KC Metro (monorail doesn't break the chain) + assertLegFareEquals(0, rides.get(2), fares, true); } static Stream allTypes() { diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java index df5f6433594..1af52e63569 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java @@ -139,6 +139,7 @@ public boolean permitsFreeTransfers(ZonedDateTime startTime) { WHATCOM_LOCAL, WHATCOM_CROSS_COUNTY, KITSAP_TRANSIT_FAST_FERRY, + MONORAIL, SKAGIT_CROSS_COUNTY -> false; default -> true; }; @@ -340,7 +341,7 @@ private Optional getRegularFare( SKAGIT_CROSS_COUNTY -> fareType.equals(FareType.electronicRegular) ? Optional.empty() : defaultFare; - case MONORAIL -> Optional.empty(); + case MONORAIL -> optionalUSD(4.00f); default -> defaultFare; }; } From be06b3adb620aa1e89ee79575dc95792d2f67d47 Mon Sep 17 00:00:00 2001 From: danielhep Date: Mon, 15 Jun 2026 12:49:55 +0300 Subject: [PATCH 60/68] add monorail reduced fares (cherry picked from commit d7d3c6d10c7b433f81f329da822ed71d6d4bc22b) --- .../gtfs/v1/custom/OrcaFareServiceTest.java | 22 +++++++++++++++++-- .../gtfs/v1/custom/OrcaFareService.java | 4 ++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java index 3a40e3133aa..bfc07a35bcd 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java @@ -589,11 +589,13 @@ void calculateMonorailFaresWithTransfers() { ); calculateFare(rides, regular, THREE_DOLLARS.plus(usDollars(2.50f).plus(usDollars(4.00f)))); + calculateFare(rides, FareType.senior, usDollars(4.00f)); calculateFare(rides, FareType.youth, ZERO_USD); calculateFare(rides, FareType.electronicRegular, usDollars(3.00f).plus(usDollars(4.00f))); - calculateFare(rides, FareType.electronicSenior, usDollars(1.00f)); + // Monorail charges $2.00 reduced fare for senior/LIFT (no free transfer to/from monorail) + calculateFare(rides, FareType.electronicSenior, usDollars(3.00f)); calculateFare(rides, FareType.electronicYouth, usDollars(0.00f)); - calculateFare(rides, FareType.electronicSpecial, usDollars(1.00f)); + calculateFare(rides, FareType.electronicSpecial, usDollars(3.00f)); var fares = orcaFareService.calculateFaresForType(USD, FareType.electronicRegular, rides, null); @@ -605,6 +607,22 @@ void calculateMonorailFaresWithTransfers() { assertLegFareEquals(0, rides.get(2), fares, true); } + /** + * Test single-leg monorail fares to confirm the reduced rate of $2.00 for senior and LIFT + * categories, and the regular adult fare of $4.00. + */ + @Test + void calculateMonorailReducedFares() { + List rides = List.of(getLeg(MONORAIL_AGENCY_ID, 0)); + calculateFare(rides, regular, usDollars(4.00f)); + calculateFare(rides, FareType.senior, TWO_DOLLARS); + calculateFare(rides, FareType.youth, ZERO_USD); + calculateFare(rides, FareType.electronicRegular, usDollars(4.00f)); + calculateFare(rides, FareType.electronicSenior, TWO_DOLLARS); + calculateFare(rides, FareType.electronicYouth, ZERO_USD); + calculateFare(rides, FareType.electronicSpecial, TWO_DOLLARS); + } + static Stream allTypes() { return Arrays.stream(FareType.values()).map(Arguments::of); } diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java index 1af52e63569..cec153aa0c8 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java @@ -369,7 +369,7 @@ private Optional getLiftFare(RideType rideType, Optional defaultFa EVERETT_TRANSIT, PIERCE_COUNTY_TRANSIT, SEATTLE_STREET_CAR -> optionalUSD(1.00f); - case MONORAIL -> Optional.empty(); + case MONORAIL -> optionalUSD(2.00f); case WASHINGTON_STATE_FERRIES -> defaultFare.map(df -> getWashingtonStateFerriesFare(route.getLongName(), FareType.electronicSpecial, df) ); @@ -409,7 +409,7 @@ private Optional getSeniorFare( PIERCE_COUNTY_TRANSIT, SEATTLE_STREET_CAR, KITSAP_TRANSIT -> optionalUSD(1f); - case MONORAIL -> Optional.empty(); + case MONORAIL -> optionalUSD(2.00f); case KC_WATER_TAXI_VASHON_ISLAND -> optionalUSD(3f); case KC_WATER_TAXI_WEST_SEATTLE -> optionalUSD(2.5f); case KITSAP_TRANSIT_FAST_FERRY -> defaultFare.map(Money::half); From fa49aeb5e7e08265c61292109d8548a7f021c9ee Mon Sep 17 00:00:00 2001 From: danielhep Date: Wed, 17 Jun 2026 21:41:19 +0300 Subject: [PATCH 61/68] fix monorail youth fare (cherry picked from commit 9b22cfb32b9b60d159028c76f45065b4480c0cd0) --- .../service/gtfs/v1/custom/OrcaFareServiceTest.java | 4 ++-- .../service/gtfs/v1/custom/OrcaFareService.java | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java index bfc07a35bcd..238a0dca9af 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java @@ -590,7 +590,7 @@ void calculateMonorailFaresWithTransfers() { calculateFare(rides, regular, THREE_DOLLARS.plus(usDollars(2.50f).plus(usDollars(4.00f)))); calculateFare(rides, FareType.senior, usDollars(4.00f)); - calculateFare(rides, FareType.youth, ZERO_USD); + calculateFare(rides, FareType.youth, usDollars(4.00f)); calculateFare(rides, FareType.electronicRegular, usDollars(3.00f).plus(usDollars(4.00f))); // Monorail charges $2.00 reduced fare for senior/LIFT (no free transfer to/from monorail) calculateFare(rides, FareType.electronicSenior, usDollars(3.00f)); @@ -616,7 +616,7 @@ void calculateMonorailReducedFares() { List rides = List.of(getLeg(MONORAIL_AGENCY_ID, 0)); calculateFare(rides, regular, usDollars(4.00f)); calculateFare(rides, FareType.senior, TWO_DOLLARS); - calculateFare(rides, FareType.youth, ZERO_USD); + calculateFare(rides, FareType.youth, usDollars(4.00f)); calculateFare(rides, FareType.electronicRegular, usDollars(4.00f)); calculateFare(rides, FareType.electronicSenior, TWO_DOLLARS); calculateFare(rides, FareType.electronicYouth, ZERO_USD); diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java index cec153aa0c8..5ec9429361c 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java @@ -294,7 +294,7 @@ private Optional getLegFare( return Optional.empty(); } return switch (fareType) { - case youth, electronicYouth -> getYouthFare(rideType, defaultFare); + case youth, electronicYouth -> getYouthFare(fareType, rideType, defaultFare); case electronicSpecial -> getLiftFare(rideType, defaultFare, leg); case electronicSenior, senior -> getSeniorFare(fareType, rideType, defaultFare, leg); case regular, electronicRegular -> getRegularFare(fareType, rideType, defaultFare, leg); @@ -425,15 +425,21 @@ private Optional getSeniorFare( /** * Apply youth discount fares based on the ride type. Youth ride free in Washington. */ - private Optional getYouthFare(RideType rideType, Optional defaultFare) { + private Optional getYouthFare( + FareType fareType, + RideType rideType, + Optional defaultFare + ) { return switch (rideType) { case UNKNOWN, SKAGIT_TRANSIT, SKAGIT_LOCAL, SKAGIT_CROSS_COUNTY, - MONORAIL, LINK_SHUTTLE -> Optional.empty(); + case MONORAIL -> fareType == FareType.electronicYouth + ? Optional.of(ZERO_USD) + : optionalUSD(4.00f); default -> Optional.of(ZERO_USD); }; } From 4c0105c400950c75abeeb5304ac3d76b102dcef7 Mon Sep 17 00:00:00 2001 From: danielhep Date: Mon, 22 Jun 2026 17:25:53 +0200 Subject: [PATCH 62/68] adjust youth cash fares (cherry picked from commit 7eb81914fc714b16ae19db59eb28b72d1ae337d7) --- .../ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java | 4 ++-- .../ext/fares/service/gtfs/v1/custom/OrcaFareService.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java index 238a0dca9af..5efbbeb0502 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java @@ -590,7 +590,7 @@ void calculateMonorailFaresWithTransfers() { calculateFare(rides, regular, THREE_DOLLARS.plus(usDollars(2.50f).plus(usDollars(4.00f)))); calculateFare(rides, FareType.senior, usDollars(4.00f)); - calculateFare(rides, FareType.youth, usDollars(4.00f)); + calculateFare(rides, FareType.youth, usDollars(2.00f)); calculateFare(rides, FareType.electronicRegular, usDollars(3.00f).plus(usDollars(4.00f))); // Monorail charges $2.00 reduced fare for senior/LIFT (no free transfer to/from monorail) calculateFare(rides, FareType.electronicSenior, usDollars(3.00f)); @@ -616,7 +616,7 @@ void calculateMonorailReducedFares() { List rides = List.of(getLeg(MONORAIL_AGENCY_ID, 0)); calculateFare(rides, regular, usDollars(4.00f)); calculateFare(rides, FareType.senior, TWO_DOLLARS); - calculateFare(rides, FareType.youth, usDollars(4.00f)); + calculateFare(rides, FareType.youth, usDollars(2.00f)); calculateFare(rides, FareType.electronicRegular, usDollars(4.00f)); calculateFare(rides, FareType.electronicSenior, TWO_DOLLARS); calculateFare(rides, FareType.electronicYouth, ZERO_USD); diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java index 5ec9429361c..c012873af4b 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java @@ -439,7 +439,7 @@ private Optional getYouthFare( LINK_SHUTTLE -> Optional.empty(); case MONORAIL -> fareType == FareType.electronicYouth ? Optional.of(ZERO_USD) - : optionalUSD(4.00f); + : optionalUSD(2.00f); default -> Optional.of(ZERO_USD); }; } From 287884fc1f55da5065d63abf82ce0ea34b36352e Mon Sep 17 00:00:00 2001 From: danielhep Date: Fri, 25 Sep 2026 18:18:48 -0700 Subject: [PATCH 63/68] test: verify every ORCA monorail ride pays its fare --- .../gtfs/v1/custom/OrcaFareServiceTest.java | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java index 5efbbeb0502..7fbd857cb5b 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java @@ -623,6 +623,38 @@ void calculateMonorailReducedFares() { calculateFare(rides, FareType.electronicSpecial, TWO_DOLLARS); } + static Stream monorailElectronicFares() { + return Stream.of( + Arguments.of(FareType.electronicRegular, THREE_DOLLARS, usDollars(4.00f)), + Arguments.of(FareType.electronicSenior, ONE_DOLLAR, TWO_DOLLARS), + Arguments.of(FareType.electronicSpecial, ONE_DOLLAR, TWO_DOLLARS), + Arguments.of(FareType.electronicYouth, ZERO_USD, ZERO_USD) + ); + } + + @ParameterizedTest + @MethodSource("monorailElectronicFares") + void monorailChargesFareOnEveryElectronicRide( + FareType fareType, + Money metroFare, + Money monorailFare + ) { + var rides = List.of( + getLeg(KC_METRO_AGENCY_ID, 0), + getLeg(MONORAIL_AGENCY_ID, 30), + getLeg(MONORAIL_AGENCY_ID, 60) + ); + + calculateFare(rides, fareType, metroFare.plus(monorailFare.times(2))); + + var fares = orcaFareService.calculateFaresForType(USD, fareType, rides, null); + for (var monorailRide : rides.subList(1, rides.size())) { + var offers = fares.getLegProducts().get(monorailRide); + assertEquals(1, offers.size()); + assertEquals(monorailFare, offers.iterator().next().fareProduct().price()); + } + } + static Stream allTypes() { return Arrays.stream(FareType.values()).map(Arguments::of); } From b302ba2d7f9fa5a657d0aa59eecb13586a11d1a1 Mon Sep 17 00:00:00 2001 From: danielhep Date: Fri, 25 Sep 2026 18:27:09 -0700 Subject: [PATCH 64/68] add ct free fares week --- .../gtfs/v1/custom/OrcaFareServiceTest.java | 75 +++++++++++++++++++ .../gtfs/v1/custom/OrcaFareService.java | 14 ++++ 2 files changed, 89 insertions(+) diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java index bd3c6425b0a..eabc77859f9 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java @@ -21,6 +21,9 @@ import static org.opentripplanner.transit.model.basic.Money.ZERO_USD; import static org.opentripplanner.transit.model.basic.Money.usDollars; +import java.time.LocalDate; +import java.time.ZoneId; +import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -48,6 +51,7 @@ import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.model.plan.Place; +import org.opentripplanner.model.plan.leg.ScheduledTransitLeg; import org.opentripplanner.routing.core.FareType; import org.opentripplanner.street.geometry.WgsCoordinate; import org.opentripplanner.transit.model.basic.Money; @@ -228,6 +232,68 @@ void calculateFareForSingleAgency() { calculateFare(rides, FareType.electronicYouth, ZERO_USD); } + @Test + void communityTransitRideFreeWeek() { + var seattle = ZoneId.of("America/Los_Angeles"); + var octoberFirst = LocalDate.of(2026, 10, 1).atStartOfDay(seattle); + var octoberNinth = LocalDate.of(2026, 10, 9).atStartOfDay(seattle); + + for (var agencyId : List.of(COMM_TRANS_AGENCY_ID, COMM_TRANS_FLEX_AGENCY_ID)) { + var routeName = agencyId.equals(COMM_TRANS_AGENCY_ID) ? "400" : "DART"; + for (var startTime : List.of(octoberFirst, octoberNinth.minusMinutes(1))) { + var leg = getLegAt(agencyId, routeName, startTime); + for (var fareType : FareType.values()) { + calculateFare(List.of(leg), fareType, ZERO_USD); + } + } + + calculateFare( + List.of(getLegAt(agencyId, routeName, octoberFirst.minusMinutes(1))), + regular, + usDollars(2.5f) + ); + calculateFare( + List.of(getLegAt(agencyId, routeName, octoberNinth)), + regular, + usDollars(2.5f) + ); + } + + // An itinerary can carry a different zone; the promotion follows Seattle's calendar dates. + calculateFare( + List.of( + getLegAt( + COMM_TRANS_AGENCY_ID, + "400", + octoberNinth.minusHours(1).withZoneSameInstant(ZoneIds.NEW_YORK) + ) + ), + regular, + ZERO_USD + ); + + // Sound Transit service remains paid, even when Community Transit operates the bus. + calculateFare( + List.of(getLegAt(COMM_TRANS_AGENCY_ID, "512", octoberFirst)), + regular, + THREE_DOLLARS + ); + calculateFare( + List.of(getLegAt(KC_METRO_AGENCY_ID, "400", octoberFirst)), + regular, + THREE_DOLLARS + ); + + calculateFare( + List.of( + getLegAt(COMM_TRANS_AGENCY_ID, "400", octoberFirst), + getLegAt(KC_METRO_AGENCY_ID, "400", octoberFirst.plusMinutes(30)) + ), + FareType.electronicRegular, + THREE_DOLLARS + ); + } + /** * WSF do not accept free transfers. This test is to make sure the rider is charged the cash price for WSF as well * as the highest fare where Orca can be used. @@ -712,6 +778,15 @@ private static Leg getLeg(String agencyId, String shortName, long startTimeMins) return createLeg(agencyId, shortName, 3, startTimeMins, "test", "test", ""); } + private static Leg getLegAt(String agencyId, String shortName, ZonedDateTime startTime) { + return ((ScheduledTransitLeg) getLeg(agencyId, shortName, 0)) + .copyOf() + .withStartTime(startTime) + .withEndTime(startTime.plusMinutes(12)) + .withServiceDate(startTime.toLocalDate()) + .build(); + } + private static Leg getLeg( String agencyId, String shortName, diff --git a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java index df5f6433594..337774e54ee 100644 --- a/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java +++ b/application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareService.java @@ -4,6 +4,8 @@ import static org.opentripplanner.transit.model.basic.Money.usDollars; import java.time.Duration; +import java.time.LocalDate; +import java.time.ZoneId; import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.Collection; @@ -60,6 +62,9 @@ public boolean isValidAt(ZonedDateTime checkTime) { } private static final Duration MAX_TRANSFER_DISCOUNT_DURATION = Duration.ofHours(2); + private static final ZoneId COMMUNITY_TRANSIT_TIME_ZONE = ZoneId.of("America/Los_Angeles"); + private static final LocalDate COMMUNITY_TRANSIT_FREE_FARE_START = LocalDate.of(2026, 10, 1); + private static final LocalDate COMMUNITY_TRANSIT_FREE_FARE_END = LocalDate.of(2026, 10, 9); public static final String COMM_TRANS_AGENCY_ID = "29"; public static final String COMM_TRANS_FLEX_AGENCY_ID = "4969"; @@ -288,6 +293,15 @@ private Optional getLegFare( if (rideType == null) { return defaultFare; } + if (rideType == RideType.COMM_TRANS_LOCAL_SWIFT) { + var date = leg.startTime().withZoneSameInstant(COMMUNITY_TRANSIT_TIME_ZONE).toLocalDate(); + if ( + !date.isBefore(COMMUNITY_TRANSIT_FREE_FARE_START) && + date.isBefore(COMMUNITY_TRANSIT_FREE_FARE_END) + ) { + return Optional.of(ZERO_USD); + } + } // Filter out agencies that don't accept ORCA from the electronic fare type if (usesOrca(fareType) && !rideType.agencyAcceptsOrca()) { return Optional.empty(); From 841a6a8b9736ebe541ae24eaffbc001a904dca0f Mon Sep 17 00:00:00 2001 From: danielhep Date: Fri, 25 Sep 2026 18:59:08 -0700 Subject: [PATCH 65/68] remove excess tests --- .../gtfs/v1/custom/OrcaFareServiceTest.java | 54 ++++--------------- 1 file changed, 11 insertions(+), 43 deletions(-) diff --git a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java index eabc77859f9..e3e21eeda78 100644 --- a/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java +++ b/application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java @@ -238,58 +238,26 @@ void communityTransitRideFreeWeek() { var octoberFirst = LocalDate.of(2026, 10, 1).atStartOfDay(seattle); var octoberNinth = LocalDate.of(2026, 10, 9).atStartOfDay(seattle); - for (var agencyId : List.of(COMM_TRANS_AGENCY_ID, COMM_TRANS_FLEX_AGENCY_ID)) { - var routeName = agencyId.equals(COMM_TRANS_AGENCY_ID) ? "400" : "DART"; - for (var startTime : List.of(octoberFirst, octoberNinth.minusMinutes(1))) { - var leg = getLegAt(agencyId, routeName, startTime); - for (var fareType : FareType.values()) { - calculateFare(List.of(leg), fareType, ZERO_USD); - } - } - - calculateFare( - List.of(getLegAt(agencyId, routeName, octoberFirst.minusMinutes(1))), - regular, - usDollars(2.5f) - ); - calculateFare( - List.of(getLegAt(agencyId, routeName, octoberNinth)), - regular, - usDollars(2.5f) - ); - } - - // An itinerary can carry a different zone; the promotion follows Seattle's calendar dates. calculateFare( - List.of( - getLegAt( - COMM_TRANS_AGENCY_ID, - "400", - octoberNinth.minusHours(1).withZoneSameInstant(ZoneIds.NEW_YORK) - ) - ), + List.of(getLegAt(COMM_TRANS_AGENCY_ID, "400", octoberFirst.minusMinutes(1))), regular, - ZERO_USD + usDollars(2.5f) ); - - // Sound Transit service remains paid, even when Community Transit operates the bus. + calculateFare(List.of(getLegAt(COMM_TRANS_AGENCY_ID, "400", octoberFirst)), regular, ZERO_USD); calculateFare( - List.of(getLegAt(COMM_TRANS_AGENCY_ID, "512", octoberFirst)), - regular, - THREE_DOLLARS + List.of(getLegAt(COMM_TRANS_FLEX_AGENCY_ID, "DART", octoberNinth.minusMinutes(1))), + FareType.electronicSenior, + ZERO_USD ); calculateFare( - List.of(getLegAt(KC_METRO_AGENCY_ID, "400", octoberFirst)), + List.of(getLegAt(COMM_TRANS_AGENCY_ID, "400", octoberNinth)), regular, - THREE_DOLLARS + usDollars(2.5f) ); - + // Sound Transit routes retain their fare even when operated by Community Transit. calculateFare( - List.of( - getLegAt(COMM_TRANS_AGENCY_ID, "400", octoberFirst), - getLegAt(KC_METRO_AGENCY_ID, "400", octoberFirst.plusMinutes(30)) - ), - FareType.electronicRegular, + List.of(getLegAt(COMM_TRANS_AGENCY_ID, "512", octoberFirst)), + regular, THREE_DOLLARS ); } From 114c648bda55e16fffa16dd05173567ff0a484e5 Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Sat, 26 Sep 2026 19:51:00 +0000 Subject: [PATCH 66/68] Upgrade debug client to version 2026/09/2026-09-26T19:50 --- application/src/client/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/src/client/index.html b/application/src/client/index.html index 0a84a023372..03eda3651b1 100644 --- a/application/src/client/index.html +++ b/application/src/client/index.html @@ -5,8 +5,8 @@ OTP Debug - - + +

    From f598ccc8a87d4f2dd6b640198971ec4b98b2479c Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Mon, 28 Sep 2026 06:29:50 +0000 Subject: [PATCH 67/68] Add changelog entry for #8050 [ci skip] --- doc/user/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/Changelog.md b/doc/user/Changelog.md index 40bd0241c08..72b8c78dc35 100644 --- a/doc/user/Changelog.md +++ b/doc/user/Changelog.md @@ -19,6 +19,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Update NeTEx Java Model to v2.0.16 [#7257](https://github.com/opentripplanner/OpenTripPlanner/pull/7257) - Only build the container image from the application module [#8041](https://github.com/opentripplanner/OpenTripPlanner/pull/8041) - Avoid counting edges when logging the graph load status [#8037](https://github.com/opentripplanner/OpenTripPlanner/pull/8037) +- (sandbox) ORCA fares: add CT free fares week oct 2026 [#8050](https://github.com/opentripplanner/OpenTripPlanner/pull/8050) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.10.0 (2026-09-09) From 674f56c449efa1559746a66e7a3126034e6beff3 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 28 Sep 2026 09:35:07 +0200 Subject: [PATCH 68/68] Clean changelog [ci skip] --- doc/user/Changelog.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/doc/user/Changelog.md b/doc/user/Changelog.md index 72b8c78dc35..10eae679a71 100644 --- a/doc/user/Changelog.md +++ b/doc/user/Changelog.md @@ -10,16 +10,13 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Add vehicleRentalGeofencing sandbox loading GBFS geofencing zones during the graph build [#7887](https://github.com/opentripplanner/OpenTripPlanner/pull/7887) - Add snowAndIce to the Transmodel TransportMode enum [#7980](https://github.com/opentripplanner/OpenTripPlanner/pull/7980) - Limit growth of NeTEx stop time index [#7963](https://github.com/opentripplanner/OpenTripPlanner/pull/7963) -- Remove .idea files from version control [#7992](https://github.com/opentripplanner/OpenTripPlanner/pull/7992) - Deprecate serviceId in GTFS API and stop populating it [#7991](https://github.com/opentripplanner/OpenTripPlanner/pull/7991) - Decode OSM PBF data in parallel [#8008](https://github.com/opentripplanner/OpenTripPlanner/pull/8008) - Verify who labeled the PRs merged by the custom release script [#8018](https://github.com/opentripplanner/OpenTripPlanner/pull/8018) - Use custom collections to speed up island pruning [#7990](https://github.com/opentripplanner/OpenTripPlanner/pull/7990) - Treat negative `stair_count` as stairs in `PathwayEdge` [#8027](https://github.com/opentripplanner/OpenTripPlanner/pull/8027) - Update NeTEx Java Model to v2.0.16 [#7257](https://github.com/opentripplanner/OpenTripPlanner/pull/7257) -- Only build the container image from the application module [#8041](https://github.com/opentripplanner/OpenTripPlanner/pull/8041) - Avoid counting edges when logging the graph load status [#8037](https://github.com/opentripplanner/OpenTripPlanner/pull/8037) -- (sandbox) ORCA fares: add CT free fares week oct 2026 [#8050](https://github.com/opentripplanner/OpenTripPlanner/pull/8050) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.10.0 (2026-09-09)