PMD/FindBugs fixes for AbstractAdapter