HistoryDAO.java-sonar fixes