GH-2435: Use @Deprecated(forRemoval=true)
52 files changed