Spring Use enhanced switch expressions where feasible

Comment From: sbrannen

Please note that this PR currently fails the build.

Please address any issues (using ./gradlew build to verify build completes) and push changes to this PR.

Comment From: sbrannen

This has been merged into main in c5c926726dc46f5135645d79ddc12c4027e1d061 and revised in 8c6d59aaaf8d0ff31e7d91c6d0ed7de7cd9f518e.

Thanks