Merge "DatabaseClass.java: Fixed sonar issues"