Data Changed > compat with service IDs regex #32

mmathieum · 2026-02-03T16:26:41Z

No description provided.

gemini-code-assist · 2026-02-03T16:27:12Z

Summary of Changes

Hello @mmathieum, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request focuses on enhancing the robustness and consistency of how service and trip identifiers are processed and exported within the system. By centralizing ID cleaning through agencyTools and standardizing string quoting mechanisms, the changes aim to improve data integrity and simplify future maintenance, especially in contexts where service IDs might require specific parsing or regex-based cleaning.

Highlights

Refactored Service and Trip ID Handling: The pull request introduces a more consistent and centralized approach to handling service and trip IDs, particularly concerning their cleaning and quoting for export. This is achieved by passing an agencyTools instance to relevant conversion functions.
Standardized String Quoting: The quotesEscape utility function has been replaced with a simpler quotes function across multiple data classes (MDirection, MFrequency, MRoute, MSchedule, MServiceDate, MStop, MTrip), streamlining how strings are prepared for output.
New Extension Functions for ID Conversion: New Kotlin extension functions, String.convertServiceId(agencyTools) and String.convertTripId(), have been added to MServiceIds.kt and MTripIds.kt respectively, simplifying the conversion and cleaning of service and trip IDs throughout the codebase.
Updated MDataChangedManager: The avoidCalendarDatesDataChanged method in MDataChangedManager.kt now accepts an agencyTools parameter, allowing it to utilize agency-specific cleaning logic for service IDs during data change detection.

Changelog

src/main/java/org/mtransit/parser/DefaultAgencyTools.java
- Updated calls to MDataChangedManager.avoidCalendarDatesDataChanged to include the agencyTools instance as a new parameter.
src/main/java/org/mtransit/parser/mt/MDataChangedManager.kt
- Modified the avoidCalendarDatesDataChanged method signature to accept a GAgencyTools parameter.
- Updated service ID comparisons and logging to utilize the new convertServiceId extension function, ensuring consistent cleaning.
- Removed several //noinspection DiscouragedApi comments.
src/main/java/org/mtransit/parser/mt/data/MDirection.kt
- Replaced quotesEscape with quotes for headsign value serialization.
src/main/java/org/mtransit/parser/mt/data/MFrequency.kt
- Updated service ID serialization to use the convertServiceId extension function and quotes().
src/main/java/org/mtransit/parser/mt/data/MRoute.kt
- Replaced quotesEscape with quotes for short and long name serialization.
src/main/java/org/mtransit/parser/mt/data/MSchedule.kt
- Updated service ID and trip ID serialization to use convertServiceId and convertTripId extension functions with quotes().
- Replaced quotesEscape with quotes for headsign value serialization.
src/main/java/org/mtransit/parser/mt/data/MServiceDate.kt
- Updated service ID serialization to use the convertServiceId extension function and quotes().
src/main/java/org/mtransit/parser/mt/data/MServiceIds.kt
- Modified the convert method to accept GAgencyTools and apply cleanServiceId before processing.
- Introduced the String.convertServiceId(agencyTools) extension function.
- Changed quotesEscapeId to escapeId.
src/main/java/org/mtransit/parser/mt/data/MStop.kt
- Replaced quotesEscape with quotes for stop name serialization.
src/main/java/org/mtransit/parser/mt/data/MTrip.kt
- Updated service ID and trip ID serialization to use convertServiceId and convertTripId extension functions with quotes().
src/main/java/org/mtransit/parser/mt/data/MTripIds.kt
- Introduced the String.convertTripId() extension function.
- Changed quotesEscapeId to escapeId.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	`/gemini review`	Performs a code review for the current pull request in its current state.
Pull Request Summary	`/gemini summary`	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	`/gemini help`	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

gemini-code-assist

Code Review

This pull request refactors service ID handling to make it compatible with regex-based cleaning, which is a good improvement for consistency and maintainability. The changes involve passing agencyTools to necessary methods and introducing new helper functions like convertServiceId. I've identified a couple of places where the old, incorrect service ID comparison logic remains, which could lead to bugs. I've also pointed out a minor inconsistency in how string fields are being processed. Overall, the direction is good, but a few spots need attention to ensure correctness.

I am having trouble creating individual review comments. Click here to see my feedback.

src/main/java/org/mtransit/parser/mt/MDataChangedManager.kt (199)

While removing this suppression comment is good, the line that was below it (now line 198) appears to have a bug. It uses it.serviceId.escapeId() for comparison against removedServiceDate.serviceId. However, it.serviceId is a raw service ID from the GTFS file, and escapeId() does not perform the necessary cleaning based on the agency's regex. This will likely cause lookups to fail for service IDs that need cleaning. The comparison should use the cleaned service ID, like agencyTools.cleanServiceId(it.serviceId).

src/main/java/org/mtransit/parser/mt/MDataChangedManager.kt (224)

Similar to a previous comment, while removing this suppression is fine, the line below it (now line 222) seems to have the same bug. It uses it.serviceId.escapeId() for comparison, which doesn't clean the raw service ID. This can lead to mismatches when comparing with removedServiceDate.serviceId. You should use agencyTools.cleanServiceId(it.serviceId) to ensure a correct comparison.

src/main/java/org/mtransit/parser/mt/data/MStop.kt (47)

You've changed this line to use quotes() instead of quotesEscape(), which means underscores will no longer be removed from the stop name. However, the line for code just above still uses quotesEscape(). This seems inconsistent. Was it intentional to keep removing underscores from code but not from name? For consistency, you might consider applying the same change to code.quotesEscape() unless there's a specific reason for this difference.

mmathieum · 2026-02-03T16:46:53Z

/gemini review

gemini-code-assist

Code Review

This pull request refactors the handling of service and trip IDs to make them compatible with agency-specific cleaning regex. The changes introduce new convertServiceId and convertTripId extension functions and update their call sites across the codebase. This is a good improvement for consistency and correctness.

I've added a couple of high-severity comments pointing out two places in MDataChangedManager.kt where the old escapeId() method is still used for comparison, which seems to be an oversight from the refactoring and could lead to incorrect behavior. Please take a look at those.

src/main/java/org/mtransit/parser/mt/MDataChangedManager.kt

mmathieum · 2026-02-03T19:28:15Z

/gemini review

gemini-code-assist

Code Review

This pull request refactors the handling of service and trip IDs to make them compatible with service ID regex cleaning. The changes are mostly centered around centralizing the ID cleaning and conversion logic, which is a good improvement for code clarity and maintainability. However, I've found a couple of logical errors in the new date handling logic within MDataChangedManager.kt and one place where the refactoring seems to have been missed. Please see my detailed comments.

src/main/java/org/mtransit/parser/mt/MDataChangedManager.kt

mmathieum · 2026-02-03T19:41:50Z

/gemini review

gemini-code-assist

Code Review

This pull request introduces compatibility for service ID regex by refactoring how service IDs are cleaned and converted. The changes centralize the cleaning logic by passing agencyTools and using new extension functions like convertServiceId, which improves code consistency and readability. A critical bug that could cause an infinite loop when processing added calendar dates has also been fixed. While the changes are generally good, there's an opportunity to reduce code duplication in MDataChangedManager.kt by refactoring similar logic blocks into a helper function.

- parser: Schedule > clear head-sign instead of setting empty string mtransitapps/parser#30 - parser: Data Changed > compat with service IDs regex mtransitapps/parser#32

- commons: CI: add frequently used gh command with inputs in comments - parser: Remove unused trip IDs ints. mtransitapps/parser#31 - parser: Schedule > clear head-sign instead of setting empty string mtransitapps/parser#30 - parser: Data Changed > compat with service IDs regex mtransitapps/parser#32

- commons: CI: add frequently used gh command with inputs in comments - commons: Auto-trigger data sync when archive contains newer data than deployed mtransitapps/commons#537 - parser: Remove unused trip IDs ints. mtransitapps/parser#31 - parser: Schedule > clear head-sign instead of setting empty string mtransitapps/parser#30 - parser: Data Changed > compat with service IDs regex mtransitapps/parser#32

- commons: CI: add frequently used gh command with inputs in comments - commons: Auto-trigger data sync when archive contains newer data than deployed mtransitapps/commons#537 - parser: fix compat with no last service calendar dates - parser: Remove unused trip IDs ints. mtransitapps/parser#31 - parser: Schedule > clear head-sign instead of setting empty string mtransitapps/parser#30 - parser: Data Changed > compat with service IDs regex mtransitapps/parser#32

- commons: CI: add frequently used gh command with inputs in comments - commons: Auto-trigger data sync when archive contains newer data than deployed mtransitapps/commons#537 - parser: Fix compat with service IDs only used for data changed - parser: fix compat with no last service calendar dates - parser: Remove unused trip IDs ints. mtransitapps/parser#31 - parser: Schedule > clear head-sign instead of setting empty string mtransitapps/parser#30 - parser: Data Changed > compat with service IDs regex mtransitapps/parser#32

- commons: mt-sync-code-data.yml > fix skip on main repo - commons: CI: add frequently used gh command with inputs in comments - commons: Auto-trigger data sync when archive contains newer data than deployed mtransitapps/commons#537 - parser: Fix compat with service IDs only used for data changed - parser: fix compat with no last service calendar dates - parser: Remove unused trip IDs ints. mtransitapps/parser#31 - parser: Schedule > clear head-sign instead of setting empty string mtransitapps/parser#30 - parser: Data Changed > compat with service IDs regex mtransitapps/parser#32

Data Changed > compat with service IDs regex

23cd948

mmathieum self-assigned this Feb 3, 2026

fix

63b5bd9

gemini-code-assist bot reviewed Feb 3, 2026

View reviewed changes

fix

24b9cbb

mmathieum marked this pull request as ready for review February 3, 2026 16:46

gemini-code-assist bot reviewed Feb 3, 2026

View reviewed changes

src/main/java/org/mtransit/parser/mt/MDataChangedManager.kt Show resolved Hide resolved

src/main/java/org/mtransit/parser/mt/MDataChangedManager.kt Show resolved Hide resolved

PR comments

c443784

gemini-code-assist bot reviewed Feb 3, 2026

View reviewed changes

src/main/java/org/mtransit/parser/mt/MDataChangedManager.kt Show resolved Hide resolved

src/main/java/org/mtransit/parser/mt/MDataChangedManager.kt Outdated Show resolved Hide resolved

PR comments

e84a12b

gemini-code-assist bot reviewed Feb 3, 2026

View reviewed changes

mmathieum merged commit 7e9833f into master Feb 3, 2026
4 checks passed

mmathieum deleted the mm/data_change_service_id_regex_compat branch February 3, 2026 19:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Data Changed > compat with service IDs regex #32

Data Changed > compat with service IDs regex #32

Uh oh!

mmathieum commented Feb 3, 2026

Uh oh!

gemini-code-assist bot commented Feb 3, 2026

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

mmathieum commented Feb 3, 2026

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

Uh oh!

Uh oh!

mmathieum commented Feb 3, 2026

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

Uh oh!

Uh oh!

mmathieum commented Feb 3, 2026

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Data Changed > compat with service IDs regex #32

Data Changed > compat with service IDs regex #32

Uh oh!

Conversation

mmathieum commented Feb 3, 2026

Uh oh!

gemini-code-assist bot commented Feb 3, 2026

Summary of Changes

Highlights

Footnotes

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

src/main/java/org/mtransit/parser/mt/MDataChangedManager.kt (199)

src/main/java/org/mtransit/parser/mt/MDataChangedManager.kt (224)

src/main/java/org/mtransit/parser/mt/data/MStop.kt (47)

Uh oh!

mmathieum commented Feb 3, 2026

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

mmathieum commented Feb 3, 2026

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

mmathieum commented Feb 3, 2026

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants