Fixing sonar bugs.
Making final.
Fixing JPA2 persistence provider.