Update to the latest domgen API
Add findbugs annotation