Upstream merge 2026-09-28

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
@@ -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

CLAUDE.md

@@ -78,11 +78,10 @@ mvn test -Dtest=ClassName#methodName
 Multi-module Maven project (root `pom.xml` `<modules>`):
 
 - **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/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` `<modules>`):
 
 ### 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).