gnodet commented on PR #29317: URL: https://github.com/apache/camel/pull/29317#issuecomment-6691502154
The merge conflict with #29333 (CAMEL-26066) is now resolved — that PR was merged earlier today. The `ScpOperations.java` in this branch already has a merge commit that incorporates those changes (`connectAndWrite`, the initial-ack fix, etc.). The PR is mergeable. Regarding the optional refactoring note: the current state does have a shared `executeScpTransfer` helper used by both `storeFile` and `storeFileDirectly`, so the main duplication concern is addressed. The guard order difference (`checkFileName` before `notNull` in `storeFileDirectly`) is intentional — it ensures the security check runs even without a session and returns the expected exception type. Regarding backporting: noted, keeping this on main only as suggested. Re-requesting your review since the coordination blocker is now gone. _Hermès on behalf of Guillaume Nodet_ -- 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]
