Skip to content

Commit 596f432

Browse files
leonardehrenfriedleonardehrenfried
committed
Merge remote-tracking branch 'upstream/dev-2.x' into upstream-merge-2026-01-20
2 parents 7bd0436 + 352a626 commit 596f432

File tree

831 files changed

+11631
-6127
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

831 files changed

+11631
-6127
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,10 @@ c287575df6798810a69fafc54c8c4e1867b71367
2727
882e72ca362b25d5c76204e7d5db2bcee611c069
2828

2929
# Move Timetable & Snapshot to timetable domain package
30-
d688305e9b7756e4c720498c7e0449c520cfb423
30+
d688305e9b7756e4c720498c7e0449c520cfb423
31+
32+
# move/remove trailing comments
33+
beeac076c0b9f0a8aaa1424ef1d6df3a6fa8f6ab
34+
35+
# update prettier version
36+
34026d19232608f9e6a8841a7c6ac5e5c99abbd4

‎.github/workflows/performance-test.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ jobs:
6060
jfr-delay: "20s"
6161
profile: extended
6262

63+
- location: helsinki
64+
iterations: 1
65+
jfr-delay: "50s"
66+
profile: extended
67+
6368
steps:
6469
- uses: actions/checkout@v4
6570
if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'

‎CLAUDE.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ mvn test -Dtest=ClassName
7979
mvn test -Dtest=ClassName#methodName
8080

8181
# Speed test (requires pre-built graph)
82-
mvn exec:java -Dexec.mainClass="org.opentripplanner.transit.speed_test.SpeedTest" \
82+
mvn --projects application exec:java -Dexec.mainClass="org.opentripplanner.transit.speed_test.SpeedTest" \
8383
-Dexec.classpathScope=test -Dexec.args="--dir=test/performance/norway -p md -n 4 -i 3 -0"
8484
```
8585

@@ -226,7 +226,7 @@ Performance is critical. The SpeedTest runs automatically after each merged PR.
226226

227227
```bash
228228
# Run speed test locally (requires pre-built graph in test/performance/<location>)
229-
mvn exec:java -Dexec.mainClass="org.opentripplanner.transit.speed_test.SpeedTest" \
229+
mvn --projects application exec:java -Dexec.mainClass="org.opentripplanner.transit.speed_test.SpeedTest" \
230230
-Dexec.classpathScope=test -Dexec.args="--dir=test/performance/norway -p md -n 4 -i 3 -0"
231231
```
232232

‎application/pom.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@
367367
<dependency>
368368
<groupId>com.hivemq</groupId>
369369
<artifactId>hivemq-mqtt-client</artifactId>
370-
<version>1.3.10</version>
370+
<version>1.3.12</version>
371371
</dependency>
372372
<dependency>
373373
<groupId>io.github.ci-cmg</groupId>
@@ -520,11 +520,9 @@
520520
<groupId>org.apache.maven.plugins</groupId>
521521
<artifactId>maven-checkstyle-plugin</artifactId>
522522
<configuration>
523-
<sourceDirectories>
524-
<sourceDirectory>src/main/java</sourceDirectory>
523+
<sourceDirectories combine.children="append">
525524
<sourceDirectory>src/ext/java</sourceDirectory>
526525
<sourceDirectory>src/ext-test/java</sourceDirectory>
527-
<sourceDirectory>src/test-fixtures/java</sourceDirectory>
528526
</sourceDirectories>
529527
</configuration>
530528
</plugin>

‎application/src/client/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<link rel="icon" type="image/svg+xml" href="/img/otp-logo.svg" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
77
<title>OTP Debug</title>
8-
<script type="module" crossorigin src="https://www.opentripplanner.org/debug-client-assets/2026/01/2026-01-08T13:51/assets/index-B8m6kh2S.js"></script>
9-
<link rel="stylesheet" crossorigin href="https://www.opentripplanner.org/debug-client-assets/2026/01/2026-01-08T13:51/assets/index-CME2K3XJ.css">
8+
<script type="module" crossorigin src="https://www.opentripplanner.org/debug-client-assets/2026/01/2026-01-19T09:33/assets/index-jXWwgQ6U.js"></script>
9+
<link rel="stylesheet" crossorigin href="https://www.opentripplanner.org/debug-client-assets/2026/01/2026-01-19T09:33/assets/index-CME2K3XJ.css">
1010
</head>
1111
<body>
1212
<div id="root"></div>

‎application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/route/RouteParserTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010

1111
class RouteParserTest {
1212

13-
private static final String DATA =
14-
"""
13+
private static final String DATA = """
1514
route_id, avg_co2_per_vehicle_per_km, avg_passenger_count
1615
R:1, 2.0, 20.0
1716
R:2, 3.0, 24.0

‎application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/trip/EmissionAggregatorTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ void mergeWithMissingHops() {
7171
assertEquals(2, subject.listIssues().size(), () -> subject.listIssues().toString());
7272
assertEquals(
7373
"EmissionMissingTripHop(Warning! All hops in a trip (E:T:1) should have an emission value. " +
74-
"Hop 2 and 3 does not have an emission value.)",
74+
"Hop 2 and 3 does not have an emission value.)",
7575
subject.listIssues().get(0).toString()
7676
);
7777
assertEquals(
7878
"EmissionTripHopDuplicates(Warning! The emission import contains duplicate rows for " +
79-
"the same hop for trip (E:T:1). An average value is used.)",
79+
"the same hop for trip (E:T:1). An average value is used.)",
8080
subject.listIssues().get(1).toString()
8181
);
8282
assertEquals(
@@ -98,12 +98,12 @@ void mergeWithStopIdMismatch() {
9898
assertEquals(2, subject.listIssues().size(), () -> subject.listIssues().toString());
9999
assertEquals(
100100
"EmissionStopIdMismatch(Emission 'from_stop_id' (C) not found in stop pattern for trip " +
101-
"(E:T:1): TripHopsRow[tripId=T:1, fromStopId=C, fromStopSequence=2, co2=7g])",
101+
"(E:T:1): TripHopsRow[tripId=T:1, fromStopId=C, fromStopSequence=2, co2=7g])",
102102
subject.listIssues().get(0).toString()
103103
);
104104
assertEquals(
105105
"EmissionStopIdMismatch(Emission 'from_stop_id' (B) not found in stop pattern for trip " +
106-
"(E:T:1): TripHopsRow[tripId=T:1, fromStopId=B, fromStopSequence=3, co2=10g])",
106+
"(E:T:1): TripHopsRow[tripId=T:1, fromStopId=B, fromStopSequence=3, co2=10g])",
107107
subject.listIssues().get(1).toString()
108108
);
109109
}
@@ -119,12 +119,12 @@ void mergeWithStopIndexOutOfBound() {
119119
assertEquals(2, subject.listIssues().size(), () -> subject.listIssues().toString());
120120
assertEquals(
121121
"EmissionStopSeqNr(The emission 'from_stop_sequence' (0) is out of bounds [1, 3]: " +
122-
"TripHopsRow[tripId=T:1, fromStopId=A, fromStopSequence=0, co2=3g])",
122+
"TripHopsRow[tripId=T:1, fromStopId=A, fromStopSequence=0, co2=3g])",
123123
subject.listIssues().get(0).toString()
124124
);
125125
assertEquals(
126126
"EmissionStopSeqNr(The emission 'from_stop_sequence' (4) is out of bounds [1, 3]: " +
127-
"TripHopsRow[tripId=T:1, fromStopId=C, fromStopSequence=4, co2=3g])",
127+
"TripHopsRow[tripId=T:1, fromStopId=C, fromStopSequence=4, co2=3g])",
128128
subject.listIssues().get(1).toString()
129129
);
130130
}
@@ -141,7 +141,7 @@ void mergeWithMissingStops() {
141141
assertEquals(1, subject.listIssues().size(), () -> subject.listIssues().toString());
142142
assertEquals(
143143
"EmissionMissingTripStopPattern(No trip with stop pattern found for trip (E:T:1). " +
144-
"Trip or stop-pattern is missing. The trip is skipped.)",
144+
"Trip or stop-pattern is missing. The trip is skipped.)",
145145
subject.listIssues().get(0).toString()
146146
);
147147
}

‎application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/trip/TripDataReaderTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ void ignoreDataSourceIfHeadersDoNotMatch() {
5757
var ex = assertThrows(HeadersDoNotMatch.class, () -> subject.read(null));
5858
assertEquals(
5959
"The header does not match the expected values. File: em-on-routes.txt\n" +
60-
"\twas: [route_id,avg_co2_per_vehicle_per_km,avg_passenger_count]\n" +
61-
"\texpected: [trip_id, from_stop_id, from_stop_sequence, co2]",
60+
"\twas: [route_id,avg_co2_per_vehicle_per_km,avg_passenger_count]\n" +
61+
"\texpected: [trip_id, from_stop_id, from_stop_sequence, co2]",
6262
ex.getMessage()
6363
);
6464
}

‎application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/trip/TripHopMapperTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ void testCaseError() {
8787
assertEquals(
8888
List.of(
8989
"Emission 'from_stop_id' (B) not found in stop pattern for trip (E:T:2): " +
90-
"TripHopsRow[tripId=T:2, fromStopId=B, fromStopSequence=1, co2=2g]",
90+
"TripHopsRow[tripId=T:2, fromStopId=B, fromStopSequence=1, co2=2g]",
9191
"The emission 'from_stop_sequence' (4) is out of bounds [1, 3]: " +
92-
"TripHopsRow[tripId=T:1, fromStopId=A, fromStopSequence=4, co2=2g]"
92+
"TripHopsRow[tripId=T:1, fromStopId=A, fromStopSequence=4, co2=2g]"
9393
),
9494
issueStore.listIssues().stream().map(DataImportIssue::getMessage).toList()
9595
);

‎application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/trip/TripHopsCsvParserTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010

1111
class TripHopsCsvParserTest {
1212

13-
private static final String DATA =
14-
"""
13+
private static final String DATA = """
1514
trip_id, from_stop_id, from_stop_sequence, not_used, co2
1615
F:1, NSR:Quay:1, 1, xyz, 28.0
1716
F:1, NSR:Quay:2, 2, abc, 38.0

0 commit comments

Comments
 (0)