oscerd commented on PR #27185: URL: https://github.com/apache/camel/pull/27185#issuecomment-5930359014
Note for whoever merges this: #27195 (CAMEL-25184 — `readTuples` / `readChanges` / `expand`) is also open against `camel-openfga`, so whichever of the two lands second needs a rebase. Neither depends on the other, so the order does not matter. I measured the overlap with `git merge-tree` rather than guessing. 11 files conflict, and only three need a human: - `OpenFgaAuthorizer.java` and `OpenFgaIT.java` — both branches append, so it is additive rather than competing. - `components/camel-openfga/src/main/docs/openfga-component.adoc` — both add a section **and** both edit the same "What this component does not do yet" list, each striking its own entry from it. That list is the one place that needs reading rather than accepting both sides. - The other 8 are generated (catalog JSON ×2, the three configurers/URI factory, component + endpoint DSL) and resolve by re-running the reactor, not by hand. `OpenFgaProducer.java` and `OpenFgaConfiguration.java` merge cleanly even though both branches touch them — the additions land in different regions. I will do the rebase on whichever is still open once the first one merges. _Claude Code on behalf of oscerd_ -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
