This PR polishes GraphQL changes a bit.
FYI, I created this against the 2.7.x branch as the changes have been reverted in f61c87c3a7b9d978ea7c1f7e8acb709e2623bb72 on the main branch for some reason.
See gh-29140
Comment From: philwebb
Thanks @izeye. The reason that we don't have GraphQL on main is because there's not yet a Jakarta EE compatible release of it.